diff --git a/Core/Util/PPGeDraw.cpp b/Core/Util/PPGeDraw.cpp index 9ca96355b1..f8ff20285b 100644 --- a/Core/Util/PPGeDraw.cpp +++ b/Core/Util/PPGeDraw.cpp @@ -15,19 +15,20 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include "PPGeDraw.h" -#include "../GPU/ge_constants.h" -#include "../GPU/GPUState.h" -#include "../GPU/GPUInterface.h" -#include "../HLE/sceKernel.h" -#include "../HLE/sceKernelMemory.h" -#include "../HLE/sceGe.h" -#include "../MemMap.h" +#include "Core/Util/PPGeDraw.h" +#include "GPU/ge_constants.h" +#include "GPU/GPUState.h" +#include "GPU/GPUInterface.h" +#include "Core/HLE/sceKernel.h" +#include "Core/HLE/sceKernelMemory.h" +#include "Core/HLE/sceGe.h" +#include "Core/MemMap.h" #include "image/zim_load.h" #include "gfx/texture_atlas.h" #include "gfx/gl_common.h" -#include "../System.h" +#include "util/text/utf8.h" #include "MathUtil.h" +#include "Core/System.h" static u32 atlasPtr; static int atlasWidth; @@ -249,7 +250,7 @@ void PPGeEnd() static void PPGeMeasureText(const char *text, float scale, float *w, float *h) { const AtlasFont &atlasfont = *ppge_atlas.fonts[0]; - unsigned char cval; + unsigned int cval; float wacc = 0; float maxw = 0; int lines = 1; @@ -261,8 +262,10 @@ static void PPGeMeasureText(const char *text, float scale, float *w, float *h) { } if (cval < 32) continue; if (cval > 127) continue; - AtlasChar c = atlasfont.chars[cval - 32]; - wacc += c.wx * scale; + const AtlasChar *c = atlasfont.getChar(cval); + if (c) { + wacc += c->wx * scale; + } } if (wacc > maxw) maxw = wacc; if (w) *w = maxw; @@ -278,12 +281,11 @@ static void PPGeDoAlign(int flags, float *x, float *y, float *w, float *h) { // Draws some text using the one font we have. // Mostly stolen from DrawBuffer. -void PPGeDrawText(const char *text, float x, float y, int align, float scale, u32 color) -{ +void PPGeDrawText(const char *text, float x, float y, int align, float scale, u32 color) { if (!dlPtr) return; const AtlasFont &atlasfont = *ppge_atlas.fonts[0]; - unsigned char cval; + unsigned int cval; float w, h; PPGeMeasureText(text, scale, &w, &h); if (align) { @@ -301,14 +303,17 @@ void PPGeDrawText(const char *text, float x, float y, int align, float scale, u3 } if (cval < 32) continue; if (cval > 127) continue; - AtlasChar c = atlasfont.chars[cval - 32]; - float cx1 = x + c.ox * scale; - float cy1 = y + c.oy * scale; - float cx2 = x + (c.ox + c.pw) * scale; - float cy2 = y + (c.oy + c.ph) * scale; - Vertex(cx1, cy1, c.sx, c.sy, 256, 256, color); - Vertex(cx2, cy2, c.ex, c.ey, 256, 256, color); - x += c.wx * scale; + const AtlasChar *ch = atlasfont.getChar(cval); + if (ch) { + const AtlasChar &c = *ch; + float cx1 = x + c.ox * scale; + float cy1 = y + c.oy * scale; + float cx2 = x + (c.ox + c.pw) * scale; + float cy2 = y + (c.oy + c.ph) * scale; + Vertex(cx1, cy1, c.sx, c.sy, 256, 256, color); + Vertex(cx2, cy2, c.ex, c.ey, 256, 256, color); + x += c.wx * scale; + } } EndVertexDataAndDraw(GE_PRIM_RECTANGLES); } diff --git a/Core/Util/ppge_atlas.cpp b/Core/Util/ppge_atlas.cpp index b211096eb3..ce22ae3a30 100644 --- a/Core/Util/ppge_atlas.cpp +++ b/Core/Util/ppge_atlas.cpp @@ -2,12 +2,8 @@ #include "ppge_atlas.h" -const AtlasFont font_UBUNTU24 = { - -1.375000f, // padding - 36.687500f, // height - 26.937500f, // ascend - 0.750000f, // distslope - { +const AtlasChar font_UBUNTU24_chardata[] = { +// RANGE: 0x20 - 0x80, start 0x0 {0.972656f, 0.000000f, 0.976563f, 0.003906f, -2.0000f, -2.0000f, 7.0625f, 1, 1}, // 32 {0.531250f, 0.675781f, 0.562500f, 0.777344f, -0.3750f, -23.1250f, 6.3750f, 8, 26}, // 33 {0.246094f, 0.718750f, 0.292969f, 0.765625f, -0.5000f, -23.0625f, 10.2500f, 12, 12}, // 34 @@ -104,7 +100,17 @@ const AtlasFont font_UBUNTU24 = { {0.933594f, 0.210938f, 0.984375f, 0.351563f, -1.3750f, -26.9375f, 10.9375f, 13, 36}, // 125 {0.296875f, 0.718750f, 0.359375f, 0.750000f, -0.5000f, -14.1875f, 14.7500f, 16, 8}, // 126 {0.582031f, 0.000000f, 0.679688f, 0.136719f, -0.5000f, -25.2500f, 23.1250f, 25, 35}, // 127 - }, +}; +const AtlasCharRange font_UBUNTU24_ranges[] = { + { 32, 128, 0 },}; +const AtlasFont font_UBUNTU24 = { + -1.375000f, // padding + 36.687500f, // height + 26.937500f, // ascend + 0.750000f, // distslope + font_UBUNTU24_chardata, + font_UBUNTU24_ranges, + 1, "UBUNTU24", // name }; const AtlasFont *ppge_fonts[1] = { @@ -112,7 +118,7 @@ const AtlasFont *ppge_fonts[1] = { }; const AtlasImage ppge_images[6] = { {0.458984f, 0.001953f, 0.576172f, 0.119141f, 31, 31, "I_CROSS"}, - {0.193359f, 0.001953f, 0.324453f, 0.133047f, 32, 32, "I_CIRCLE"}, + {0.193359f, 0.001953f, 0.314453f, 0.123047f, 32, 32, "I_CIRCLE"}, {0.685547f, 0.001953f, 0.794922f, 0.111328f, 29, 29, "I_SQUARE"}, {0.322266f, 0.001953f, 0.451172f, 0.111328f, 34, 29, "I_TRIANGLE"}, {0.802734f, 0.001953f, 0.861328f, 0.193359f, 16, 50, "I_BUTTON"}, diff --git a/UI/MenuScreens.cpp b/UI/MenuScreens.cpp index dc2d24e31f..41f6852632 100644 --- a/UI/MenuScreens.cpp +++ b/UI/MenuScreens.cpp @@ -158,7 +158,7 @@ void LogoScreen::render() { ui_draw2d.SetFontScale(1.5f, 1.5f); ui_draw2d.DrawText(UBUNTU48, "PPSSPP", dp_xres / 2, dp_yres / 2 - 30, colorAlpha(0xFFFFFFFF, alphaText), ALIGN_CENTER); ui_draw2d.SetFontScale(1.0f, 1.0f); - ui_draw2d.DrawText(UBUNTU24, "Created by Henrik Rydgard", dp_xres / 2, dp_yres / 2 + 40, colorAlpha(0xFFFFFFFF, alphaText), ALIGN_CENTER); + ui_draw2d.DrawText(UBUNTU24, "Created by Henrik Rydg\u00E5rd", dp_xres / 2, dp_yres / 2 + 40, colorAlpha(0xFFFFFFFF, alphaText), ALIGN_CENTER); ui_draw2d.DrawText(UBUNTU24, "Free Software under GPL 2.0", dp_xres / 2, dp_yres / 2 + 70, colorAlpha(0xFFFFFFFF, alphaText), ALIGN_CENTER); ui_draw2d.DrawText(UBUNTU24, "www.ppsspp.org", dp_xres / 2, dp_yres / 2 + 130, colorAlpha(0xFFFFFFFF, alphaText), ALIGN_CENTER); if (bootFilename_.size()) { @@ -336,13 +336,12 @@ void PauseScreen::render() { UIBegin(UIShader_Get()); DrawBackground(1.0f); - const char *title; + std::string title = game_title.c_str(); // Try to ignore (tm) etc. - if (UTF8StringNonASCIICount(game_title.c_str()) > 2) { - title = "(can't display japanese title)"; - } else { - title = game_title.c_str(); - } + //if (UTF8StringNonASCIICount(game_title.c_str()) > 2) { + // title = "(can't display japanese title)"; + //} else { + //} UIContext *ctx = screenManager()->getUIContext(); @@ -350,6 +349,10 @@ void PauseScreen::render() { UIFlush(); GameInfo *ginfo = g_gameInfoCache.GetInfo(PSP_CoreParameter().fileToStart, true); + if (ginfo) { + title = ginfo->title; + } + if (ginfo && ginfo->pic1Texture) { ginfo->pic1Texture->Bind(0); ui_draw2d.DrawTexRect(0,0,dp_xres, dp_yres, 0,0,1,1,0xFFc0c0c0); @@ -374,7 +377,7 @@ void PauseScreen::render() { ctx->RebindTexture(); } - ui_draw2d.DrawText(UBUNTU48, title, 10+144+10, 20, 0xFFFFFFFF, ALIGN_LEFT); + ui_draw2d.DrawText(UBUNTU24, title.c_str(), 10+144+10, 20, 0xFFFFFFFF, ALIGN_LEFT); int x = 30; int y = 50; @@ -416,7 +419,7 @@ void PauseScreen::render() { screenManager()->push(new SettingsScreen(), 0); } - if (UIButton(GEN_ID, vlinear, LARGE_BUTTON_WIDTH, 0, "Return to Menu", ALIGN_RIGHT)) { + if (UIButton(GEN_ID, vlinear, LARGE_BUTTON_WIDTH, 0, "Back to Menu", ALIGN_RIGHT)) { screenManager()->finishDialog(this, DR_OK); } @@ -783,7 +786,9 @@ static const char * credits[] = { "", "A fast and portable PSP emulator", "", - "Created by Henrik Rydgard", + "Created by Henrik Rydg\u00E5rd", + "(aka hrydgard, ector)" + "", "", "Contributors:", "unknownbrackets", @@ -800,7 +805,7 @@ static const char * credits[] = { "soywiz", "kovensky", "xele", - "cinaera", + "cinaera/BeaR", "", "Written in C++ for speed and portability", "", diff --git a/UI/ui_atlas.cpp b/UI/ui_atlas.cpp index c54d0e753d..5b00105d36 100644 --- a/UI/ui_atlas.cpp +++ b/UI/ui_atlas.cpp @@ -2,353 +2,646 @@ #include "ui_atlas.h" +const AtlasChar font_UBUNTU24_chardata[] = { +// RANGE: 0x20 - 0x80, start 0x0 + {0.998047f, 0.000000f, 0.999023f, 0.000977f, -2.0000f, -2.0000f, 6.7500f, 1, 1}, // 32 + {0.442383f, 0.204102f, 0.451172f, 0.231445f, -0.2500f, -25.0000f, 8.0000f, 9, 28}, // 33 + {0.707031f, 0.059570f, 0.719727f, 0.072266f, -0.5000f, -25.5000f, 11.7500f, 13, 13}, // 34 + {0.358398f, 0.495117f, 0.376953f, 0.521484f, -0.8750f, -24.6250f, 16.5000f, 19, 27}, // 35 + {0.858398f, 0.201172f, 0.875000f, 0.233398f, 0.0000f, -27.4375f, 16.8750f, 17, 33}, // 36 + {0.442383f, 0.398438f, 0.470703f, 0.424805f, -1.0000f, -24.5625f, 26.5000f, 29, 27}, // 37 + {0.000000f, 0.440430f, 0.023438f, 0.467773f, -1.0000f, -25.3125f, 20.3125f, 24, 28}, // 38 + {0.699219f, 0.140625f, 0.707031f, 0.153320f, -0.5000f, -25.5000f, 6.3750f, 8, 13}, // 39 + {0.451172f, 0.160156f, 0.461914f, 0.191406f, 0.0625f, -25.6250f, 9.6875f, 11, 32}, // 40 + {0.646484f, 0.208984f, 0.657227f, 0.240234f, -1.1875f, -25.6250f, 9.6875f, 11, 32}, // 41 + {0.438477f, 0.530273f, 0.455078f, 0.546875f, -1.0625f, -25.3125f, 14.1250f, 17, 17}, // 42 + {0.377930f, 0.495117f, 0.399414f, 0.517578f, -0.6875f, -20.1875f, 20.3125f, 22, 23}, // 43 + {0.749023f, 0.247070f, 0.758789f, 0.259766f, -1.5625f, -6.6875f, 7.4375f, 10, 13}, // 44 + {0.831055f, 0.194336f, 0.843750f, 0.201172f, -1.0000f, -12.3750f, 10.3125f, 13, 7}, // 45 + {0.811523f, 0.185547f, 0.820313f, 0.194336f, -0.2500f, -6.4375f, 7.3750f, 9, 9}, // 46 + {0.373047f, 0.173828f, 0.388672f, 0.202148f, -1.9375f, -25.3125f, 11.1250f, 16, 29}, // 47 + {0.579102f, 0.487305f, 0.597656f, 0.514648f, -0.8750f, -24.9375f, 16.8750f, 19, 28}, // 48 + {0.922852f, 0.528320f, 0.935547f, 0.554688f, 0.9375f, -24.6250f, 16.8750f, 13, 27}, // 49 + {0.966797f, 0.504883f, 0.984375f, 0.531250f, -0.6250f, -24.9375f, 16.8750f, 18, 27}, // 50 + {0.000000f, 0.497070f, 0.017578f, 0.524414f, -0.7500f, -25.0000f, 16.8750f, 18, 28}, // 51 + {0.743164f, 0.480469f, 0.762695f, 0.506836f, -1.3750f, -24.5625f, 16.8750f, 20, 27}, // 52 + {0.185547f, 0.505859f, 0.203125f, 0.532227f, -0.7500f, -24.5625f, 16.8750f, 18, 27}, // 53 + {0.021484f, 0.488281f, 0.040039f, 0.515625f, -0.9375f, -24.9375f, 16.8750f, 19, 28}, // 54 + {0.518555f, 0.505859f, 0.536133f, 0.532227f, -0.2500f, -24.5625f, 16.8750f, 18, 27}, // 55 + {0.267578f, 0.489258f, 0.286133f, 0.516602f, -0.8125f, -24.9375f, 16.8750f, 19, 28}, // 56 + {0.598633f, 0.489258f, 0.617188f, 0.516602f, -0.7500f, -24.9375f, 16.8750f, 19, 28}, // 57 + {0.526367f, 0.280273f, 0.535156f, 0.300781f, -0.2500f, -18.1875f, 7.3750f, 9, 21}, // 58 + {0.635742f, 0.251953f, 0.645508f, 0.276367f, -1.5625f, -18.1875f, 7.4375f, 10, 25}, // 59 + {0.261719f, 0.517578f, 0.281250f, 0.540039f, 0.1875f, -20.1875f, 20.3125f, 20, 23}, // 60 + {0.955078f, 0.532227f, 0.976563f, 0.544922f, -0.6250f, -15.6250f, 20.3125f, 22, 13}, // 61 + {0.591797f, 0.517578f, 0.611328f, 0.540039f, 0.1875f, -20.1875f, 20.3125f, 20, 23}, // 62 + {0.204102f, 0.518555f, 0.218750f, 0.545898f, -0.3750f, -25.3750f, 13.4375f, 15, 28}, // 63 + {0.435547f, 0.425781f, 0.460938f, 0.453125f, -0.5625f, -22.1875f, 24.2500f, 26, 28}, // 64 + {0.872070f, 0.287109f, 0.894531f, 0.313477f, -1.2500f, -24.9375f, 19.8125f, 23, 27}, // 65 + {0.902344f, 0.489258f, 0.920898f, 0.516602f, 0.3750f, -25.1250f, 18.0625f, 19, 28}, // 66 + {0.905273f, 0.313477f, 0.925781f, 0.340820f, -0.8125f, -25.3125f, 18.3125f, 21, 28}, // 67 + {0.579102f, 0.458984f, 0.600586f, 0.486328f, 0.3750f, -25.1250f, 21.2500f, 22, 28}, // 68 + {0.892578f, 0.517578f, 0.909180f, 0.543945f, 0.3750f, -25.0000f, 16.0625f, 17, 27}, // 69 + {0.623047f, 0.398438f, 0.638672f, 0.424805f, 0.3750f, -25.0000f, 15.8125f, 16, 27}, // 70 + {0.024414f, 0.459961f, 0.045898f, 0.487305f, -0.8125f, -25.1875f, 20.6875f, 22, 28}, // 71 + {0.228516f, 0.473633f, 0.249023f, 0.500000f, 0.3750f, -25.0000f, 21.0625f, 21, 27}, // 72 + {0.077148f, 0.317383f, 0.084961f, 0.343750f, 0.3750f, -24.9375f, 8.2500f, 8, 27}, // 73 + {0.847656f, 0.522461f, 0.861328f, 0.549805f, -1.9375f, -25.0000f, 12.1250f, 14, 28}, // 74 + {0.763672f, 0.480469f, 0.783203f, 0.506836f, 0.3750f, -24.9375f, 18.0625f, 20, 27}, // 75 + {0.144531f, 0.518555f, 0.161133f, 0.544922f, 0.3750f, -24.9375f, 15.4375f, 17, 27}, // 76 + {0.352539f, 0.421875f, 0.378906f, 0.448242f, -0.1875f, -25.0000f, 26.1250f, 27, 27}, // 77 + {0.694336f, 0.473633f, 0.714844f, 0.500000f, 0.3750f, -24.9375f, 21.2500f, 21, 27}, // 78 + {0.108398f, 0.441406f, 0.131836f, 0.468750f, -0.8125f, -25.3125f, 21.8125f, 24, 28}, // 79 + {0.715820f, 0.497070f, 0.733398f, 0.524414f, 0.3750f, -25.1250f, 17.5625f, 18, 28}, // 80 + {0.535156f, 0.416016f, 0.558594f, 0.446289f, -0.8125f, -25.3125f, 21.8125f, 24, 31}, // 81 + {0.146484f, 0.490234f, 0.165039f, 0.517578f, 0.3750f, -25.1250f, 17.8750f, 19, 28}, // 82 + {0.784180f, 0.497070f, 0.801758f, 0.524414f, -0.7500f, -25.3125f, 16.1875f, 18, 28}, // 83 + {0.669922f, 0.481445f, 0.689453f, 0.507813f, -1.8125f, -25.0000f, 16.2500f, 20, 27}, // 84 + {0.000000f, 0.468750f, 0.020508f, 0.496094f, 0.3750f, -24.9375f, 20.8750f, 21, 28}, // 85 + {0.132813f, 0.457031f, 0.155273f, 0.483398f, -1.8125f, -25.0000f, 18.5625f, 23, 27}, // 86 + {0.914063f, 0.375977f, 0.944336f, 0.402344f, -1.4375f, -24.9375f, 27.6875f, 31, 27}, // 87 + {0.046875f, 0.466797f, 0.068359f, 0.493164f, -1.3125f, -24.9375f, 18.3750f, 22, 27}, // 88 + {0.879883f, 0.466797f, 0.901367f, 0.493164f, -1.6875f, -24.9375f, 17.7500f, 22, 27}, // 89 + {0.125977f, 0.484375f, 0.145508f, 0.510742f, -1.1250f, -25.0000f, 17.5000f, 20, 27}, // 90 + {0.821289f, 0.526367f, 0.832031f, 0.557617f, 0.5625f, -25.3750f, 9.6875f, 11, 32}, // 91 + {0.558594f, 0.257813f, 0.573242f, 0.286133f, -1.9375f, -25.3125f, 10.8750f, 15, 29}, // 92 + {0.833008f, 0.526367f, 0.843750f, 0.557617f, -1.1250f, -25.3750f, 9.6875f, 11, 32}, // 93 + {0.282227f, 0.518555f, 0.302734f, 0.538086f, -0.0625f, -24.1250f, 20.3125f, 21, 20}, // 94 + {0.368164f, 0.540039f, 0.389648f, 0.545898f, -2.0000f, 0.2500f, 17.0625f, 22, 6}, // 95 + {0.442383f, 0.384766f, 0.453125f, 0.393555f, -1.2500f, -25.6250f, 10.1875f, 11, 9}, // 96 + {0.000000f, 0.525391f, 0.016602f, 0.546875f, -0.9375f, -18.8750f, 15.9375f, 17, 22}, // 97 + {0.401367f, 0.468750f, 0.420898f, 0.497070f, 0.1250f, -26.0625f, 18.3750f, 20, 29}, // 98 + {0.708984f, 0.525391f, 0.725586f, 0.546875f, -0.8125f, -18.8750f, 14.2500f, 17, 22}, // 99 + {0.947266f, 0.477539f, 0.965820f, 0.505859f, -0.8125f, -26.0625f, 18.2500f, 19, 29}, // 100 + {0.872070f, 0.520508f, 0.889648f, 0.541992f, -0.8125f, -18.8750f, 16.3125f, 18, 22}, // 101 + {0.983398f, 0.418945f, 0.998047f, 0.447266f, -1.5625f, -26.4375f, 9.9375f, 15, 29}, // 102 + {0.166016f, 0.490234f, 0.184570f, 0.517578f, -0.8125f, -18.8750f, 18.0625f, 19, 28}, // 103 + {0.853516f, 0.493164f, 0.871094f, 0.521484f, 0.2500f, -26.0625f, 18.0000f, 18, 29}, // 104 + {0.153320f, 0.284180f, 0.162109f, 0.311523f, -0.0625f, -25.1250f, 7.9375f, 9, 28}, // 105 + {0.657227f, 0.166016f, 0.668945f, 0.200195f, -3.4375f, -25.1250f, 8.2500f, 12, 35}, // 106 + {0.041016f, 0.494141f, 0.058594f, 0.522461f, 0.2500f, -26.0625f, 15.7500f, 18, 29}, // 107 + {0.699219f, 0.111328f, 0.707031f, 0.139648f, 0.2500f, -26.0625f, 7.9375f, 8, 29}, // 108 + {0.715820f, 0.475586f, 0.742188f, 0.496094f, 0.1250f, -18.9375f, 27.0000f, 27, 21}, // 109 + {0.362305f, 0.449219f, 0.379883f, 0.469727f, 0.1250f, -18.8750f, 18.0000f, 18, 21}, // 110 + {0.162109f, 0.518555f, 0.181641f, 0.540039f, -0.8125f, -18.8750f, 17.6875f, 20, 22}, // 111 + {0.069336f, 0.476563f, 0.088867f, 0.503906f, 0.1250f, -18.9375f, 18.3750f, 20, 28}, // 112 + {0.205078f, 0.490234f, 0.223633f, 0.517578f, -0.8125f, -18.9375f, 18.1875f, 19, 28}, // 113 + {0.491211f, 0.431641f, 0.503906f, 0.452148f, 0.1250f, -18.8750f, 11.0000f, 13, 21}, // 114 + {0.219727f, 0.529297f, 0.234375f, 0.550781f, -0.8750f, -18.8750f, 13.0000f, 15, 22}, // 115 + {0.385742f, 0.469727f, 0.399414f, 0.494141f, -1.4375f, -22.6875f, 11.0625f, 14, 25}, // 116 + {0.324219f, 0.523438f, 0.341797f, 0.543945f, 0.1875f, -18.5625f, 17.9375f, 18, 21}, // 117 + {0.303711f, 0.518555f, 0.323242f, 0.539063f, -1.6250f, -18.5000f, 15.8125f, 20, 21}, // 118 + {0.156250f, 0.468750f, 0.183594f, 0.489258f, -1.5000f, -18.5625f, 24.0000f, 28, 21}, // 119 + {0.812500f, 0.255859f, 0.831055f, 0.276367f, -1.7500f, -18.5000f, 15.3125f, 19, 21}, // 120 + {0.287109f, 0.490234f, 0.305664f, 0.517578f, -1.6875f, -18.5000f, 15.5625f, 19, 28}, // 121 + {0.780273f, 0.525391f, 0.796875f, 0.545898f, -1.3750f, -18.5000f, 14.0625f, 17, 21}, // 122 + {0.041016f, 0.523438f, 0.052734f, 0.554688f, -1.1250f, -25.3750f, 9.6250f, 12, 32}, // 123 + {0.392578f, 0.079102f, 0.399414f, 0.117188f, 0.8125f, -27.5625f, 8.1875f, 7, 39}, // 124 + {0.085938f, 0.523438f, 0.097656f, 0.554688f, -1.1250f, -25.3750f, 9.6250f, 12, 32}, // 125 + {0.726563f, 0.536133f, 0.748047f, 0.545898f, -0.3750f, -14.3750f, 20.3125f, 22, 10}, // 126 + {0.998047f, 0.001953f, 0.999023f, 0.002930f, 0.0000f, 0.0000f, 0.0000f, 1, 1}, // 127 +// RANGE: 0x80 - 0x81, start 0x60 + {0.998047f, 0.003906f, 0.999023f, 0.004883f, 0.0000f, 0.0000f, 0.0000f, 1, 1}, // 128 +// RANGE: 0xa2 - 0xff, start 0x61 + {0.734375f, 0.507813f, 0.750977f, 0.535156f, 0.2500f, -25.2500f, 16.8750f, 17, 28}, // 162 + {0.537109f, 0.505859f, 0.554688f, 0.532227f, -0.3750f, -24.9375f, 16.8750f, 18, 27}, // 163 + {0.377930f, 0.518555f, 0.397461f, 0.539063f, -1.3750f, -21.9375f, 16.8750f, 20, 21}, // 164 + {0.336914f, 0.475586f, 0.357422f, 0.501953f, -1.6250f, -24.6250f, 16.8750f, 21, 27}, // 165 + {0.638672f, 0.113281f, 0.645508f, 0.145508f, 0.8125f, -25.0000f, 8.1875f, 7, 33}, // 166 + {0.650391f, 0.464844f, 0.668945f, 0.494141f, 5.6875f, -25.3125f, 30.0000f, 19, 30}, // 167 + {0.399414f, 0.242188f, 0.414063f, 0.250000f, 7.9375f, -30.2500f, 30.0000f, 15, 8}, // 168 + {0.706055f, 0.447266f, 0.730469f, 0.472656f, -0.8125f, -24.0625f, 23.0625f, 25, 26}, // 169 + {0.235352f, 0.534180f, 0.249023f, 0.549805f, -0.8750f, -22.1250f, 11.5000f, 14, 16}, // 170 + {0.476563f, 0.530273f, 0.493164f, 0.546875f, -1.0625f, -16.8750f, 14.1875f, 17, 17}, // 171 + {0.416016f, 0.530273f, 0.437500f, 0.543945f, -0.6875f, -15.8750f, 20.3125f, 22, 14}, // 172 + {0.282227f, 0.539063f, 0.303711f, 0.545898f, -0.6250f, -12.3125f, 20.3125f, 22, 7}, // 173 + {0.750977f, 0.073242f, 0.766602f, 0.088867f, -0.6250f, -25.3125f, 14.1875f, 16, 16}, // 174 + {0.884766f, 0.091797f, 0.896484f, 0.098633f, -0.6875f, -24.0000f, 10.1875f, 12, 7}, // 175 + {0.315430f, 0.126953f, 0.328125f, 0.139648f, -0.1250f, -26.3125f, 30.0000f, 13, 13}, // 176 + {0.504883f, 0.425781f, 0.530273f, 0.453125f, 2.1875f, -26.3125f, 30.0000f, 26, 28}, // 177 + {0.517578f, 0.454102f, 0.531250f, 0.471680f, -1.6875f, -30.3750f, 10.4375f, 14, 18}, // 178 + {0.511719f, 0.533203f, 0.525391f, 0.550781f, -1.8125f, -30.3750f, 10.1875f, 14, 18}, // 179 + {0.535156f, 0.248047f, 0.546875f, 0.256836f, 11.1875f, -30.3750f, 30.0000f, 12, 9}, // 180 + {0.618164f, 0.491211f, 0.636719f, 0.518555f, 0.2500f, -18.6250f, 18.0000f, 19, 28}, // 181 + {0.089844f, 0.494141f, 0.107422f, 0.522461f, 5.1250f, -25.0000f, 30.0000f, 18, 29}, // 182 + {0.494141f, 0.270508f, 0.502930f, 0.279297f, -0.5000f, -13.3125f, 7.4375f, 9, 9}, // 183 + {0.843750f, 0.276367f, 0.854492f, 0.287109f, -0.1250f, -2.1250f, 10.1875f, 11, 11}, // 184 + {0.855469f, 0.353516f, 0.865234f, 0.371094f, -1.3750f, -30.1875f, 8.5000f, 10, 18}, // 185 + {0.526367f, 0.533203f, 0.541016f, 0.548828f, -1.2500f, -22.1250f, 11.9375f, 15, 16}, // 186 + {0.797852f, 0.530273f, 0.814453f, 0.546875f, -1.2500f, -16.8750f, 14.1875f, 17, 17}, // 187 + {0.737305f, 0.421875f, 0.763672f, 0.448242f, -0.6875f, -24.5625f, 25.3750f, 27, 27}, // 188 + {0.381836f, 0.409180f, 0.409180f, 0.435547f, -1.1875f, -24.5625f, 25.3750f, 28, 27}, // 189 + {0.293945f, 0.411133f, 0.321289f, 0.437500f, -1.0625f, -24.5000f, 25.3750f, 28, 27}, // 190 + {0.612305f, 0.519531f, 0.626953f, 0.546875f, -0.5000f, -18.7500f, 13.4375f, 15, 28}, // 191 + {0.171875f, 0.404297f, 0.194336f, 0.436523f, -1.2500f, -30.1250f, 19.8125f, 23, 33}, // 192 + {0.329102f, 0.405273f, 0.351563f, 0.437500f, -1.2500f, -30.1250f, 19.8125f, 23, 33}, // 193 + {0.084961f, 0.417969f, 0.107422f, 0.449219f, -1.2500f, -30.0000f, 19.8125f, 23, 32}, // 194 + {0.000000f, 0.407227f, 0.022461f, 0.439453f, -1.2500f, -30.0625f, 19.8125f, 23, 33}, // 195 + {0.111328f, 0.408203f, 0.133789f, 0.440430f, -1.3125f, -30.2500f, 19.8125f, 23, 33}, // 196 + {0.856445f, 0.401367f, 0.878906f, 0.434570f, -1.2500f, -31.9375f, 19.8125f, 23, 34}, // 197 + {0.593750f, 0.398438f, 0.622070f, 0.424805f, -1.9375f, -25.0000f, 25.6875f, 29, 27}, // 198 + {0.224609f, 0.420898f, 0.245117f, 0.455078f, -0.8125f, -25.3125f, 18.3125f, 21, 35}, // 199 + {0.399414f, 0.208984f, 0.416016f, 0.241211f, 0.3750f, -30.1250f, 16.0625f, 17, 33}, // 200 + {0.929688f, 0.466797f, 0.946289f, 0.499023f, 0.3750f, -30.1250f, 16.0625f, 17, 33}, // 201 + {0.500977f, 0.479492f, 0.517578f, 0.510742f, 0.3750f, -30.0000f, 16.0625f, 17, 32}, // 202 + {0.250000f, 0.473633f, 0.266602f, 0.505859f, 0.3750f, -30.2500f, 16.0625f, 17, 33}, // 203 + {0.910156f, 0.517578f, 0.921875f, 0.549805f, -3.0625f, -30.1250f, 8.2500f, 12, 33}, // 204 + {0.355469f, 0.522461f, 0.367188f, 0.554688f, 0.3750f, -30.1250f, 8.2500f, 12, 33}, // 205 + {0.344727f, 0.139648f, 0.358398f, 0.170898f, -2.6250f, -30.0000f, 8.2500f, 14, 32}, // 206 + {0.422852f, 0.122070f, 0.436523f, 0.154297f, -2.8125f, -30.2500f, 8.2500f, 14, 33}, // 207 + {0.023438f, 0.431641f, 0.047852f, 0.458984f, -2.0625f, -25.1250f, 21.4375f, 25, 28}, // 208 + {0.879883f, 0.433594f, 0.900391f, 0.465820f, 0.3750f, -30.0625f, 21.2500f, 21, 33}, // 209 + {0.357422f, 0.388672f, 0.380859f, 0.420898f, -0.8125f, -30.1250f, 21.8125f, 24, 33}, // 210 + {0.739258f, 0.388672f, 0.762695f, 0.420898f, -0.8125f, -30.1250f, 21.8125f, 24, 33}, // 211 + {0.510742f, 0.392578f, 0.534180f, 0.424805f, -0.8125f, -30.0000f, 21.8125f, 24, 33}, // 212 + {0.200195f, 0.393555f, 0.223633f, 0.425781f, -0.8125f, -30.0625f, 21.8125f, 24, 33}, // 213 + {0.569336f, 0.393555f, 0.592773f, 0.425781f, -0.8125f, -30.2500f, 21.8125f, 24, 33}, // 214 + {0.853516f, 0.468750f, 0.876953f, 0.492188f, 3.2500f, -23.0625f, 30.0000f, 24, 24}, // 215 + {0.712891f, 0.416016f, 0.736328f, 0.446289f, -0.8125f, -26.4375f, 21.8125f, 24, 31}, // 216 + {0.901367f, 0.433594f, 0.921875f, 0.465820f, 0.3750f, -30.1250f, 20.8750f, 21, 33}, // 217 + {0.836914f, 0.435547f, 0.857422f, 0.467773f, 0.3750f, -30.1250f, 20.8750f, 21, 33}, // 218 + {0.858398f, 0.435547f, 0.878906f, 0.467773f, 0.3750f, -30.0000f, 20.8750f, 21, 33}, // 219 + {0.379883f, 0.436523f, 0.400391f, 0.468750f, 0.3750f, -30.2500f, 20.8750f, 21, 33}, // 220 + {0.593750f, 0.425781f, 0.615234f, 0.458008f, -1.6875f, -30.1250f, 17.7500f, 22, 33}, // 221 + {0.555664f, 0.505859f, 0.573242f, 0.532227f, 0.3750f, -24.9375f, 17.5000f, 18, 27}, // 222 + {0.456055f, 0.478516f, 0.474609f, 0.506836f, 0.2500f, -26.4375f, 18.1250f, 19, 29}, // 223 + {0.751953f, 0.507813f, 0.768555f, 0.535156f, -0.9375f, -25.6250f, 15.9375f, 17, 28}, // 224 + {0.661133f, 0.508789f, 0.677734f, 0.536133f, -0.9375f, -25.6250f, 15.9375f, 17, 28}, // 225 + {0.126953f, 0.511719f, 0.143555f, 0.539063f, -0.9375f, -25.6250f, 15.9375f, 17, 28}, // 226 + {0.494141f, 0.511719f, 0.510742f, 0.539063f, -0.9375f, -25.0000f, 15.9375f, 17, 28}, // 227 + {0.400391f, 0.498047f, 0.417969f, 0.525391f, -0.9375f, -25.0000f, 15.9375f, 18, 28}, // 228 + {0.108398f, 0.494141f, 0.125977f, 0.522461f, -0.9375f, -26.6250f, 15.9375f, 18, 29}, // 229 + {0.902344f, 0.466797f, 0.928711f, 0.488281f, -0.9375f, -18.8750f, 25.0000f, 27, 22}, // 230 + {0.574219f, 0.515625f, 0.590820f, 0.542969f, -0.8125f, -18.8750f, 14.2500f, 17, 28}, // 231 + {0.829102f, 0.498047f, 0.846680f, 0.525391f, -0.8125f, -25.6250f, 16.3125f, 18, 28}, // 232 + {0.921875f, 0.500000f, 0.939453f, 0.527344f, -0.8125f, -25.6250f, 16.3125f, 18, 28}, // 233 + {0.224609f, 0.500977f, 0.242188f, 0.528320f, -0.8125f, -25.6250f, 16.3125f, 18, 28}, // 234 + {0.690430f, 0.500977f, 0.708008f, 0.528320f, -0.8125f, -25.0000f, 16.3125f, 18, 28}, // 235 + {0.915039f, 0.098633f, 0.925781f, 0.125977f, -2.3750f, -25.6250f, 7.9375f, 11, 28}, // 236 + {0.667969f, 0.277344f, 0.678711f, 0.304688f, 0.1875f, -25.6250f, 7.9375f, 11, 28}, // 237 + {0.342773f, 0.523438f, 0.355469f, 0.550781f, -2.3750f, -25.6250f, 7.9375f, 13, 28}, // 238 + {0.053711f, 0.524414f, 0.067383f, 0.550781f, -3.0000f, -25.0000f, 7.9375f, 14, 27}, // 239 + {0.833008f, 0.468750f, 0.852539f, 0.497070f, -0.8125f, -26.3750f, 17.5000f, 20, 29}, // 240 + {0.243164f, 0.506836f, 0.260742f, 0.533203f, 0.1250f, -25.0000f, 18.0000f, 18, 27}, // 241 + {0.973633f, 0.476563f, 0.993164f, 0.503906f, -0.8125f, -25.6250f, 17.6875f, 20, 28}, // 242 + {0.184570f, 0.477539f, 0.204102f, 0.504883f, -0.8125f, -25.6250f, 17.6875f, 20, 28}, // 243 + {0.517578f, 0.477539f, 0.537109f, 0.504883f, -0.8125f, -25.6250f, 17.6875f, 20, 28}, // 244 + {0.538086f, 0.477539f, 0.557617f, 0.504883f, -0.8125f, -25.0000f, 17.6875f, 20, 28}, // 245 + {0.558594f, 0.477539f, 0.578125f, 0.504883f, -0.8125f, -25.0000f, 17.6875f, 20, 28}, // 246 + {0.756836f, 0.456055f, 0.782227f, 0.479492f, 2.1875f, -23.2500f, 30.0000f, 26, 24}, // 247 + {0.456055f, 0.507813f, 0.475586f, 0.531250f, -0.8125f, -19.8750f, 17.6875f, 20, 24}, // 248 + {0.418945f, 0.501953f, 0.436523f, 0.529297f, 0.1875f, -25.6250f, 17.9375f, 18, 28}, // 249 + {0.437500f, 0.501953f, 0.455078f, 0.529297f, 0.1875f, -25.6250f, 17.9375f, 18, 28}, // 250 + {0.475586f, 0.501953f, 0.493164f, 0.529297f, 0.1875f, -25.6250f, 17.9375f, 18, 28}, // 251 + {0.802734f, 0.501953f, 0.820313f, 0.529297f, 0.1875f, -25.0000f, 17.9375f, 18, 28}, // 252 + {0.926758f, 0.044922f, 0.945313f, 0.080078f, -1.6875f, -25.6250f, 15.5625f, 19, 36}, // 253 + {0.208984f, 0.456055f, 0.227539f, 0.489258f, 0.2500f, -24.9375f, 18.3750f, 19, 34}, // 254 +// RANGE: 0x2122 - 0x2123, start 0xbe + {0.022461f, 0.329102f, 0.045898f, 0.342773f, -1.1875f, -24.9375f, 20.5000f, 24, 14}, // 8482 +// RANGE: 0x3041 - 0x3097, start 0xbf + {0.336914f, 0.449219f, 0.361328f, 0.474609f, 2.9375f, -21.1875f, 30.0000f, 25, 26}, // 12353 + {0.396484f, 0.315430f, 0.425781f, 0.345703f, 0.3125f, -26.8750f, 30.0000f, 30, 31}, // 12354 + {0.475586f, 0.479492f, 0.500000f, 0.500977f, 3.0000f, -18.6250f, 30.0000f, 25, 22}, // 12355 + {0.945313f, 0.383789f, 0.974609f, 0.410156f, 0.5000f, -24.1250f, 30.0000f, 30, 27}, // 12356 + {0.872070f, 0.494141f, 0.891602f, 0.519531f, 4.9375f, -21.4375f, 30.0000f, 20, 26}, // 12357 + {0.085938f, 0.385742f, 0.110352f, 0.416992f, 2.6250f, -26.8125f, 30.0000f, 25, 32}, // 12358 + {0.731445f, 0.449219f, 0.755859f, 0.474609f, 2.6250f, -21.5000f, 30.0000f, 25, 26}, // 12359 + {0.046875f, 0.317383f, 0.076172f, 0.347656f, 0.4375f, -26.6875f, 30.0000f, 30, 31}, // 12360 + {0.284180f, 0.438477f, 0.309570f, 0.463867f, 2.5000f, -21.4375f, 30.0000f, 26, 26}, // 12361 + {0.247070f, 0.290039f, 0.277344f, 0.320313f, 0.1875f, -26.7500f, 30.0000f, 31, 31}, // 12362 + {0.247070f, 0.258789f, 0.278320f, 0.289063f, -0.2500f, -26.5000f, 30.0000f, 32, 31}, // 12363 + {0.470703f, 0.238281f, 0.501953f, 0.269531f, -0.2500f, -28.1875f, 30.0000f, 32, 32}, // 12364 + {0.000000f, 0.344727f, 0.028320f, 0.375000f, 0.9375f, -26.9375f, 30.0000f, 29, 31}, // 12365 + {0.366211f, 0.251953f, 0.396484f, 0.284180f, 0.9375f, -28.3750f, 30.0000f, 31, 33}, // 12366 + {0.246094f, 0.441406f, 0.266602f, 0.472656f, 3.9375f, -27.1875f, 30.0000f, 21, 32}, // 12367 + {0.302734f, 0.378906f, 0.328125f, 0.410156f, 3.9375f, -27.1875f, 30.0000f, 26, 32}, // 12368 + {0.114258f, 0.317383f, 0.143555f, 0.347656f, 0.6875f, -26.6250f, 30.0000f, 30, 31}, // 12369 + {0.684570f, 0.244141f, 0.715820f, 0.275391f, 0.6250f, -27.6875f, 30.0000f, 32, 32}, // 12370 + {0.922852f, 0.439453f, 0.947266f, 0.465820f, 2.6250f, -24.3125f, 30.0000f, 25, 27}, // 12371 + {0.763672f, 0.398438f, 0.791992f, 0.424805f, 2.5000f, -24.2500f, 30.0000f, 29, 27}, // 12372 + {0.925781f, 0.344727f, 0.954102f, 0.375000f, 0.8750f, -26.8750f, 30.0000f, 29, 31}, // 12373 + {0.025391f, 0.252930f, 0.055664f, 0.285156f, 0.7500f, -28.3750f, 30.0000f, 31, 33}, // 12374 + {0.811523f, 0.412109f, 0.835938f, 0.441406f, 4.9375f, -26.3125f, 30.0000f, 25, 30}, // 12375 + {0.410156f, 0.415039f, 0.434570f, 0.444336f, 4.9375f, -26.2500f, 30.0000f, 25, 30}, // 12376 + {0.458984f, 0.302734f, 0.488281f, 0.333984f, 0.0000f, -27.1875f, 30.0000f, 30, 32}, // 12377 + {0.726563f, 0.212891f, 0.757813f, 0.246094f, 0.1875f, -28.2500f, 30.0000f, 32, 34}, // 12378 + {0.667969f, 0.307617f, 0.699219f, 0.336914f, -0.5000f, -26.5625f, 30.0000f, 32, 30}, // 12379 + {0.189453f, 0.216797f, 0.221680f, 0.248047f, -0.5000f, -28.0000f, 30.0000f, 33, 32}, // 12380 + {0.336914f, 0.318359f, 0.366211f, 0.348633f, -0.0625f, -26.5625f, 30.0000f, 30, 31}, // 12381 + {0.279297f, 0.259766f, 0.310547f, 0.290039f, -0.0625f, -27.0000f, 30.0000f, 32, 31}, // 12382 + {0.217773f, 0.319336f, 0.247070f, 0.349609f, 0.5000f, -26.9375f, 30.0000f, 30, 31}, // 12383 + {0.749023f, 0.259766f, 0.779297f, 0.291016f, 0.5000f, -27.8125f, 30.0000f, 31, 32}, // 12384 + {0.426758f, 0.352539f, 0.454102f, 0.383789f, 0.8125f, -27.1875f, 30.0000f, 28, 32}, // 12385 + {0.341797f, 0.216797f, 0.373047f, 0.249023f, 0.6250f, -28.3125f, 30.0000f, 32, 33}, // 12386 + {0.421875f, 0.480469f, 0.447266f, 0.500977f, 2.0625f, -18.5000f, 30.0000f, 26, 21}, // 12387 + {0.027344f, 0.406250f, 0.057617f, 0.430664f, -0.2500f, -22.8750f, 30.0000f, 31, 25}, // 12388 + {0.056641f, 0.252930f, 0.088867f, 0.283203f, -0.2500f, -28.2500f, 30.0000f, 33, 31}, // 12389 + {0.273438f, 0.353516f, 0.301758f, 0.382813f, 0.3750f, -25.0000f, 30.0000f, 29, 30}, // 12390 + {0.636719f, 0.308594f, 0.667969f, 0.337891f, 0.3750f, -25.0000f, 30.0000f, 32, 30}, // 12391 + {0.542969f, 0.384766f, 0.568359f, 0.415039f, 2.3125f, -26.8750f, 30.0000f, 26, 31}, // 12392 + {0.457031f, 0.334961f, 0.485352f, 0.366211f, 2.3125f, -28.0000f, 30.0000f, 29, 32}, // 12393 + {0.804688f, 0.308594f, 0.833984f, 0.339844f, 0.1875f, -27.0000f, 30.0000f, 30, 32}, // 12394 + {0.826172f, 0.353516f, 0.854492f, 0.382813f, 1.0625f, -25.7500f, 30.0000f, 29, 30}, // 12395 + {0.427734f, 0.290039f, 0.458008f, 0.320313f, 0.0625f, -26.4375f, 30.0000f, 31, 31}, // 12396 + {0.780273f, 0.264648f, 0.811523f, 0.294922f, -0.6875f, -26.7500f, 30.0000f, 32, 31}, // 12397 + {0.205078f, 0.365234f, 0.235352f, 0.392578f, -0.1250f, -24.6875f, 30.0000f, 31, 28}, // 12398 + {0.144531f, 0.342773f, 0.173828f, 0.372070f, 0.6250f, -26.0625f, 30.0000f, 30, 30}, // 12399 + {0.831055f, 0.244141f, 0.862305f, 0.275391f, 0.5625f, -28.0000f, 30.0000f, 32, 32}, // 12400 + {0.462891f, 0.270508f, 0.493164f, 0.301758f, 0.5625f, -28.1250f, 30.0000f, 31, 32}, // 12401 + {0.489258f, 0.311523f, 0.520508f, 0.340820f, -0.5000f, -25.5625f, 30.0000f, 32, 30}, // 12402 + {0.894531f, 0.216797f, 0.926758f, 0.248047f, -0.5625f, -28.2500f, 30.0000f, 33, 32}, // 12403 + {0.646484f, 0.245117f, 0.677734f, 0.276367f, -0.5625f, -27.8125f, 30.0000f, 32, 32}, // 12404 + {0.678711f, 0.276367f, 0.709961f, 0.306641f, -0.8125f, -26.5625f, 30.0000f, 32, 31}, // 12405 + {0.927734f, 0.217773f, 0.959961f, 0.249023f, -0.8125f, -28.0625f, 30.0000f, 33, 32}, // 12406 + {0.716797f, 0.247070f, 0.748047f, 0.278320f, -0.8125f, -27.4375f, 30.0000f, 32, 32}, // 12407 + {0.471680f, 0.408203f, 0.503906f, 0.430664f, -1.0625f, -22.5000f, 30.0000f, 33, 23}, // 12408 + {0.872070f, 0.313477f, 0.904297f, 0.341797f, -1.0625f, -27.3125f, 30.0000f, 33, 29}, // 12409 + {0.618164f, 0.338867f, 0.650391f, 0.366211f, -1.0625f, -27.1250f, 30.0000f, 33, 28}, // 12410 + {0.865234f, 0.342773f, 0.894531f, 0.372070f, 0.6875f, -25.7500f, 30.0000f, 30, 30}, // 12411 + {0.502930f, 0.248047f, 0.534180f, 0.279297f, 0.6875f, -28.3750f, 30.0000f, 32, 32}, // 12412 + {0.186523f, 0.249023f, 0.217773f, 0.280273f, 0.6875f, -28.2500f, 30.0000f, 32, 32}, // 12413 + {0.236328f, 0.365234f, 0.263672f, 0.395508f, 1.4375f, -26.8750f, 30.0000f, 28, 31}, // 12414 + {0.700195f, 0.311523f, 0.731445f, 0.340820f, -0.5625f, -26.0000f, 30.0000f, 32, 30}, // 12415 + {0.248047f, 0.321289f, 0.278320f, 0.350586f, 0.3750f, -26.5000f, 30.0000f, 31, 30}, // 12416 + {0.278320f, 0.291016f, 0.308594f, 0.321289f, -0.0625f, -26.7500f, 30.0000f, 31, 31}, // 12417 + {0.397461f, 0.346680f, 0.425781f, 0.376953f, 0.6875f, -26.7500f, 30.0000f, 29, 31}, // 12418 + {0.310547f, 0.438477f, 0.335938f, 0.463867f, 2.1250f, -21.6250f, 30.0000f, 26, 26}, // 12419 + {0.812500f, 0.276367f, 0.842773f, 0.307617f, -0.6875f, -27.0000f, 30.0000f, 31, 32}, // 12420 + {0.076172f, 0.450195f, 0.100586f, 0.475586f, 3.0000f, -21.5625f, 30.0000f, 25, 26}, // 12421 + {0.426758f, 0.321289f, 0.456055f, 0.351563f, 0.6875f, -26.6250f, 30.0000f, 30, 31}, // 12422 + {0.626953f, 0.464844f, 0.649414f, 0.490234f, 3.3750f, -21.6250f, 30.0000f, 23, 26}, // 12423 + {0.684570f, 0.366211f, 0.711914f, 0.396484f, 1.1250f, -26.6875f, 30.0000f, 28, 31}, // 12424 + {0.712891f, 0.384766f, 0.738281f, 0.415039f, 2.3125f, -26.8125f, 30.0000f, 26, 31}, // 12425 + {0.161133f, 0.437500f, 0.182617f, 0.467773f, 4.2500f, -26.2500f, 30.0000f, 22, 31}, // 12426 + {0.722656f, 0.354492f, 0.750977f, 0.383789f, 0.5625f, -25.9375f, 30.0000f, 29, 30}, // 12427 + {0.635742f, 0.277344f, 0.666992f, 0.307617f, -0.8125f, -26.6250f, 30.0000f, 32, 31}, // 12428 + {0.143555f, 0.373047f, 0.170898f, 0.402344f, 0.6875f, -26.2500f, 30.0000f, 28, 30}, // 12429 + {0.616211f, 0.438477f, 0.641602f, 0.463867f, 2.0000f, -21.3125f, 30.0000f, 26, 26}, // 12430 + {0.742188f, 0.291992f, 0.772461f, 0.322266f, -0.7500f, -26.7500f, 30.0000f, 31, 31}, // 12431 + {0.895508f, 0.342773f, 0.924805f, 0.372070f, 0.1250f, -26.1875f, 30.0000f, 30, 30}, // 12432 + {0.958984f, 0.291992f, 0.989258f, 0.322266f, -0.5000f, -26.1250f, 30.0000f, 31, 31}, // 12433 + {0.557617f, 0.321289f, 0.586914f, 0.351563f, 0.1250f, -26.8750f, 30.0000f, 30, 31}, // 12434 + {0.153320f, 0.312500f, 0.184570f, 0.341797f, -0.6250f, -26.5000f, 30.0000f, 32, 30}, // 12435 + {0.397461f, 0.282227f, 0.426758f, 0.314453f, 2.2500f, -27.7500f, 30.0000f, 30, 33}, // 12436 + {0.048828f, 0.441406f, 0.075195f, 0.465820f, 2.0000f, -21.4375f, 30.0000f, 27, 25}, // 12437 + {0.183594f, 0.451172f, 0.208008f, 0.476563f, 2.7500f, -21.3125f, 30.0000f, 25, 26}, // 12438 +// RANGE: 0x3099 - 0x309f, start 0x115 + {0.998047f, 0.005859f, 0.999023f, 0.006836f, 0.0000f, 0.0000f, 0.0000f, 1, 1}, // 12441 + {0.998047f, 0.007813f, 0.999023f, 0.008789f, 0.0000f, 0.0000f, 0.0000f, 1, 1}, // 12442 + {0.301758f, 0.215820f, 0.313477f, 0.226563f, -0.8125f, -27.2500f, 30.0000f, 12, 11}, // 12443 + {0.781250f, 0.358398f, 0.791992f, 0.369141f, -0.8125f, -27.1875f, 30.0000f, 11, 11}, // 12444 + {0.098633f, 0.523438f, 0.117188f, 0.542969f, 6.6250f, -21.0000f, 30.0000f, 19, 20}, // 12445 + {0.362305f, 0.469727f, 0.384766f, 0.494141f, 6.6875f, -25.2500f, 30.0000f, 23, 25}, // 12446 +// RANGE: 0x30a0 - 0x30ff, start 0x11b + {0.998047f, 0.009766f, 0.999023f, 0.010742f, 0.0000f, 0.0000f, 0.0000f, 1, 1}, // 12448 + {0.267578f, 0.464844f, 0.291992f, 0.488281f, 3.3750f, -20.1250f, 30.0000f, 25, 24}, // 12449 + {0.955078f, 0.354492f, 0.984375f, 0.382813f, 0.8125f, -25.1250f, 30.0000f, 30, 29}, // 12450 + {0.553711f, 0.451172f, 0.578125f, 0.476563f, 1.6875f, -21.1250f, 30.0000f, 25, 26}, // 12451 + {0.029297f, 0.348633f, 0.057617f, 0.378906f, 0.0625f, -26.4375f, 30.0000f, 29, 31}, // 12452 + {0.783203f, 0.470703f, 0.804688f, 0.496094f, 4.2500f, -21.7500f, 30.0000f, 22, 26}, // 12453 + {0.000000f, 0.375977f, 0.026367f, 0.406250f, 2.1875f, -26.6875f, 30.0000f, 27, 31}, // 12454 + {0.162109f, 0.261719f, 0.186523f, 0.281250f, 2.6875f, -18.1875f, 30.0000f, 25, 20}, // 12455 + {0.461914f, 0.431641f, 0.490234f, 0.455078f, 0.6250f, -22.3750f, 30.0000f, 29, 24}, // 12456 + {0.948242f, 0.451172f, 0.972656f, 0.476563f, 2.4375f, -21.4375f, 30.0000f, 25, 26}, // 12457 + {0.279297f, 0.322266f, 0.308594f, 0.352539f, -0.3750f, -26.6250f, 30.0000f, 30, 31}, // 12458 + {0.751953f, 0.358398f, 0.780273f, 0.387695f, 0.3125f, -26.3750f, 30.0000f, 29, 30}, // 12459 + {0.894531f, 0.249023f, 0.925781f, 0.280273f, 0.4375f, -28.1250f, 30.0000f, 32, 32}, // 12460 + {0.834961f, 0.322266f, 0.864258f, 0.352539f, 0.3750f, -26.6250f, 30.0000f, 30, 31}, // 12461 + {0.129883f, 0.218750f, 0.161133f, 0.250977f, 0.2500f, -28.3125f, 30.0000f, 32, 33}, // 12462 + {0.455078f, 0.367188f, 0.482422f, 0.397461f, 0.8750f, -26.6875f, 30.0000f, 28, 31}, // 12463 + {0.573242f, 0.252930f, 0.603516f, 0.285156f, 0.9375f, -28.3125f, 30.0000f, 31, 33}, // 12464 + {0.732422f, 0.323242f, 0.761719f, 0.353516f, 0.1250f, -26.5625f, 30.0000f, 30, 31}, // 12465 + {0.333984f, 0.250000f, 0.365234f, 0.281250f, 0.1250f, -28.0000f, 30.0000f, 32, 32}, // 12466 + {0.973633f, 0.451172f, 0.999023f, 0.475586f, 2.0000f, -22.5000f, 30.0000f, 26, 25}, // 12467 + {0.956055f, 0.323242f, 0.985352f, 0.353516f, 2.2500f, -28.3125f, 30.0000f, 30, 31}, // 12468 + {0.773438f, 0.295898f, 0.803711f, 0.326172f, -0.0625f, -26.5000f, 30.0000f, 31, 31}, // 12469 + {0.960938f, 0.224609f, 0.993164f, 0.255859f, -0.1250f, -28.0625f, 30.0000f, 33, 32}, // 12470 + {0.357422f, 0.359375f, 0.386719f, 0.387695f, 0.4375f, -25.5625f, 30.0000f, 30, 29}, // 12471 + {0.710938f, 0.279297f, 0.741211f, 0.310547f, 0.4375f, -28.1875f, 30.0000f, 31, 32}, // 12472 + {0.855469f, 0.373047f, 0.884766f, 0.400391f, 0.1250f, -24.6250f, 30.0000f, 30, 28}, // 12473 + {0.399414f, 0.250000f, 0.430664f, 0.281250f, 0.1250f, -28.2500f, 30.0000f, 32, 32}, // 12474 + {0.512695f, 0.363281f, 0.541992f, 0.391602f, 0.0625f, -25.8125f, 30.0000f, 30, 29}, // 12475 + {0.494141f, 0.280273f, 0.525391f, 0.310547f, 0.0625f, -28.1875f, 30.0000f, 32, 31}, // 12476 + {0.638672f, 0.396484f, 0.666016f, 0.423828f, 1.3750f, -24.2500f, 30.0000f, 28, 28}, // 12477 + {0.552734f, 0.352539f, 0.580078f, 0.383789f, 2.1250f, -28.3125f, 30.0000f, 28, 32}, // 12478 + {0.483398f, 0.376953f, 0.509766f, 0.407227f, 0.8750f, -26.8125f, 30.0000f, 27, 31}, // 12479 + {0.604492f, 0.252930f, 0.634766f, 0.285156f, 1.0625f, -28.3125f, 30.0000f, 31, 33}, // 12480 + {0.058594f, 0.348633f, 0.086914f, 0.378906f, 0.5625f, -26.3125f, 30.0000f, 29, 31}, // 12481 + {0.162109f, 0.281250f, 0.193359f, 0.311523f, 0.4375f, -26.3750f, 30.0000f, 32, 31}, // 12482 + {0.101563f, 0.469727f, 0.125000f, 0.493164f, 2.9375f, -19.9375f, 30.0000f, 24, 24}, // 12483 + {0.112305f, 0.379883f, 0.140625f, 0.407227f, 0.7500f, -24.5625f, 30.0000f, 29, 28}, // 12484 + {0.925781f, 0.312500f, 0.955078f, 0.343750f, 0.7500f, -28.3125f, 30.0000f, 30, 32}, // 12485 + {0.581055f, 0.363281f, 0.609375f, 0.392578f, 1.0000f, -25.3750f, 30.0000f, 29, 30}, // 12486 + {0.863281f, 0.253906f, 0.893555f, 0.286133f, 1.2500f, -28.3750f, 30.0000f, 31, 33}, // 12487 + {0.317383f, 0.464844f, 0.335938f, 0.495117f, 8.3750f, -26.6250f, 30.0000f, 19, 31}, // 12488 + {0.959961f, 0.418945f, 0.982422f, 0.450195f, 8.3750f, -27.3750f, 30.0000f, 23, 32}, // 12489 + {0.762695f, 0.327148f, 0.791992f, 0.357422f, 0.3750f, -26.7500f, 30.0000f, 30, 31}, // 12490 + {0.401367f, 0.445313f, 0.429688f, 0.467773f, 0.4375f, -22.3750f, 30.0000f, 29, 23}, // 12491 + {0.058594f, 0.412109f, 0.083984f, 0.440430f, 1.8125f, -25.0625f, 30.0000f, 26, 29}, // 12492 + {0.194336f, 0.281250f, 0.224609f, 0.312500f, -0.5000f, -27.3750f, 30.0000f, 31, 32}, // 12493 + {0.885742f, 0.373047f, 0.913086f, 0.402344f, 0.5000f, -26.1875f, 30.0000f, 28, 30}, // 12494 + {0.027344f, 0.379883f, 0.058594f, 0.405273f, -1.0000f, -23.1875f, 30.0000f, 32, 26}, // 12495 + {0.089844f, 0.254883f, 0.122070f, 0.285156f, -0.8750f, -28.0625f, 30.0000f, 33, 31}, // 12496 + {0.925781f, 0.282227f, 0.958008f, 0.311523f, -0.8750f, -27.8125f, 30.0000f, 33, 30}, // 12497 + {0.680664f, 0.425781f, 0.705078f, 0.454102f, 3.3750f, -25.7500f, 30.0000f, 25, 29}, // 12498 + {0.114258f, 0.348633f, 0.142578f, 0.378906f, 3.3750f, -28.1250f, 30.0000f, 29, 31}, // 12499 + {0.610352f, 0.367188f, 0.637695f, 0.397461f, 3.3750f, -27.5625f, 30.0000f, 28, 31}, // 12500 + {0.684570f, 0.397461f, 0.711914f, 0.424805f, 1.6250f, -23.8750f, 30.0000f, 28, 28}, // 12501 + {0.431641f, 0.256836f, 0.461914f, 0.289063f, 1.7500f, -28.3125f, 30.0000f, 31, 33}, // 12502 + {0.894531f, 0.281250f, 0.924805f, 0.312500f, 1.7500f, -28.1875f, 30.0000f, 31, 32}, // 12503 + {0.224609f, 0.396484f, 0.256836f, 0.419922f, -1.1875f, -22.5000f, 30.0000f, 33, 24}, // 12504 + {0.651367f, 0.338867f, 0.683594f, 0.366211f, -1.1250f, -26.9375f, 30.0000f, 33, 28}, // 12505 + {0.792969f, 0.340820f, 0.825195f, 0.368164f, -1.1875f, -26.9375f, 30.0000f, 33, 28}, // 12506 + {0.174805f, 0.343750f, 0.204102f, 0.373047f, 0.1250f, -26.4375f, 30.0000f, 30, 30}, // 12507 + {0.926758f, 0.250000f, 0.958008f, 0.281250f, 0.1250f, -28.0000f, 30.0000f, 32, 32}, // 12508 + {0.311523f, 0.282227f, 0.341797f, 0.313477f, 0.1250f, -28.0625f, 30.0000f, 31, 32}, // 12509 + {0.141602f, 0.403320f, 0.170898f, 0.428711f, 0.0625f, -23.1250f, 30.0000f, 30, 26}, // 12510 + {0.764648f, 0.425781f, 0.788086f, 0.455078f, 2.5000f, -25.9375f, 30.0000f, 24, 30}, // 12511 + {0.309570f, 0.349609f, 0.339844f, 0.377930f, 0.0000f, -25.9375f, 30.0000f, 31, 29}, // 12512 + {0.387695f, 0.377930f, 0.414063f, 0.408203f, 0.6250f, -26.5000f, 30.0000f, 27, 31}, // 12513 + {0.264648f, 0.383789f, 0.292969f, 0.411133f, 0.6250f, -24.6250f, 30.0000f, 29, 28}, // 12514 + {0.430664f, 0.454102f, 0.455078f, 0.479492f, 2.6250f, -21.3125f, 30.0000f, 25, 26}, // 12515 + {0.367188f, 0.328125f, 0.396484f, 0.358398f, 0.0625f, -26.6250f, 30.0000f, 30, 31}, // 12516 + {0.330078f, 0.502930f, 0.354492f, 0.522461f, 2.7500f, -18.5625f, 30.0000f, 25, 20}, // 12517 + {0.195313f, 0.426758f, 0.224609f, 0.450195f, 0.2500f, -23.0625f, 30.0000f, 30, 24}, // 12518 + {0.637695f, 0.517578f, 0.657227f, 0.540039f, 4.8125f, -18.7500f, 30.0000f, 20, 23}, // 12519 + {0.789063f, 0.442383f, 0.812500f, 0.469727f, 2.5625f, -24.2500f, 30.0000f, 24, 28}, // 12520 + {0.171875f, 0.374023f, 0.199219f, 0.403320f, 1.3125f, -25.3125f, 30.0000f, 28, 30}, // 12521 + {0.531250f, 0.447266f, 0.552734f, 0.476563f, 4.6875f, -26.0000f, 30.0000f, 22, 30}, // 12522 + {0.185547f, 0.313477f, 0.216797f, 0.342773f, -0.9375f, -25.8750f, 30.0000f, 32, 30}, // 12523 + {0.415039f, 0.384766f, 0.441406f, 0.414063f, 4.2500f, -25.6250f, 30.0000f, 27, 30}, // 12524 + {0.491211f, 0.454102f, 0.516602f, 0.478516f, 2.4375f, -22.5625f, 30.0000f, 26, 25}, // 12525 + {0.805664f, 0.477539f, 0.828125f, 0.500977f, 4.0000f, -19.8750f, 30.0000f, 23, 24}, // 12526 + {0.932617f, 0.411133f, 0.958984f, 0.438477f, 2.0625f, -24.3750f, 30.0000f, 27, 28}, // 12527 + {0.587891f, 0.332031f, 0.617188f, 0.362305f, 0.1875f, -26.5625f, 30.0000f, 30, 31}, // 12528 + {0.559570f, 0.426758f, 0.588867f, 0.450195f, 0.5000f, -23.0000f, 30.0000f, 30, 24}, // 12529 + {0.257813f, 0.412109f, 0.283203f, 0.440430f, 2.6250f, -25.0000f, 30.0000f, 26, 29}, // 12530 + {0.810547f, 0.383789f, 0.838867f, 0.411133f, 1.5000f, -24.3750f, 30.0000f, 29, 28}, // 12531 + {0.056641f, 0.284180f, 0.085938f, 0.316406f, 2.3125f, -28.3750f, 30.0000f, 30, 33}, // 12532 + {0.292969f, 0.464844f, 0.316406f, 0.489258f, 3.0625f, -21.1875f, 30.0000f, 24, 25}, // 12533 + {0.668945f, 0.455078f, 0.693359f, 0.480469f, 2.4375f, -21.3125f, 30.0000f, 25, 26}, // 12534 + {0.123047f, 0.284180f, 0.152344f, 0.316406f, 2.2500f, -28.4375f, 30.0000f, 30, 33}, // 12535 + {0.301758f, 0.226563f, 0.333008f, 0.258789f, 0.1875f, -28.3125f, 30.0000f, 32, 33}, // 12536 + {0.521484f, 0.333008f, 0.551758f, 0.362305f, 0.5000f, -28.2500f, 30.0000f, 31, 30}, // 12537 + {0.342773f, 0.285156f, 0.372070f, 0.317383f, 2.1875f, -28.3125f, 30.0000f, 30, 33}, // 12538 + {0.329102f, 0.378906f, 0.339844f, 0.389648f, 9.5000f, -16.8750f, 30.0000f, 11, 11}, // 12539 + {0.541992f, 0.533203f, 0.571289f, 0.541016f, 0.2500f, -15.3750f, 30.0000f, 30, 8}, // 12540 + {0.228516f, 0.456055f, 0.246094f, 0.473633f, 5.5625f, -20.0000f, 30.0000f, 18, 18}, // 12541 + {0.311523f, 0.259766f, 0.333984f, 0.282227f, 5.5625f, -25.1250f, 30.0000f, 23, 23}, // 12542 +}; +const AtlasCharRange font_UBUNTU24_ranges[] = { + { 32, 128, 0 }, { 128, 129, 96 }, { 162, 255, 97 }, { 8482, 8483, 190 }, { 12353, 12439, 191 }, { 12441, 12447, 277 }, { 12448, 12543, 283 },}; const AtlasFont font_UBUNTU24 = { - -1.375000f, // padding - 36.687500f, // height - 26.937500f, // ascend + 16.625000f, // padding + 43.375000f, // height + 31.937500f, // ascend 0.750000f, // distslope - { - {0.865234f, 0.101563f, 0.867188f, 0.103516f, -2.0000f, -2.0000f, 7.0625f, 1, 1}, // 32 - {0.390625f, 0.458984f, 0.406250f, 0.509766f, -0.3750f, -23.1250f, 6.3750f, 8, 26}, // 33 - {0.857422f, 0.529297f, 0.880859f, 0.552734f, -0.5000f, -23.0625f, 10.2500f, 12, 12}, // 34 - {0.546875f, 0.644531f, 0.583984f, 0.695313f, -1.5625f, -23.0625f, 15.3125f, 19, 26}, // 35 - {0.333984f, 0.802734f, 0.365234f, 0.853516f, -1.1875f, -23.0625f, 13.8125f, 16, 26}, // 36 - {0.759766f, 0.599609f, 0.804688f, 0.650391f, -0.7500f, -23.3750f, 20.9375f, 23, 26}, // 37 - {0.367188f, 0.699219f, 0.400391f, 0.750000f, -0.9375f, -23.0625f, 14.1250f, 17, 26}, // 38 - {0.984375f, 0.261719f, 0.998047f, 0.285156f, -0.5000f, -23.0625f, 5.3125f, 7, 12}, // 39 - {0.316406f, 0.474609f, 0.339844f, 0.544922f, 0.3750f, -26.9375f, 10.7500f, 12, 36}, // 40 - {0.908203f, 0.773438f, 0.931641f, 0.843750f, -1.3750f, -26.9375f, 10.7500f, 12, 36}, // 41 - {0.000000f, 0.917969f, 0.031250f, 0.947266f, -1.2500f, -23.0625f, 12.8750f, 16, 15}, // 42 - {0.621094f, 0.521484f, 0.652344f, 0.552734f, -0.5000f, -18.3750f, 14.7500f, 16, 16}, // 43 - {0.658203f, 0.642578f, 0.673828f, 0.666016f, -0.5000f, -4.9375f, 5.7500f, 8, 12}, // 44 - {0.769531f, 0.517578f, 0.789063f, 0.529297f, -1.4375f, -12.6250f, 7.1250f, 10, 6}, // 45 - {0.267578f, 0.460938f, 0.283203f, 0.474609f, -0.5000f, -4.9375f, 6.1250f, 8, 7}, // 46 - {0.800781f, 0.777344f, 0.830078f, 0.833984f, -3.0625f, -23.0625f, 9.1250f, 15, 29}, // 47 - {0.935547f, 0.699219f, 0.968750f, 0.750000f, -0.7500f, -23.0625f, 15.4375f, 17, 26}, // 48 - {0.789063f, 0.652344f, 0.806641f, 0.703125f, -1.7500f, -23.0625f, 6.6250f, 9, 26}, // 49 - {0.511719f, 0.701172f, 0.544922f, 0.751953f, -0.8125f, -23.0625f, 14.3750f, 17, 26}, // 50 - {0.876953f, 0.826172f, 0.906250f, 0.876953f, -1.1875f, -23.0625f, 12.8750f, 15, 26}, // 51 - {0.861328f, 0.667969f, 0.896484f, 0.718750f, -1.6250f, -23.0625f, 13.8125f, 18, 26}, // 52 - {0.732422f, 0.705078f, 0.765625f, 0.755859f, -0.7500f, -23.0625f, 14.8750f, 17, 26}, // 53 - {0.767578f, 0.705078f, 0.800781f, 0.755859f, -0.7500f, -23.0625f, 14.9375f, 17, 26}, // 54 - {0.542969f, 0.802734f, 0.574219f, 0.853516f, -1.5000f, -23.0625f, 12.1250f, 16, 26}, // 55 - {0.898438f, 0.667969f, 0.933594f, 0.718750f, -0.8750f, -23.0625f, 15.5625f, 18, 26}, // 56 - {0.000000f, 0.716797f, 0.033203f, 0.767578f, -0.8750f, -23.0625f, 15.0000f, 17, 26}, // 57 - {0.367188f, 0.544922f, 0.382813f, 0.580078f, -0.3125f, -15.4375f, 6.5625f, 8, 18}, // 58 - {0.443359f, 0.921875f, 0.458984f, 0.966797f, -0.3125f, -15.4375f, 6.5625f, 8, 23}, // 59 - {0.500000f, 0.902344f, 0.531250f, 0.937500f, -0.5000f, -19.5000f, 14.7500f, 16, 18}, // 60 - {0.826172f, 0.640625f, 0.857422f, 0.664063f, -0.5000f, -16.3750f, 14.7500f, 16, 12}, // 61 - {0.667969f, 0.906250f, 0.699219f, 0.941406f, -0.5000f, -19.5000f, 14.7500f, 16, 18}, // 62 - {0.367188f, 0.804688f, 0.398438f, 0.855469f, -1.7500f, -23.0625f, 12.3750f, 16, 26}, // 63 - {0.707031f, 0.634766f, 0.748047f, 0.681641f, -0.8750f, -19.5625f, 18.5000f, 21, 24}, // 64 - {0.193359f, 0.669922f, 0.228516f, 0.720703f, -1.8125f, -23.0625f, 14.1875f, 18, 26}, // 65 - {0.402344f, 0.720703f, 0.435547f, 0.771484f, -0.5000f, -23.0625f, 15.0625f, 17, 26}, // 66 - {0.183594f, 0.828125f, 0.212891f, 0.878906f, -0.7500f, -23.0625f, 12.6875f, 15, 26}, // 67 - {0.437500f, 0.720703f, 0.470703f, 0.771484f, -0.5000f, -23.0625f, 15.5000f, 17, 26}, // 68 - {0.654297f, 0.828125f, 0.683594f, 0.878906f, -0.5000f, -23.0625f, 12.8750f, 15, 26}, // 69 - {0.033203f, 0.830078f, 0.062500f, 0.880859f, -0.5000f, -23.0625f, 11.8750f, 15, 26}, // 70 - {0.472656f, 0.720703f, 0.505859f, 0.771484f, -0.7500f, -23.0625f, 15.2500f, 17, 26}, // 71 - {0.861328f, 0.720703f, 0.894531f, 0.771484f, -0.5000f, -23.0625f, 15.8750f, 17, 26}, // 72 - {0.281250f, 0.917969f, 0.296875f, 0.968750f, -0.4375f, -23.0625f, 6.2500f, 8, 26}, // 73 - {0.781250f, 0.835938f, 0.810547f, 0.886719f, -1.7500f, -23.0625f, 11.8125f, 15, 26}, // 74 - {0.896484f, 0.720703f, 0.929688f, 0.771484f, -0.5000f, -23.0625f, 14.5000f, 17, 26}, // 75 - {0.574219f, 0.869141f, 0.601563f, 0.919922f, -0.5000f, -23.0625f, 11.1875f, 14, 26}, // 76 - {0.466797f, 0.611328f, 0.507813f, 0.662109f, -0.5000f, -23.0625f, 19.7500f, 21, 26}, // 77 - {0.193359f, 0.722656f, 0.226563f, 0.773438f, -0.5625f, -23.0625f, 15.8125f, 17, 26}, // 78 - {0.658203f, 0.669922f, 0.693359f, 0.720703f, -0.7500f, -23.0625f, 16.1250f, 18, 26}, // 79 - {0.660156f, 0.722656f, 0.693359f, 0.773438f, -0.5000f, -23.0625f, 14.5625f, 17, 26}, // 80 - {0.091797f, 0.642578f, 0.126953f, 0.697266f, -0.7500f, -23.0625f, 16.3125f, 18, 28}, // 81 - {0.035156f, 0.724609f, 0.068359f, 0.775391f, -0.5000f, -23.0625f, 15.4375f, 17, 26}, // 82 - {0.802734f, 0.724609f, 0.835938f, 0.775391f, -1.3125f, -23.0625f, 13.6875f, 17, 26}, // 83 - {0.933594f, 0.804688f, 0.964844f, 0.855469f, -1.7500f, -23.0625f, 12.3125f, 16, 26}, // 84 - {0.230469f, 0.673828f, 0.265625f, 0.724609f, -0.6250f, -23.0625f, 16.3125f, 18, 26}, // 85 - {0.128906f, 0.675781f, 0.164063f, 0.726563f, -1.8125f, -23.0625f, 13.8125f, 18, 26}, // 86 - {0.707031f, 0.582031f, 0.757813f, 0.632813f, -1.7500f, -23.0625f, 22.2500f, 26, 26}, // 87 - {0.228516f, 0.726563f, 0.261719f, 0.777344f, -1.5625f, -23.0625f, 13.5625f, 17, 26}, // 88 - {0.125000f, 0.728516f, 0.158203f, 0.779297f, -1.9375f, -23.0625f, 12.5625f, 17, 26}, // 89 - {0.509766f, 0.806641f, 0.541016f, 0.857422f, -1.0000f, -23.0625f, 13.0625f, 16, 26}, // 90 - {0.689453f, 0.789063f, 0.712891f, 0.859375f, 0.3750f, -26.9375f, 10.7500f, 12, 36}, // 91 - {0.230469f, 0.779297f, 0.259766f, 0.835938f, -2.0000f, -23.0625f, 9.1250f, 15, 29}, // 92 - {0.582031f, 0.796875f, 0.605469f, 0.867188f, -1.3750f, -26.9375f, 10.7500f, 12, 36}, // 93 - {0.824219f, 0.259766f, 0.851563f, 0.283203f, -1.1250f, -23.0625f, 11.4375f, 14, 12}, // 94 - {0.292969f, 0.289063f, 0.324219f, 0.300781f, -2.0000f, 0.0625f, 11.6250f, 16, 6}, // 95 - {0.341797f, 0.730469f, 0.367188f, 0.748047f, -0.5000f, -24.9375f, 11.9375f, 13, 9}, // 96 - {0.000000f, 0.875000f, 0.033203f, 0.916016f, -1.0000f, -18.6875f, 14.4375f, 17, 21}, // 97 - {0.695313f, 0.736328f, 0.728516f, 0.787109f, -0.5000f, -23.6875f, 15.3750f, 17, 26}, // 98 - {0.035156f, 0.882813f, 0.064453f, 0.923828f, -0.7500f, -18.6875f, 12.3750f, 15, 21}, // 99 - {0.583984f, 0.744141f, 0.617188f, 0.794922f, -0.7500f, -23.6875f, 15.3750f, 17, 26}, // 100 - {0.246094f, 0.875000f, 0.279297f, 0.916016f, -0.7500f, -18.6875f, 14.5000f, 17, 21}, // 101 - {0.224609f, 0.890625f, 0.246094f, 0.941406f, -0.5000f, -23.6875f, 8.1250f, 11, 26}, // 102 - {0.000000f, 0.660156f, 0.033203f, 0.714844f, -0.7500f, -18.6875f, 15.3750f, 17, 28}, // 103 - {0.619141f, 0.744141f, 0.652344f, 0.794922f, -0.5000f, -23.6875f, 15.6250f, 17, 26}, // 104 - {0.298828f, 0.917969f, 0.314453f, 0.968750f, -0.4375f, -23.6875f, 6.1875f, 8, 26}, // 105 - {0.945313f, 0.857422f, 0.966797f, 0.921875f, -3.3750f, -23.6875f, 6.6250f, 11, 33}, // 106 - {0.714844f, 0.810547f, 0.746094f, 0.861328f, -0.5000f, -23.6875f, 13.6250f, 16, 26}, // 107 - {0.066406f, 0.919922f, 0.082031f, 0.970703f, -0.5000f, -23.6875f, 6.0625f, 8, 26}, // 108 - {0.857422f, 0.625000f, 0.906250f, 0.666016f, -0.5000f, -18.6875f, 23.1875f, 25, 21}, // 109 - {0.064453f, 0.876953f, 0.097656f, 0.917969f, -0.5000f, -18.6875f, 15.6250f, 17, 21}, // 110 - {0.365234f, 0.857422f, 0.400391f, 0.898438f, -0.7500f, -18.6875f, 15.5625f, 18, 21}, // 111 - {0.406250f, 0.664063f, 0.439453f, 0.718750f, -0.5000f, -18.6875f, 15.3750f, 17, 28}, // 112 - {0.441406f, 0.664063f, 0.474609f, 0.718750f, -0.7500f, -18.6875f, 15.3750f, 17, 28}, // 113 - {0.193359f, 0.576172f, 0.216797f, 0.617188f, -0.6250f, -18.6875f, 9.6875f, 12, 21}, // 114 - {0.406250f, 0.373047f, 0.437500f, 0.414063f, -1.1250f, -18.6875f, 13.6250f, 16, 21}, // 115 - {0.365234f, 0.900391f, 0.388672f, 0.951172f, -0.6250f, -23.0625f, 8.9375f, 12, 26}, // 116 - {0.402344f, 0.878906f, 0.435547f, 0.919922f, -0.6250f, -18.6875f, 15.5000f, 17, 21}, // 117 - {0.908203f, 0.857422f, 0.943359f, 0.898438f, -1.7500f, -18.6875f, 14.3125f, 18, 21}, // 118 - {0.316406f, 0.615234f, 0.367188f, 0.656250f, -1.6875f, -18.6875f, 22.4375f, 26, 21}, // 119 - {0.500000f, 0.859375f, 0.535156f, 0.900391f, -1.7500f, -18.6875f, 13.8125f, 18, 21}, // 120 - {0.369141f, 0.642578f, 0.404297f, 0.697266f, -1.7500f, -18.6875f, 14.0000f, 18, 28}, // 121 - {0.193359f, 0.890625f, 0.222656f, 0.931641f, -1.0000f, -18.6875f, 12.7500f, 15, 21}, // 122 - {0.339844f, 0.658203f, 0.365234f, 0.728516f, -0.6875f, -26.9375f, 10.9375f, 13, 36}, // 123 - {0.984375f, 0.191406f, 0.998047f, 0.259766f, 0.6875f, -26.3125f, 7.9375f, 7, 35}, // 124 - {0.166016f, 0.675781f, 0.191406f, 0.746094f, -1.3750f, -26.9375f, 10.9375f, 13, 36}, // 125 - {0.867188f, 0.921875f, 0.898438f, 0.937500f, -0.5000f, -14.1875f, 14.7500f, 16, 8}, // 126 - {0.316406f, 0.544922f, 0.365234f, 0.613281f, -0.5000f, -25.2500f, 23.1250f, 25, 35}, // 127 - }, + font_UBUNTU24_chardata, + font_UBUNTU24_ranges, + 7, "UBUNTU24", // name }; -const AtlasFont font_UBUNTUBOLD24 = { - -1.375000f, // padding - 36.687500f, // height - 26.937500f, // ascend - 0.750000f, // distslope - { - {0.869141f, 0.101563f, 0.871094f, 0.103516f, -2.0000f, -2.0000f, 7.0625f, 1, 1}, // 32 - {0.083984f, 0.919922f, 0.099609f, 0.970703f, -0.3750f, -23.1250f, 6.3750f, 8, 26}, // 33 - {0.509766f, 0.611328f, 0.533203f, 0.634766f, -0.5000f, -23.0625f, 10.2500f, 12, 12}, // 34 - {0.750000f, 0.652344f, 0.787109f, 0.703125f, -1.5625f, -23.0625f, 15.3125f, 19, 26}, // 35 - {0.748047f, 0.810547f, 0.779297f, 0.861328f, -1.1875f, -23.0625f, 13.8125f, 16, 26}, // 36 - {0.419922f, 0.611328f, 0.464844f, 0.662109f, -0.7500f, -23.3750f, 20.9375f, 23, 26}, // 37 - {0.160156f, 0.748047f, 0.193359f, 0.798828f, -0.9375f, -23.0625f, 14.1250f, 17, 26}, // 38 - {0.935547f, 0.667969f, 0.949219f, 0.691406f, -0.5000f, -23.0625f, 5.3125f, 7, 12}, // 39 - {0.607422f, 0.796875f, 0.630859f, 0.867188f, 0.3750f, -26.9375f, 10.7500f, 12, 36}, // 40 - {0.158203f, 0.800781f, 0.181641f, 0.871094f, -1.3750f, -26.9375f, 10.7500f, 12, 36}, // 41 - {0.248047f, 0.917969f, 0.279297f, 0.947266f, -1.2500f, -23.0625f, 12.8750f, 16, 15}, // 42 - {0.128906f, 0.642578f, 0.160156f, 0.673828f, -0.5000f, -18.3750f, 14.7500f, 16, 16}, // 43 - {0.267578f, 0.673828f, 0.283203f, 0.697266f, -0.5000f, -4.9375f, 5.7500f, 8, 12}, // 44 - {0.791016f, 0.517578f, 0.810547f, 0.529297f, -1.4375f, -12.6250f, 7.1250f, 10, 6}, // 45 - {0.236328f, 0.617188f, 0.251953f, 0.630859f, -0.5000f, -4.9375f, 6.1250f, 8, 7}, // 46 - {0.126953f, 0.781250f, 0.156250f, 0.837891f, -3.0625f, -23.0625f, 9.1250f, 15, 29}, // 47 - {0.263672f, 0.750000f, 0.296875f, 0.800781f, -0.7500f, -23.0625f, 15.4375f, 17, 26}, // 48 - {0.335938f, 0.908203f, 0.353516f, 0.958984f, -1.7500f, -23.0625f, 6.6250f, 9, 26}, // 49 - {0.298828f, 0.750000f, 0.332031f, 0.800781f, -0.8125f, -23.0625f, 14.3750f, 17, 26}, // 50 - {0.214844f, 0.837891f, 0.244141f, 0.888672f, -1.1875f, -23.0625f, 12.8750f, 15, 26}, // 51 - {0.695313f, 0.683594f, 0.730469f, 0.734375f, -1.6250f, -23.0625f, 13.8125f, 18, 26}, // 52 - {0.333984f, 0.750000f, 0.367188f, 0.800781f, -0.7500f, -23.0625f, 14.8750f, 17, 26}, // 53 - {0.546875f, 0.750000f, 0.580078f, 0.800781f, -0.7500f, -23.0625f, 14.9375f, 17, 26}, // 54 - {0.000000f, 0.822266f, 0.031250f, 0.873047f, -1.5000f, -23.0625f, 12.1250f, 16, 26}, // 55 - {0.585938f, 0.691406f, 0.621094f, 0.742188f, -0.8750f, -23.0625f, 15.5625f, 18, 26}, // 56 - {0.369141f, 0.751953f, 0.402344f, 0.802734f, -0.8750f, -23.0625f, 15.0000f, 17, 26}, // 57 - {0.246094f, 0.837891f, 0.261719f, 0.873047f, -0.3125f, -15.4375f, 6.5625f, 8, 18}, // 58 - {0.609375f, 0.921875f, 0.625000f, 0.966797f, -0.3125f, -15.4375f, 6.5625f, 8, 23}, // 59 - {0.701172f, 0.906250f, 0.732422f, 0.941406f, -0.5000f, -19.5000f, 14.7500f, 16, 18}, // 60 - {0.576172f, 0.921875f, 0.607422f, 0.945313f, -0.5000f, -16.3750f, 14.7500f, 16, 12}, // 61 - {0.833984f, 0.906250f, 0.865234f, 0.941406f, -0.5000f, -19.5000f, 14.7500f, 16, 18}, // 62 - {0.070313f, 0.824219f, 0.101563f, 0.875000f, -1.7500f, -23.0625f, 12.3750f, 16, 26}, // 63 - {0.615234f, 0.642578f, 0.656250f, 0.689453f, -0.8750f, -19.5625f, 18.5000f, 21, 24}, // 64 - {0.623047f, 0.691406f, 0.658203f, 0.742188f, -1.8125f, -23.0625f, 14.1875f, 18, 26}, // 65 - {0.931641f, 0.751953f, 0.964844f, 0.802734f, -0.5000f, -23.0625f, 15.0625f, 17, 26}, // 66 - {0.126953f, 0.839844f, 0.156250f, 0.890625f, -0.7500f, -23.0625f, 12.6875f, 15, 26}, // 67 - {0.507813f, 0.753906f, 0.541016f, 0.804688f, -0.5000f, -23.0625f, 15.5000f, 17, 26}, // 68 - {0.966797f, 0.845703f, 0.996094f, 0.896484f, -0.5000f, -23.0625f, 12.8750f, 15, 26}, // 69 - {0.333984f, 0.855469f, 0.363281f, 0.906250f, -0.5000f, -23.0625f, 11.8750f, 15, 26}, // 70 - {0.730469f, 0.757813f, 0.763672f, 0.808594f, -0.7500f, -23.0625f, 15.2500f, 17, 26}, // 71 - {0.765625f, 0.757813f, 0.798828f, 0.808594f, -0.5000f, -23.0625f, 15.8750f, 17, 26}, // 72 - {0.390625f, 0.921875f, 0.406250f, 0.972656f, -0.4375f, -23.0625f, 6.2500f, 8, 26}, // 73 - {0.542969f, 0.855469f, 0.572266f, 0.906250f, -1.7500f, -23.0625f, 11.8125f, 15, 26}, // 74 - {0.000000f, 0.769531f, 0.033203f, 0.820313f, -0.5000f, -23.0625f, 14.5000f, 17, 26}, // 75 - {0.603516f, 0.869141f, 0.630859f, 0.919922f, -0.5000f, -23.0625f, 11.1875f, 14, 26}, // 76 - {0.193359f, 0.617188f, 0.234375f, 0.667969f, -0.5000f, -23.0625f, 19.7500f, 21, 26}, // 77 - {0.070313f, 0.771484f, 0.103516f, 0.822266f, -0.5625f, -23.0625f, 15.8125f, 17, 26}, // 78 - {0.267578f, 0.697266f, 0.302734f, 0.748047f, -0.7500f, -23.0625f, 16.1250f, 18, 26}, // 79 - {0.404297f, 0.773438f, 0.437500f, 0.824219f, -0.5000f, -23.0625f, 14.5625f, 17, 26}, // 80 - {0.949219f, 0.642578f, 0.984375f, 0.697266f, -0.7500f, -23.0625f, 16.3125f, 18, 28}, // 81 - {0.439453f, 0.773438f, 0.472656f, 0.824219f, -0.5000f, -23.0625f, 15.4375f, 17, 26}, // 82 - {0.474609f, 0.773438f, 0.507813f, 0.824219f, -1.3125f, -23.0625f, 13.6875f, 17, 26}, // 83 - {0.400391f, 0.826172f, 0.431641f, 0.876953f, -1.7500f, -23.0625f, 12.3125f, 16, 26}, // 84 - {0.304688f, 0.697266f, 0.339844f, 0.748047f, -0.6250f, -23.0625f, 16.3125f, 18, 26}, // 85 - {0.546875f, 0.697266f, 0.582031f, 0.748047f, -1.8125f, -23.0625f, 13.8125f, 18, 26}, // 86 - {0.105469f, 0.589844f, 0.156250f, 0.640625f, -1.7500f, -23.0625f, 22.2500f, 26, 26}, // 87 - {0.837891f, 0.773438f, 0.871094f, 0.824219f, -1.5625f, -23.0625f, 13.5625f, 17, 26}, // 88 - {0.873047f, 0.773438f, 0.906250f, 0.824219f, -1.9375f, -23.0625f, 12.5625f, 17, 26}, // 89 - {0.433594f, 0.826172f, 0.464844f, 0.876953f, -1.0000f, -23.0625f, 13.0625f, 16, 26}, // 90 - {0.261719f, 0.802734f, 0.285156f, 0.873047f, 0.3750f, -26.9375f, 10.7500f, 12, 36}, // 91 - {0.966797f, 0.787109f, 0.996094f, 0.843750f, -2.0000f, -23.0625f, 9.1250f, 15, 29}, // 92 - {0.287109f, 0.802734f, 0.310547f, 0.873047f, -1.3750f, -26.9375f, 10.7500f, 12, 36}, // 93 - {0.287109f, 0.630859f, 0.314453f, 0.654297f, -1.1250f, -23.0625f, 11.4375f, 14, 12}, // 94 - {0.615234f, 0.326172f, 0.646484f, 0.337891f, -2.0000f, 0.0625f, 11.6250f, 16, 6}, // 95 - {0.101563f, 0.925781f, 0.126953f, 0.943359f, -0.5000f, -24.9375f, 11.9375f, 13, 9}, // 96 - {0.437500f, 0.878906f, 0.470703f, 0.919922f, -1.0000f, -18.6875f, 14.4375f, 17, 21}, // 97 - {0.195313f, 0.775391f, 0.228516f, 0.826172f, -0.5000f, -23.6875f, 15.3750f, 17, 26}, // 98 - {0.126953f, 0.892578f, 0.156250f, 0.933594f, -0.7500f, -18.6875f, 12.3750f, 15, 21}, // 99 - {0.654297f, 0.775391f, 0.687500f, 0.826172f, -0.7500f, -23.6875f, 15.3750f, 17, 26}, // 100 - {0.871094f, 0.878906f, 0.904297f, 0.919922f, -0.7500f, -18.6875f, 14.5000f, 17, 21}, // 101 - {0.734375f, 0.906250f, 0.755859f, 0.957031f, -0.5000f, -23.6875f, 8.1250f, 11, 26}, // 102 - {0.476563f, 0.664063f, 0.509766f, 0.718750f, -0.7500f, -18.6875f, 15.3750f, 17, 28}, // 103 - {0.035156f, 0.777344f, 0.068359f, 0.828125f, -0.5000f, -23.6875f, 15.6250f, 17, 26}, // 104 - {0.408203f, 0.921875f, 0.423828f, 0.972656f, -0.4375f, -23.6875f, 6.1875f, 8, 26}, // 105 - {0.103516f, 0.859375f, 0.125000f, 0.923828f, -3.3750f, -23.6875f, 6.6250f, 11, 33}, // 106 - {0.466797f, 0.826172f, 0.498047f, 0.876953f, -0.5000f, -23.6875f, 13.6250f, 16, 26}, // 107 - {0.425781f, 0.921875f, 0.441406f, 0.972656f, -0.5000f, -23.6875f, 6.0625f, 8, 26}, // 108 - {0.236328f, 0.630859f, 0.285156f, 0.671875f, -0.5000f, -18.6875f, 23.1875f, 25, 21}, // 109 - {0.158203f, 0.880859f, 0.191406f, 0.921875f, -0.5000f, -18.6875f, 15.6250f, 17, 21}, // 110 - {0.685547f, 0.863281f, 0.720703f, 0.904297f, -0.7500f, -18.6875f, 15.5625f, 18, 21}, // 111 - {0.035156f, 0.667969f, 0.068359f, 0.722656f, -0.5000f, -18.6875f, 15.3750f, 17, 28}, // 112 - {0.826172f, 0.667969f, 0.859375f, 0.722656f, -0.7500f, -18.6875f, 15.3750f, 17, 28}, // 113 - {0.837891f, 0.724609f, 0.861328f, 0.765625f, -0.6250f, -18.6875f, 9.6875f, 12, 21}, // 114 - {0.281250f, 0.875000f, 0.312500f, 0.916016f, -1.1250f, -18.6875f, 13.6250f, 16, 21}, // 115 - {0.906250f, 0.900391f, 0.929688f, 0.951172f, -0.6250f, -23.0625f, 8.9375f, 12, 26}, // 116 - {0.632813f, 0.882813f, 0.666016f, 0.923828f, -0.6250f, -18.6875f, 15.5000f, 17, 21}, // 117 - {0.722656f, 0.863281f, 0.757813f, 0.904297f, -1.7500f, -18.6875f, 14.3125f, 18, 21}, // 118 - {0.039063f, 0.625000f, 0.089844f, 0.666016f, -1.6875f, -18.6875f, 22.4375f, 26, 21}, // 119 - {0.833984f, 0.863281f, 0.869141f, 0.904297f, -1.7500f, -18.6875f, 13.8125f, 18, 21}, // 120 - {0.509766f, 0.644531f, 0.544922f, 0.699219f, -1.7500f, -18.6875f, 14.0000f, 18, 28}, // 121 - {0.968750f, 0.898438f, 0.998047f, 0.939453f, -1.0000f, -18.6875f, 12.7500f, 15, 21}, // 122 - {0.070313f, 0.699219f, 0.095703f, 0.769531f, -0.6875f, -26.9375f, 10.9375f, 13, 36}, // 123 - {0.931641f, 0.900391f, 0.945313f, 0.968750f, 0.6875f, -26.3125f, 7.9375f, 7, 35}, // 124 - {0.097656f, 0.699219f, 0.123047f, 0.769531f, -1.3750f, -26.9375f, 10.9375f, 13, 36}, // 125 - {0.158203f, 0.923828f, 0.189453f, 0.939453f, -0.5000f, -14.1875f, 14.7500f, 16, 8}, // 126 - {0.216797f, 0.546875f, 0.265625f, 0.615234f, -0.5000f, -25.2500f, 23.1250f, 25, 35}, // 127 - }, - "UBUNTUBOLD24", // name +const AtlasChar font_UBUNTU48_chardata[] = { +// RANGE: 0x20 - 0x80, start 0x17a + {0.998047f, 0.011719f, 0.999023f, 0.012695f, -2.0000f, -2.0000f, 13.0000f, 1, 1}, // 32 + {0.769531f, 0.507813f, 0.779297f, 0.549805f, 1.0000f, -40.7500f, 11.7500f, 10, 43}, // 33 + {0.936523f, 0.529297f, 0.954102f, 0.546875f, 0.7500f, -40.6250f, 18.8750f, 18, 18}, // 34 + {0.461914f, 0.106445f, 0.492188f, 0.148438f, -1.2500f, -40.6250f, 27.9375f, 31, 43}, // 35 + {0.077148f, 0.206055f, 0.102539f, 0.248047f, -0.4375f, -40.6250f, 25.3750f, 26, 43}, // 36 + {0.363281f, 0.035156f, 0.400391f, 0.078125f, 0.3125f, -41.1875f, 38.3750f, 38, 44}, // 37 + {0.628906f, 0.166016f, 0.656250f, 0.208008f, 0.0000f, -40.6250f, 25.9375f, 28, 43}, // 38 + {0.144531f, 0.317383f, 0.153320f, 0.334961f, 0.7500f, -40.6250f, 9.8750f, 9, 18}, // 39 + {0.028320f, 0.172852f, 0.046875f, 0.233398f, 2.3750f, -47.6250f, 19.7500f, 19, 62}, // 40 + {0.875000f, 0.192383f, 0.893555f, 0.252930f, -0.9375f, -47.6250f, 19.6875f, 19, 62}, // 41 + {0.601563f, 0.464844f, 0.625977f, 0.488281f, -0.5625f, -40.6250f, 23.6250f, 25, 24}, // 42 + {0.642578f, 0.438477f, 0.667969f, 0.463867f, 0.7500f, -32.0000f, 27.0000f, 26, 26}, // 43 + {0.863281f, 0.234375f, 0.873047f, 0.252930f, 0.7500f, -7.4375f, 10.5625f, 10, 19}, // 44 + {0.525391f, 0.195313f, 0.541016f, 0.203125f, -1.0000f, -21.5000f, 13.0625f, 16, 8}, // 45 + {0.543945f, 0.149414f, 0.553711f, 0.159180f, 0.7500f, -7.3750f, 11.2500f, 10, 10}, // 46 + {0.573242f, 0.204102f, 0.595703f, 0.251953f, -3.9375f, -40.6250f, 16.7500f, 23, 49}, // 47 + {0.048828f, 0.166992f, 0.076172f, 0.208984f, 0.3125f, -40.6250f, 28.3750f, 28, 43}, // 48 + {0.684570f, 0.202148f, 0.697266f, 0.244141f, -1.5625f, -40.6250f, 12.1250f, 13, 43}, // 49 + {0.470703f, 0.195313f, 0.497070f, 0.237305f, 0.1250f, -40.6250f, 26.2500f, 27, 43}, // 50 + {0.000000f, 0.215820f, 0.024414f, 0.257813f, -0.4375f, -40.6250f, 23.6875f, 25, 43}, // 51 + {0.199219f, 0.130859f, 0.227539f, 0.172852f, -1.3125f, -40.6250f, 25.3125f, 29, 43}, // 52 + {0.498047f, 0.195313f, 0.524414f, 0.237305f, 0.3125f, -40.6250f, 27.2500f, 27, 43}, // 53 + {0.104492f, 0.168945f, 0.131836f, 0.210938f, 0.3125f, -40.6250f, 27.5000f, 28, 43}, // 54 + {0.250977f, 0.215820f, 0.275391f, 0.257813f, -1.0625f, -40.6250f, 22.3125f, 25, 43}, // 55 + {0.359375f, 0.130859f, 0.387695f, 0.172852f, 0.0625f, -40.6250f, 28.5625f, 29, 43}, // 56 + {0.727539f, 0.169922f, 0.754883f, 0.211914f, 0.0625f, -40.6250f, 27.5625f, 28, 43}, // 57 + {0.046875f, 0.286133f, 0.056641f, 0.314453f, 1.1250f, -26.6875f, 12.0625f, 10, 29}, // 58 + {0.189453f, 0.175781f, 0.199219f, 0.212891f, 1.1250f, -26.6875f, 12.0625f, 10, 38}, // 59 + {0.879883f, 0.403320f, 0.905273f, 0.432617f, 0.7500f, -34.0000f, 27.0000f, 26, 30}, // 60 + {0.059570f, 0.504883f, 0.084961f, 0.523438f, 0.7500f, -28.4375f, 27.0000f, 26, 19}, // 61 + {0.906250f, 0.403320f, 0.931641f, 0.432617f, 0.7500f, -34.0000f, 27.0000f, 26, 30}, // 62 + {0.373047f, 0.208984f, 0.398438f, 0.250977f, -1.5625f, -40.6250f, 22.6250f, 26, 43}, // 63 + {0.792969f, 0.101563f, 0.826172f, 0.141602f, 0.0625f, -34.2500f, 33.9375f, 34, 41}, // 64 + {0.076172f, 0.119141f, 0.105469f, 0.161133f, -1.5625f, -40.6250f, 26.0000f, 30, 43}, // 65 + {0.755859f, 0.169922f, 0.783203f, 0.211914f, 0.7500f, -40.6250f, 27.5000f, 28, 43}, // 66 + {0.162109f, 0.218750f, 0.185547f, 0.260742f, 0.3125f, -40.6250f, 23.2500f, 24, 43}, // 67 + {0.000000f, 0.172852f, 0.027344f, 0.214844f, 0.7500f, -40.6250f, 28.5000f, 28, 43}, // 68 + {0.222656f, 0.230469f, 0.246094f, 0.272461f, 0.7500f, -40.6250f, 23.6250f, 24, 43}, // 69 + {0.000000f, 0.258789f, 0.022461f, 0.300781f, 0.7500f, -40.6250f, 21.7500f, 23, 43}, // 70 + {0.257813f, 0.172852f, 0.285156f, 0.214844f, 0.3125f, -40.6250f, 27.9375f, 28, 43}, // 71 + {0.286133f, 0.172852f, 0.313477f, 0.214844f, 0.7500f, -40.6250f, 29.1250f, 28, 43}, // 72 + {0.678711f, 0.508789f, 0.688477f, 0.550781f, 0.8750f, -40.6250f, 11.5000f, 10, 43}, // 73 + {0.373047f, 0.285156f, 0.395508f, 0.327148f, -1.5000f, -40.6250f, 21.6250f, 23, 43}, // 74 + {0.199219f, 0.173828f, 0.226563f, 0.215820f, 0.7500f, -40.6250f, 26.6250f, 28, 43}, // 75 + {0.000000f, 0.301758f, 0.021484f, 0.343750f, 0.7500f, -40.6250f, 20.4375f, 22, 43}, // 76 + {0.258789f, 0.083984f, 0.292969f, 0.125977f, 0.6875f, -40.6250f, 36.0625f, 35, 43}, // 77 + {0.344727f, 0.173828f, 0.372070f, 0.215820f, 0.6250f, -40.6250f, 28.9375f, 28, 43}, // 78 + {0.228516f, 0.135742f, 0.256836f, 0.177734f, 0.3125f, -40.6250f, 29.5625f, 29, 43}, // 79 + {0.909180f, 0.173828f, 0.936523f, 0.215820f, 0.7500f, -40.6250f, 26.7500f, 28, 43}, // 80 + {0.884766f, 0.098633f, 0.914063f, 0.145508f, 0.3125f, -40.6250f, 30.0000f, 30, 48}, // 81 + {0.937500f, 0.174805f, 0.964844f, 0.216797f, 0.7500f, -40.6250f, 28.3750f, 28, 43}, // 82 + {0.699219f, 0.201172f, 0.725586f, 0.243164f, -0.7500f, -40.6250f, 25.0000f, 27, 43}, // 83 + {0.620117f, 0.208984f, 0.645508f, 0.250977f, -1.5625f, -40.6250f, 22.5000f, 26, 43}, // 84 + {0.315430f, 0.139648f, 0.343750f, 0.181641f, 0.5000f, -40.6250f, 29.8750f, 29, 43}, // 85 + {0.791016f, 0.142578f, 0.819336f, 0.184570f, -1.5625f, -40.6250f, 25.3750f, 29, 43}, // 86 + {0.722656f, 0.030273f, 0.765625f, 0.072266f, -1.5625f, -40.6250f, 40.8125f, 44, 43}, // 87 + {0.132813f, 0.175781f, 0.160156f, 0.217773f, -1.1875f, -40.6250f, 24.8750f, 28, 43}, // 88 + {0.831055f, 0.201172f, 0.857422f, 0.243164f, -1.8125f, -40.6250f, 23.0625f, 27, 43}, // 89 + {0.276367f, 0.215820f, 0.300781f, 0.257813f, -0.1875f, -40.6250f, 23.8750f, 25, 43}, // 90 + {0.811523f, 0.194336f, 0.830078f, 0.254883f, 2.3750f, -47.6250f, 19.7500f, 19, 62}, // 91 + {0.596680f, 0.204102f, 0.619141f, 0.251953f, -2.0000f, -40.6250f, 16.7500f, 23, 49}, // 92 + {0.451172f, 0.195313f, 0.469727f, 0.255859f, -0.9375f, -47.6250f, 19.6875f, 19, 62}, // 93 + {0.025391f, 0.234375f, 0.046875f, 0.251953f, -0.3750f, -40.6250f, 20.9375f, 22, 18}, // 94 + {0.118164f, 0.540039f, 0.143555f, 0.547852f, -2.0000f, 1.7500f, 21.2500f, 26, 8}, // 95 + {0.456055f, 0.532227f, 0.476563f, 0.544922f, 0.7500f, -43.9375f, 21.8750f, 21, 13}, // 96 + {0.309570f, 0.314453f, 0.335938f, 0.348633f, -0.1875f, -32.5625f, 26.4375f, 27, 35}, // 97 + {0.699219f, 0.157227f, 0.726563f, 0.200195f, 0.7500f, -41.6875f, 28.2500f, 28, 44}, // 98 + {0.975586f, 0.383789f, 0.998047f, 0.417969f, 0.3125f, -32.5625f, 22.6875f, 23, 35}, // 99 + {0.670898f, 0.158203f, 0.698242f, 0.201172f, 0.3125f, -41.6875f, 28.2500f, 28, 44}, // 100 + {0.086914f, 0.315430f, 0.113281f, 0.349609f, 0.3125f, -32.5625f, 26.6250f, 27, 35}, // 101 + {0.983398f, 0.041016f, 0.999023f, 0.083984f, 0.7500f, -41.6875f, 15.0000f, 16, 44}, // 102 + {0.670898f, 0.111328f, 0.698242f, 0.157227f, 0.3125f, -32.5625f, 28.2500f, 28, 47}, // 103 + {0.422852f, 0.160156f, 0.450195f, 0.203125f, 0.7500f, -41.6875f, 28.6250f, 28, 44}, // 104 + {0.884766f, 0.047852f, 0.894531f, 0.090820f, 0.8750f, -41.7500f, 11.3750f, 10, 44}, // 105 + {0.340820f, 0.349609f, 0.356445f, 0.404297f, -4.5625f, -41.7500f, 12.1250f, 16, 56}, // 106 + {0.525391f, 0.204102f, 0.550781f, 0.247070f, 0.7500f, -41.6875f, 25.0000f, 26, 44}, // 107 + {0.985352f, 0.504883f, 0.995117f, 0.547852f, 0.7500f, -41.6875f, 11.1250f, 10, 44}, // 108 + {0.750977f, 0.088867f, 0.791992f, 0.123047f, 0.7500f, -32.5625f, 42.5625f, 42, 35}, // 109 + {0.558594f, 0.286133f, 0.585938f, 0.320313f, 0.7500f, -32.5625f, 28.6250f, 28, 35}, // 110 + {0.586914f, 0.286133f, 0.614258f, 0.320313f, 0.3125f, -32.5625f, 28.6250f, 28, 35}, // 111 + {0.553711f, 0.113281f, 0.581055f, 0.159180f, 0.7500f, -32.5625f, 28.2500f, 28, 47}, // 112 + {0.582031f, 0.113281f, 0.609375f, 0.159180f, 0.3125f, -32.5625f, 28.2500f, 28, 47}, // 113 + {0.813477f, 0.442383f, 0.832031f, 0.476563f, 0.5000f, -32.5625f, 17.7500f, 19, 35}, // 114 + {0.486328f, 0.341797f, 0.511719f, 0.375977f, -0.3750f, -32.5625f, 25.0000f, 26, 35}, // 115 + {0.792969f, 0.398438f, 0.810547f, 0.440430f, 0.5000f, -40.6250f, 16.4375f, 18, 43}, // 116 + {0.843750f, 0.287109f, 0.871094f, 0.321289f, 0.5000f, -32.5625f, 28.3750f, 28, 35}, // 117 + {0.782227f, 0.229492f, 0.811523f, 0.263672f, -1.5000f, -32.5625f, 26.2500f, 30, 35}, // 118 + {0.707031f, 0.073242f, 0.750000f, 0.107422f, -1.3750f, -32.5625f, 41.0625f, 44, 35}, // 119 + {0.958984f, 0.256836f, 0.987305f, 0.291016f, -1.5625f, -32.5625f, 25.3750f, 29, 35}, // 120 + {0.827148f, 0.101563f, 0.855469f, 0.147461f, -1.5000f, -32.5625f, 25.6250f, 29, 47}, // 121 + {0.087891f, 0.350586f, 0.111328f, 0.384766f, -0.1875f, -32.5625f, 23.3750f, 24, 35}, // 122 + {0.156250f, 0.114258f, 0.176758f, 0.174805f, 0.3125f, -47.6250f, 19.9375f, 21, 62}, // 123 + {0.990234f, 0.256836f, 0.999023f, 0.315430f, 2.8750f, -46.5000f, 14.5000f, 9, 60}, // 124 + {0.177734f, 0.114258f, 0.198242f, 0.174805f, -0.8750f, -47.6250f, 20.0625f, 21, 62}, // 125 + {0.587891f, 0.321289f, 0.613281f, 0.332031f, 0.7500f, -24.3125f, 27.0000f, 26, 11}, // 126 + {0.558594f, 0.000000f, 0.598633f, 0.058594f, 0.7500f, -44.6250f, 42.3750f, 41, 60}, // 127 +// RANGE: 0x80 - 0x81, start 0x1da + {0.599609f, 0.000000f, 0.639648f, 0.058594f, 0.7500f, -44.6250f, 42.3750f, 41, 60}, // 128 +// RANGE: 0xa2 - 0xff, start 0x1db + {0.023438f, 0.286133f, 0.045898f, 0.328125f, 0.7500f, -40.6250f, 23.1250f, 23, 43}, // 162 + {0.047852f, 0.209961f, 0.073242f, 0.251953f, -0.8750f, -40.6250f, 24.1875f, 26, 43}, // 163 + {0.640625f, 0.000000f, 0.680664f, 0.058594f, 0.7500f, -44.6250f, 42.3750f, 41, 60}, // 164 + {0.657227f, 0.202148f, 0.683594f, 0.244141f, -1.0000f, -40.6250f, 24.1250f, 27, 43}, // 165 + {0.990234f, 0.316406f, 0.999023f, 0.375000f, 2.8750f, -46.5000f, 14.5000f, 9, 60}, // 166 + {0.707031f, 0.108398f, 0.733398f, 0.156250f, 0.1875f, -40.6250f, 26.7500f, 27, 49}, // 167 + {0.502930f, 0.238281f, 0.525391f, 0.248047f, 0.7500f, -41.8125f, 23.7500f, 23, 10}, // 168 + {0.293945f, 0.083984f, 0.328125f, 0.125977f, 0.3125f, -40.6250f, 35.1250f, 35, 43}, // 169 + {0.398438f, 0.526367f, 0.415039f, 0.546875f, 0.6250f, -35.3125f, 18.1250f, 17, 21}, // 170 + {0.637695f, 0.495117f, 0.660156f, 0.516602f, -0.8750f, -28.6250f, 20.9375f, 23, 22}, // 171 + {0.456055f, 0.456055f, 0.484375f, 0.477539f, 0.6875f, -22.9375f, 29.7500f, 29, 22}, // 172 + {0.681641f, 0.000000f, 0.721680f, 0.058594f, 0.7500f, -44.6250f, 42.3750f, 41, 60}, // 173 + {0.926758f, 0.084961f, 0.960938f, 0.126953f, 0.3125f, -40.6250f, 35.1250f, 35, 43}, // 174 + {0.017578f, 0.538086f, 0.040039f, 0.545898f, 0.7500f, -40.8125f, 23.7500f, 23, 8}, // 175 + {0.018555f, 0.516602f, 0.040039f, 0.537109f, 0.0000f, -40.6250f, 21.2500f, 22, 21}, // 176 + {0.059570f, 0.379883f, 0.084961f, 0.411133f, 0.7500f, -31.9375f, 27.0000f, 26, 32}, // 177 + {0.267578f, 0.441406f, 0.283203f, 0.464844f, -0.1250f, -41.1875f, 15.0625f, 16, 24}, // 178 + {0.894531f, 0.192383f, 0.909180f, 0.215820f, -0.3750f, -41.1875f, 13.7500f, 15, 24}, // 179 + {0.182617f, 0.533203f, 0.203125f, 0.545898f, 0.7500f, -43.9375f, 21.8750f, 21, 13}, // 180 + {0.610352f, 0.113281f, 0.637695f, 0.159180f, 0.7500f, -32.5625f, 28.4375f, 28, 47}, // 181 + {0.329102f, 0.090820f, 0.358398f, 0.138672f, -1.0625f, -41.8125f, 29.2500f, 30, 49}, // 182 + {0.732422f, 0.311523f, 0.742188f, 0.321289f, 0.7500f, -23.3750f, 11.2500f, 10, 10}, // 183 + {0.792969f, 0.327148f, 0.802734f, 0.340820f, 0.7500f, 0.1250f, 10.9375f, 10, 14}, // 184 + {0.442383f, 0.232422f, 0.451172f, 0.255859f, -0.9375f, -41.1875f, 8.1250f, 9, 24}, // 185 + {0.068359f, 0.524414f, 0.085938f, 0.544922f, 0.9375f, -35.3125f, 19.4375f, 18, 21}, // 186 + {0.306641f, 0.496094f, 0.329102f, 0.517578f, -0.8750f, -28.6250f, 20.9375f, 23, 22}, // 187 + {0.401367f, 0.078125f, 0.435547f, 0.121094f, 1.3750f, -41.1875f, 38.3750f, 35, 44}, // 188 + {0.946289f, 0.041016f, 0.982422f, 0.083984f, 1.3750f, -41.1875f, 38.3750f, 37, 44}, // 189 + {0.121094f, 0.079102f, 0.155273f, 0.122070f, 1.3750f, -41.1875f, 38.4375f, 35, 44}, // 190 + {0.103516f, 0.211914f, 0.128906f, 0.253906f, -1.5625f, -40.6250f, 22.6875f, 26, 43}, // 191 + {0.500000f, 0.041992f, 0.529297f, 0.094727f, -1.5625f, -52.0000f, 26.0000f, 30, 54}, // 192 + {0.896484f, 0.044922f, 0.925781f, 0.097656f, -1.5625f, -52.0000f, 26.0000f, 30, 54}, // 193 + {0.795898f, 0.047852f, 0.825195f, 0.100586f, -1.5625f, -52.0000f, 26.0000f, 30, 54}, // 194 + {0.646484f, 0.059570f, 0.675781f, 0.110352f, -1.6250f, -49.8750f, 26.0000f, 30, 52}, // 195 + {0.676758f, 0.059570f, 0.706055f, 0.110352f, -1.5625f, -49.8125f, 26.0000f, 30, 52}, // 196 + {0.333008f, 0.035156f, 0.362305f, 0.089844f, -1.6250f, -53.6875f, 25.9375f, 30, 56}, // 197 + {0.401367f, 0.035156f, 0.438477f, 0.077148f, -1.6250f, -40.6250f, 35.0000f, 38, 43}, // 198 + {0.646484f, 0.111328f, 0.669922f, 0.165039f, 0.3125f, -40.6250f, 23.2500f, 24, 55}, // 199 + {0.000000f, 0.119141f, 0.023438f, 0.171875f, 0.5625f, -52.0000f, 23.6250f, 24, 54}, // 200 + {0.024414f, 0.119141f, 0.047852f, 0.171875f, 0.7500f, -52.0000f, 23.6250f, 24, 54}, // 201 + {0.856445f, 0.101563f, 0.880859f, 0.154297f, -0.0625f, -52.0000f, 23.6250f, 25, 54}, // 202 + {0.971680f, 0.128906f, 0.995117f, 0.179688f, 0.7500f, -49.8125f, 23.6250f, 24, 52}, // 203 + {0.134766f, 0.123047f, 0.155273f, 0.175781f, -6.0000f, -52.0000f, 11.5000f, 21, 54}, // 204 + {0.551758f, 0.204102f, 0.572266f, 0.256836f, -2.7500f, -52.0000f, 11.5000f, 21, 54}, // 205 + {0.436523f, 0.106445f, 0.460938f, 0.159180f, -6.6250f, -52.0000f, 11.5000f, 25, 54}, // 206 + {0.227539f, 0.178711f, 0.250000f, 0.229492f, -5.3125f, -49.8125f, 11.5000f, 23, 52}, // 207 + {0.392578f, 0.122070f, 0.421875f, 0.164063f, -1.3750f, -40.6250f, 28.8125f, 30, 43}, // 208 + {0.525391f, 0.097656f, 0.552734f, 0.148438f, 0.6250f, -49.8750f, 28.9375f, 28, 52}, // 209 + {0.826172f, 0.047852f, 0.854492f, 0.100586f, 0.3125f, -52.0000f, 29.5625f, 29, 54}, // 210 + {0.855469f, 0.047852f, 0.883789f, 0.100586f, 0.3125f, -52.0000f, 29.5625f, 29, 54}, // 211 + {0.439453f, 0.052734f, 0.467773f, 0.105469f, 0.3125f, -52.0000f, 29.5625f, 29, 54}, // 212 + {0.200195f, 0.079102f, 0.228516f, 0.129883f, 0.3125f, -49.8750f, 29.5625f, 29, 52}, // 213 + {0.363281f, 0.079102f, 0.391602f, 0.129883f, 0.3125f, -49.8125f, 29.5625f, 29, 52}, // 214 + {0.940430f, 0.506836f, 0.961914f, 0.528320f, 2.5625f, -30.0625f, 27.0000f, 22, 22}, // 215 + {0.468750f, 0.052734f, 0.497070f, 0.105469f, 0.3125f, -46.1250f, 29.5625f, 29, 54}, // 216 + {0.558594f, 0.059570f, 0.586914f, 0.112305f, 0.5000f, -52.0000f, 29.8750f, 29, 54}, // 217 + {0.587891f, 0.059570f, 0.616211f, 0.112305f, 0.5000f, -52.0000f, 29.8750f, 29, 54}, // 218 + {0.617188f, 0.059570f, 0.645508f, 0.112305f, 0.5000f, -52.0000f, 29.8750f, 29, 54}, // 219 + {0.229492f, 0.083984f, 0.257813f, 0.134766f, 0.5000f, -49.8125f, 29.8750f, 29, 52}, // 220 + {0.498047f, 0.095703f, 0.524414f, 0.148438f, -1.8125f, -52.0000f, 23.0625f, 27, 54}, // 221 + {0.161133f, 0.175781f, 0.188477f, 0.217773f, 0.7500f, -40.6250f, 27.1250f, 28, 43}, // 222 + {0.961914f, 0.084961f, 0.995117f, 0.127930f, 0.7500f, -41.6875f, 34.6875f, 34, 44}, // 223 + {0.881836f, 0.146484f, 0.908203f, 0.191406f, -0.1875f, -44.0000f, 26.4375f, 27, 46}, // 224 + {0.820313f, 0.148438f, 0.846680f, 0.193359f, -0.1875f, -44.0000f, 26.4375f, 27, 46}, // 225 + {0.461914f, 0.149414f, 0.488281f, 0.194336f, -0.1875f, -44.0000f, 26.4375f, 27, 46}, // 226 + {0.965820f, 0.180664f, 0.992188f, 0.223633f, -0.1875f, -41.8125f, 26.4375f, 27, 44}, // 227 + {0.314453f, 0.182617f, 0.340820f, 0.225586f, -0.1875f, -41.7500f, 26.4375f, 27, 44}, // 228 + {0.048828f, 0.119141f, 0.075195f, 0.166016f, -0.1875f, -45.6875f, 26.4375f, 27, 48}, // 229 + {0.156250f, 0.079102f, 0.199219f, 0.113281f, 0.3125f, -32.5625f, 42.8125f, 44, 35}, // 230 + {0.758789f, 0.212891f, 0.781250f, 0.258789f, 0.3125f, -32.5625f, 22.6875f, 23, 47}, // 231 + {0.489258f, 0.149414f, 0.515625f, 0.194336f, 0.3125f, -44.0000f, 26.6250f, 27, 46}, // 232 + {0.516602f, 0.149414f, 0.542969f, 0.194336f, 0.3125f, -44.0000f, 26.6250f, 27, 46}, // 233 + {0.847656f, 0.155273f, 0.874023f, 0.200195f, 0.3125f, -44.0000f, 26.6250f, 27, 46}, // 234 + {0.784180f, 0.185547f, 0.810547f, 0.228516f, 0.3125f, -41.7500f, 26.6250f, 27, 44}, // 235 + {0.225586f, 0.273438f, 0.246094f, 0.318359f, -2.1875f, -44.0000f, 15.3125f, 21, 46}, // 236 + {0.615234f, 0.286133f, 0.635742f, 0.331055f, -2.8125f, -44.0000f, 15.5000f, 21, 46}, // 237 + {0.416992f, 0.204102f, 0.441406f, 0.249023f, -4.0000f, -44.0000f, 16.8125f, 25, 46}, // 238 + {0.535156f, 0.257813f, 0.557617f, 0.300781f, -3.5625f, -41.7500f, 14.9375f, 23, 44}, // 239 + {0.543945f, 0.160156f, 0.571289f, 0.203125f, 0.3125f, -41.6875f, 27.8125f, 28, 44}, // 240 + {0.572266f, 0.160156f, 0.599609f, 0.203125f, 0.7500f, -41.8125f, 28.6250f, 28, 44}, // 241 + {0.106445f, 0.123047f, 0.133789f, 0.167969f, 0.3125f, -44.0000f, 28.6250f, 28, 46}, // 242 + {0.734375f, 0.124023f, 0.761719f, 0.168945f, 0.3125f, -44.0000f, 28.6250f, 28, 46}, // 243 + {0.762695f, 0.124023f, 0.790039f, 0.168945f, 0.3125f, -44.0000f, 28.6250f, 28, 46}, // 244 + {0.600586f, 0.160156f, 0.627930f, 0.203125f, 0.3125f, -41.8125f, 28.6250f, 28, 44}, // 245 + {0.076172f, 0.162109f, 0.103516f, 0.205078f, 0.3125f, -41.7500f, 28.6250f, 28, 44}, // 246 + {0.134766f, 0.429688f, 0.160156f, 0.456055f, 0.7500f, -32.6875f, 27.0000f, 26, 27}, // 247 + {0.258789f, 0.126953f, 0.286133f, 0.171875f, 0.3125f, -38.0625f, 28.6250f, 28, 46}, // 248 + {0.287109f, 0.126953f, 0.314453f, 0.171875f, 0.5000f, -44.0000f, 28.3750f, 28, 46}, // 249 + {0.915039f, 0.127930f, 0.942383f, 0.172852f, 0.5000f, -44.0000f, 28.3750f, 28, 46}, // 250 + {0.943359f, 0.128906f, 0.970703f, 0.173828f, 0.5000f, -44.0000f, 28.3750f, 28, 46}, // 251 + {0.388672f, 0.165039f, 0.416016f, 0.208008f, 0.5000f, -41.7500f, 28.3750f, 28, 44}, // 252 + {0.766602f, 0.030273f, 0.794922f, 0.087891f, -1.5000f, -43.9375f, 25.6250f, 29, 59}, // 253 + {0.530273f, 0.041992f, 0.557617f, 0.096680f, 0.7500f, -41.6875f, 28.2500f, 28, 56}, // 254 +// RANGE: 0x2122 - 0x2123, start 0x238 + {0.684570f, 0.341797f, 0.721680f, 0.365234f, -1.1250f, -40.5625f, 37.0000f, 38, 24}, // 8482 }; +const AtlasCharRange font_UBUNTU48_ranges[] = { + { 32, 128, 0 }, { 128, 129, 96 }, { 162, 255, 97 }, { 8482, 8483, 190 },}; const AtlasFont font_UBUNTU48 = { - 1.812500f, // padding - 63.000000f, // height - 47.625000f, // ascend + -4.250000f, // padding + 69.062500f, // height + 53.687500f, // ascend 0.750000f, // distslope - { - {0.873047f, 0.101563f, 0.875000f, 0.103516f, -2.0000f, -2.0000f, 13.0000f, 1, 1}, // 32 - {0.632813f, 0.796875f, 0.652344f, 0.880859f, 1.0000f, -40.7500f, 11.7500f, 10, 43}, // 33 - {0.759766f, 0.888672f, 0.794922f, 0.923828f, 0.7500f, -40.6250f, 18.8750f, 18, 18}, // 34 - {0.058594f, 0.238281f, 0.119141f, 0.322266f, -1.2500f, -40.6250f, 27.9375f, 31, 43}, // 35 - {0.453125f, 0.425781f, 0.503906f, 0.509766f, -0.4375f, -40.6250f, 25.3750f, 26, 43}, // 36 - {0.589844f, 0.167969f, 0.664063f, 0.253906f, 0.3125f, -41.1875f, 38.3750f, 38, 44}, // 37 - {0.058594f, 0.324219f, 0.113281f, 0.408203f, 0.0000f, -40.6250f, 25.9375f, 28, 43}, // 38 - {0.765625f, 0.154297f, 0.783203f, 0.189453f, 0.7500f, -40.6250f, 9.8750f, 9, 18}, // 39 - {0.728516f, 0.367188f, 0.765625f, 0.488281f, 2.3750f, -47.6250f, 19.7500f, 19, 62}, // 40 - {0.878906f, 0.384766f, 0.916016f, 0.505859f, -0.9375f, -47.6250f, 19.6875f, 19, 62}, // 41 - {0.949219f, 0.593750f, 0.998047f, 0.640625f, -0.5625f, -40.6250f, 23.6250f, 25, 24}, // 42 - {0.535156f, 0.591797f, 0.585938f, 0.642578f, 0.7500f, -32.0000f, 27.0000f, 26, 26}, // 43 - {0.705078f, 0.453125f, 0.724609f, 0.490234f, 0.7500f, -7.4375f, 10.5625f, 10, 19}, // 44 - {0.033203f, 0.925781f, 0.064453f, 0.941406f, -1.0000f, -21.5000f, 13.0625f, 16, 8}, // 45 - {0.070313f, 0.667969f, 0.089844f, 0.687500f, 0.7500f, -7.3750f, 11.2500f, 10, 10}, // 46 - {0.406250f, 0.421875f, 0.451172f, 0.517578f, -3.9375f, -40.6250f, 16.7500f, 23, 49}, // 47 - {0.000000f, 0.332031f, 0.054688f, 0.416016f, 0.3125f, -40.6250f, 28.3750f, 28, 43}, // 48 - {0.587891f, 0.591797f, 0.613281f, 0.675781f, -1.5625f, -40.6250f, 12.1250f, 13, 43}, // 49 - {0.285156f, 0.388672f, 0.337891f, 0.472656f, 0.1250f, -40.6250f, 26.2500f, 27, 43}, // 50 - {0.558594f, 0.427734f, 0.607422f, 0.511719f, -0.4375f, -40.6250f, 23.6875f, 25, 43}, // 51 - {0.498047f, 0.253906f, 0.554688f, 0.337891f, -1.3125f, -40.6250f, 25.3125f, 29, 43}, // 52 - {0.056641f, 0.410156f, 0.109375f, 0.494141f, 0.3125f, -40.6250f, 27.2500f, 27, 43}, // 53 - {0.115234f, 0.332031f, 0.169922f, 0.416016f, 0.3125f, -40.6250f, 27.5000f, 28, 43}, // 54 - {0.654297f, 0.453125f, 0.703125f, 0.537109f, -1.0625f, -40.6250f, 22.3125f, 25, 43}, // 55 - {0.556641f, 0.255859f, 0.613281f, 0.339844f, 0.0625f, -40.6250f, 28.5625f, 29, 43}, // 56 - {0.171875f, 0.332031f, 0.226563f, 0.416016f, 0.0625f, -40.6250f, 27.5625f, 28, 43}, // 57 - {0.314453f, 0.888672f, 0.333984f, 0.945313f, 1.1250f, -26.6875f, 12.0625f, 10, 29}, // 58 - {0.812500f, 0.835938f, 0.832031f, 0.910156f, 1.1250f, -26.6875f, 12.0625f, 10, 38}, // 59 - {0.367188f, 0.582031f, 0.417969f, 0.640625f, 0.7500f, -34.0000f, 27.0000f, 26, 30}, // 60 - {0.287109f, 0.658203f, 0.337891f, 0.695313f, 0.7500f, -28.4375f, 27.0000f, 26, 19}, // 61 - {0.621094f, 0.582031f, 0.671875f, 0.640625f, 0.7500f, -34.0000f, 27.0000f, 26, 30}, // 62 - {0.505859f, 0.427734f, 0.556641f, 0.511719f, -1.5625f, -40.6250f, 22.6250f, 26, 43}, // 63 - {0.326172f, 0.218750f, 0.392578f, 0.298828f, 0.0625f, -34.2500f, 33.9375f, 34, 41}, // 64 - {0.437500f, 0.250000f, 0.496094f, 0.333984f, -1.5625f, -40.6250f, 26.0000f, 30, 43}, // 65 - {0.437500f, 0.335938f, 0.492188f, 0.419922f, 0.7500f, -40.6250f, 27.5000f, 28, 43}, // 66 - {0.218750f, 0.460938f, 0.265625f, 0.544922f, 0.3125f, -40.6250f, 23.2500f, 24, 43}, // 67 - {0.615234f, 0.337891f, 0.669922f, 0.421875f, 0.7500f, -40.6250f, 28.5000f, 28, 43}, // 68 - {0.267578f, 0.474609f, 0.314453f, 0.558594f, 0.7500f, -40.6250f, 23.6250f, 24, 43}, // 69 - {0.000000f, 0.503906f, 0.044922f, 0.587891f, 0.7500f, -40.6250f, 21.7500f, 23, 43}, // 70 - {0.494141f, 0.339844f, 0.548828f, 0.423828f, 0.3125f, -40.6250f, 27.9375f, 28, 43}, // 71 - {0.550781f, 0.341797f, 0.605469f, 0.425781f, 0.7500f, -40.6250f, 29.1250f, 28, 43}, // 72 - {0.312500f, 0.802734f, 0.332031f, 0.886719f, 0.8750f, -40.6250f, 11.5000f, 10, 43}, // 73 - {0.113281f, 0.503906f, 0.158203f, 0.587891f, -1.5000f, -40.6250f, 21.6250f, 23, 43}, // 74 - {0.765625f, 0.345703f, 0.820313f, 0.429688f, 0.7500f, -40.6250f, 26.6250f, 28, 43}, // 75 - {0.949219f, 0.507813f, 0.992188f, 0.591797f, 0.7500f, -40.6250f, 20.4375f, 22, 43}, // 76 - {0.853516f, 0.201172f, 0.921875f, 0.285156f, 0.6875f, -40.6250f, 36.0625f, 35, 43}, // 77 - {0.671875f, 0.367188f, 0.726563f, 0.451172f, 0.6250f, -40.6250f, 28.9375f, 28, 43}, // 78 - {0.765625f, 0.259766f, 0.822266f, 0.343750f, 0.3125f, -40.6250f, 29.5625f, 29, 43}, // 79 - {0.349609f, 0.373047f, 0.404297f, 0.457031f, 0.7500f, -40.6250f, 26.7500f, 28, 43}, // 80 - {0.923828f, 0.201172f, 0.982422f, 0.294922f, 0.3125f, -40.6250f, 30.0000f, 30, 48}, // 81 - {0.822266f, 0.373047f, 0.876953f, 0.457031f, 0.7500f, -40.6250f, 28.3750f, 28, 43}, // 82 - {0.000000f, 0.417969f, 0.052734f, 0.501953f, -0.7500f, -40.6250f, 25.0000f, 27, 43}, // 83 - {0.767578f, 0.431641f, 0.818359f, 0.515625f, -1.5625f, -40.6250f, 22.5000f, 26, 43}, // 84 - {0.824219f, 0.287109f, 0.880859f, 0.371094f, 0.5000f, -40.6250f, 29.8750f, 29, 43}, // 85 - {0.234375f, 0.289063f, 0.291016f, 0.373047f, -1.5625f, -40.6250f, 25.3750f, 29, 43}, // 86 - {0.501953f, 0.167969f, 0.587891f, 0.251953f, -1.5625f, -40.6250f, 40.8125f, 44, 43}, // 87 - {0.228516f, 0.375000f, 0.283203f, 0.458984f, -1.1875f, -40.6250f, 24.8750f, 28, 43}, // 88 - {0.111328f, 0.417969f, 0.164063f, 0.501953f, -1.8125f, -40.6250f, 23.0625f, 27, 43}, // 89 - {0.339844f, 0.458984f, 0.388672f, 0.542969f, -0.1875f, -40.6250f, 23.8750f, 25, 43}, // 90 - {0.917969f, 0.384766f, 0.955078f, 0.505859f, 2.3750f, -47.6250f, 19.7500f, 19, 62}, // 91 - {0.607422f, 0.423828f, 0.652344f, 0.519531f, -2.0000f, -40.6250f, 16.7500f, 23, 49}, // 92 - {0.957031f, 0.384766f, 0.994141f, 0.505859f, -0.9375f, -47.6250f, 19.6875f, 19, 62}, // 93 - {0.832031f, 0.826172f, 0.875000f, 0.861328f, -0.3750f, -40.6250f, 20.9375f, 22, 18}, // 94 - {0.654297f, 0.539063f, 0.705078f, 0.554688f, -2.0000f, 1.7500f, 21.2500f, 26, 8}, // 95 - {0.533203f, 0.908203f, 0.574219f, 0.933594f, 0.7500f, -43.9375f, 21.8750f, 21, 13}, // 96 - {0.566406f, 0.521484f, 0.619141f, 0.589844f, -0.1875f, -32.5625f, 26.4375f, 27, 35}, // 97 - {0.882813f, 0.296875f, 0.937500f, 0.382813f, 0.7500f, -41.6875f, 28.2500f, 28, 44}, // 98 - {0.349609f, 0.300781f, 0.394531f, 0.369141f, 0.3125f, -32.5625f, 22.6875f, 23, 35}, // 99 - {0.939453f, 0.296875f, 0.994141f, 0.382813f, 0.3125f, -41.6875f, 28.2500f, 28, 44}, // 100 - {0.769531f, 0.529297f, 0.822266f, 0.597656f, 0.3125f, -32.5625f, 26.6250f, 27, 35}, // 101 - {0.673828f, 0.582031f, 0.705078f, 0.667969f, 0.7500f, -41.6875f, 15.0000f, 16, 44}, // 102 - {0.121094f, 0.238281f, 0.175781f, 0.330078f, 0.3125f, -32.5625f, 28.2500f, 28, 47}, // 103 - {0.292969f, 0.300781f, 0.347656f, 0.386719f, 0.7500f, -41.6875f, 28.6250f, 28, 44}, // 104 - {0.970703f, 0.699219f, 0.990234f, 0.785156f, 0.8750f, -41.7500f, 11.3750f, 10, 44}, // 105 - {0.824219f, 0.529297f, 0.855469f, 0.638672f, -4.5625f, -41.7500f, 12.1250f, 16, 56}, // 106 - {0.166016f, 0.417969f, 0.216797f, 0.503906f, 0.7500f, -41.6875f, 25.0000f, 26, 44}, // 107 - {0.105469f, 0.771484f, 0.125000f, 0.857422f, 0.7500f, -41.6875f, 11.1250f, 10, 44}, // 108 - {0.242188f, 0.218750f, 0.324219f, 0.287109f, 0.7500f, -32.5625f, 42.5625f, 42, 35}, // 109 - {0.160156f, 0.505859f, 0.214844f, 0.574219f, 0.7500f, -32.5625f, 28.6250f, 28, 35}, // 110 - {0.453125f, 0.513672f, 0.507813f, 0.582031f, 0.3125f, -32.5625f, 28.6250f, 28, 35}, // 111 - {0.177734f, 0.238281f, 0.232422f, 0.330078f, 0.7500f, -32.5625f, 28.2500f, 28, 47}, // 112 - {0.666016f, 0.244141f, 0.720703f, 0.335938f, 0.3125f, -32.5625f, 28.2500f, 28, 47}, // 113 - {0.000000f, 0.589844f, 0.037109f, 0.658203f, 0.5000f, -32.5625f, 17.7500f, 19, 35}, // 114 - {0.615234f, 0.255859f, 0.666016f, 0.324219f, -0.3750f, -32.5625f, 25.0000f, 26, 35}, // 115 - {0.960938f, 0.105469f, 0.996094f, 0.189453f, 0.5000f, -40.6250f, 16.4375f, 18, 43}, // 116 - {0.509766f, 0.513672f, 0.564453f, 0.582031f, 0.5000f, -32.5625f, 28.3750f, 28, 35}, // 117 - {0.820313f, 0.458984f, 0.878906f, 0.527344f, -1.5000f, -32.5625f, 26.2500f, 30, 35}, // 118 - {0.765625f, 0.189453f, 0.851563f, 0.257813f, -1.3750f, -32.5625f, 41.0625f, 44, 35}, // 119 - {0.054688f, 0.496094f, 0.111328f, 0.564453f, -1.5625f, -32.5625f, 25.3750f, 29, 35}, // 120 - {0.000000f, 0.238281f, 0.056641f, 0.330078f, -1.5000f, -32.5625f, 25.6250f, 29, 47}, // 121 - {0.267578f, 0.560547f, 0.314453f, 0.628906f, -0.1875f, -32.5625f, 23.3750f, 24, 35}, // 122 - {0.722656f, 0.244141f, 0.763672f, 0.365234f, 0.3125f, -47.6250f, 19.9375f, 21, 62}, // 123 - {0.806641f, 0.599609f, 0.824219f, 0.716797f, 2.8750f, -46.5000f, 14.5000f, 9, 60}, // 124 - {0.394531f, 0.250000f, 0.435547f, 0.371094f, -0.8750f, -47.6250f, 20.0625f, 21, 62}, // 125 - {0.671875f, 0.337891f, 0.722656f, 0.359375f, 0.7500f, -24.3125f, 27.0000f, 26, 11}, // 126 - {0.783203f, 0.070313f, 0.863281f, 0.187500f, 0.7500f, -44.6250f, 42.3750f, 41, 60}, // 127 - }, + font_UBUNTU48_chardata, + font_UBUNTU48_ranges, + 4, "UBUNTU48", // name }; -const AtlasFont *ui_fonts[3] = { +const AtlasFont *ui_fonts[2] = { &font_UBUNTU24, - &font_UBUNTUBOLD24, &font_UBUNTU48, }; -const AtlasImage ui_images[23] = { - {0.797852f, 0.913086f, 0.827148f, 0.942383f, 16, 16, "SOLIDWHITE"}, - {0.391602f, 0.520508f, 0.450195f, 0.579102f, 31, 31, "I_CROSS"}, - {0.706055f, 0.491211f, 0.766602f, 0.551758f, 32, 32, "I_CIRCLE"}, - {0.047852f, 0.567383f, 0.102539f, 0.622070f, 29, 29, "I_SQUARE"}, - {0.881836f, 0.508789f, 0.946289f, 0.563477f, 34, 29, "I_TRIANGLE"}, - {0.622070f, 0.555664f, 0.754883f, 0.579102f, 69, 13, "I_SELECT"}, - {0.420898f, 0.584961f, 0.532227f, 0.608398f, 58, 13, "I_START"}, - {0.473633f, 0.879883f, 0.497070f, 0.926758f, 13, 25, "I_ARROW"}, - {0.666992f, 0.071289f, 0.780273f, 0.151367f, 59, 42, "I_DIR"}, - {0.893555f, 0.000977f, 0.997070f, 0.102539f, 54, 53, "I_ROUND"}, - {0.495117f, 0.000977f, 0.663086f, 0.165039f, 87, 85, "I_STICK"}, - {0.666992f, 0.000977f, 0.889648f, 0.067383f, 115, 35, "I_SHOULDER"}, - {0.858398f, 0.567383f, 0.913086f, 0.622070f, 29, 29, "I_CHECKEDBOX"}, - {0.243164f, 0.159180f, 0.395508f, 0.215820f, 79, 30, "I_RECT"}, - {0.000977f, 0.000977f, 0.239258f, 0.235352f, 123, 121, "I_STICKBG"}, - {0.243164f, 0.000977f, 0.491211f, 0.155273f, 128, 80, "I_BG"}, - {0.655273f, 0.424805f, 0.670898f, 0.452148f, 9, 15, "I_L"}, - {0.866211f, 0.071289f, 0.889648f, 0.098633f, 13, 15, "I_R"}, - {0.161133f, 0.577148f, 0.190430f, 0.672852f, 16, 50, "I_BUTTON"}, - {0.916992f, 0.567383f, 0.946289f, 0.665039f, 16, 51, "I_BUTTON_SELECTED"}, - {0.866211f, 0.106445f, 0.958008f, 0.198242f, 48, 48, "I_ICON_UMD"}, - {0.666992f, 0.155273f, 0.762695f, 0.241211f, 50, 45, "I_ICON_FOLDER"}, - {0.399414f, 0.168945f, 0.499023f, 0.247070f, 52, 41, "I_ICON_EXE"}, +const AtlasImage ui_images[24] = { + {0.734863f, 0.108887f, 0.749512f, 0.123535f, 16, 16, "SOLIDWHITE"}, + {0.526855f, 0.302246f, 0.556152f, 0.331543f, 31, 31, "I_CROSS"}, + {0.130371f, 0.252441f, 0.160645f, 0.282715f, 32, 32, "I_CIRCLE"}, + {0.639160f, 0.367676f, 0.666504f, 0.395020f, 29, 29, "I_SQUARE"}, + {0.087402f, 0.286621f, 0.119629f, 0.313965f, 34, 29, "I_TRIANGLE"}, + {0.205566f, 0.352051f, 0.271973f, 0.363770f, 69, 13, "I_SELECT"}, + {0.623535f, 0.425293f, 0.679199f, 0.437012f, 58, 13, "I_START"}, + {0.689941f, 0.529785f, 0.701660f, 0.553223f, 13, 25, "I_ARROW"}, + {0.500488f, 0.000488f, 0.557129f, 0.040527f, 59, 42, "I_DIR"}, + {0.446777f, 0.000488f, 0.498535f, 0.051270f, 54, 53, "I_ROUND"}, + {0.247559f, 0.000488f, 0.331543f, 0.082520f, 87, 85, "I_STICK"}, + {0.333496f, 0.000488f, 0.444824f, 0.033691f, 115, 35, "I_SHOULDER"}, + {0.781738f, 0.369629f, 0.809082f, 0.396973f, 29, 29, "I_CHECKEDBOX"}, + {0.723145f, 0.000488f, 0.799316f, 0.028809f, 79, 30, "I_RECT"}, + {0.000488f, 0.000488f, 0.119629f, 0.117676f, 123, 121, "I_STICKBG"}, + {0.121582f, 0.000488f, 0.245605f, 0.077637f, 128, 80, "I_BG"}, + {0.513184f, 0.342285f, 0.520996f, 0.355957f, 9, 15, "I_L"}, + {0.811035f, 0.369629f, 0.822754f, 0.383301f, 13, 15, "I_R"}, + {0.840332f, 0.384277f, 0.854980f, 0.432129f, 16, 50, "I_BUTTON"}, + {0.668457f, 0.367676f, 0.683105f, 0.416504f, 16, 51, "I_BUTTON_SELECTED"}, + {0.801270f, 0.000488f, 0.847168f, 0.046387f, 48, 48, "I_ICON_UMD"}, + {0.896973f, 0.000488f, 0.944824f, 0.043457f, 50, 45, "I_ICON_FOLDER"}, + {0.946777f, 0.000488f, 0.996582f, 0.039551f, 52, 41, "I_ICON_EXE"}, + {0.849121f, 0.000488f, 0.895020f, 0.046387f, 48, 48, "I_DROP_SHADOW"}, }; const Atlas ui_atlas = { "ui_atlas.zim", - ui_fonts, 3, - ui_images, 23, + ui_fonts, 2, + ui_images, 24, }; diff --git a/UI/ui_atlas.h b/UI/ui_atlas.h index e21c7c73d8..5a2cc58530 100644 --- a/UI/ui_atlas.h +++ b/UI/ui_atlas.h @@ -5,8 +5,7 @@ // FONTS_ui #define UBUNTU24 0 -#define UBUNTUBOLD24 1 -#define UBUNTU48 2 +#define UBUNTU48 1 // IMAGES_ui @@ -33,7 +32,8 @@ #define I_ICON_UMD 20 #define I_ICON_FOLDER 21 #define I_ICON_EXE 22 +#define I_DROP_SHADOW 23 extern const Atlas ui_atlas; -extern const AtlasImage ui_images[23]; +extern const AtlasImage ui_images[24]; diff --git a/android/assets/ui_atlas.zim b/android/assets/ui_atlas.zim index e450304eee..5193fb32e7 100644 Binary files a/android/assets/ui_atlas.zim and b/android/assets/ui_atlas.zim differ diff --git a/android/assets/unknown.png b/android/assets/unknown.png new file mode 100644 index 0000000000..1a233d9519 Binary files /dev/null and b/android/assets/unknown.png differ diff --git a/android/buildassets.sh b/android/buildassets.sh index dd16a616e6..1f8ff6150a 100644 --- a/android/buildassets.sh +++ b/android/buildassets.sh @@ -1,5 +1,6 @@ mkdir -p assets -./buildatlas.sh +cp ../assets/unknown.png assets +cp ../assets/ui_atlas.zim assets cp ../assets/ppge_atlas.zim assets #cp -r source_assets/songs assets #cp -r source_assets/samples assets diff --git a/assets/build_ppgeatlas.sh b/assets/build_ppgeatlas.sh deleted file mode 100755 index 57421aae81..0000000000 --- a/assets/build_ppgeatlas.sh +++ /dev/null @@ -1 +0,0 @@ -../native/tools/build/atlastool ppge_atlasscript.txt ppge && mv ppge_atlas.cpp ppge_atlas.h ../Core/Util diff --git a/assets/ppge_atlasscript.txt b/assets/ppge_atlasscript.txt deleted file mode 100644 index 8bb6c7b075..0000000000 --- a/assets/ppge_atlasscript.txt +++ /dev/null @@ -1,8 +0,0 @@ -256 -font UBUNTU24 ../android/source_assets/font/zrnic.ttf 30 -image I_CROSS ../android/source_assets/image/cross.png copy -image I_CIRCLE ../android/source_assets/image/circle.png copy -image I_SQUARE ../android/source_assets/image/square.png copy -image I_TRIANGLE ../android/source_assets/image/triangle.png copy -image I_BUTTON ../android/source_assets/image/button.png copy -image I_LOGO ../android/res/drawable-mdpi/ic_launcher.png copy diff --git a/assets/ui_atlas.zim b/assets/ui_atlas.zim index e450304eee..5193fb32e7 100644 Binary files a/assets/ui_atlas.zim and b/assets/ui_atlas.zim differ diff --git a/assets/unknown.png b/assets/unknown.png new file mode 100644 index 0000000000..1a233d9519 Binary files /dev/null and b/assets/unknown.png differ diff --git a/atlasscript.txt b/atlasscript.txt index 7f0ceead70..7334a9b1dd 100644 --- a/atlasscript.txt +++ b/atlasscript.txt @@ -1,7 +1,6 @@ -512 -font UBUNTU24 source_assets/font/zrnic.ttf 30 -font UBUNTUBOLD24 source_assets/font/zrnic.ttf 30 -font UBUNTU48 source_assets/font/zrnic.ttf 55 +1024 +font UBUNTU24 C:/Windows/Fonts/KozGoPro-Medium.otf UWhk 30 +font UBUNTU48 source_assets/font/zrnic.ttf UW 55 image SOLIDWHITE white.png copy image I_CROSS source_assets/image/cross.png copy image I_CIRCLE source_assets/image/circle.png copy @@ -25,3 +24,4 @@ image I_BUTTON_SELECTED source_assets/image/button_selected.png copy image I_ICON_UMD source_assets/image/umd48.png copy image I_ICON_FOLDER source_assets/image/folder.png copy image I_ICON_EXE source_assets/image/exe.png copy +image I_DROP_SHADOW source_assets/image/dropshadow.png copy diff --git a/build_ppgeatlas.sh b/build_ppgeatlas.sh new file mode 100644 index 0000000000..d74de435e9 --- /dev/null +++ b/build_ppgeatlas.sh @@ -0,0 +1 @@ +C:/workspace/native/tools/build/atlastool ppge_atlasscript.txt ppge && mv ppge_atlas.cpp ppge_atlas.h Core/Util && mv ppge_atlas.zim assets diff --git a/native b/native index 7d25fe3736..97abf0d2ef 160000 --- a/native +++ b/native @@ -1 +1 @@ -Subproject commit 7d25fe3736a376f782b0e26f3ce00e13272d3773 +Subproject commit 97abf0d2efd57ae1954bc82688bfa0c65770a223 diff --git a/ppge_atlasscript.txt b/ppge_atlasscript.txt new file mode 100644 index 0000000000..eb031120b7 --- /dev/null +++ b/ppge_atlasscript.txt @@ -0,0 +1,8 @@ +256 +font UBUNTU24 source_assets/font/zrnic.ttf U 30 +image I_CROSS source_assets/image/cross.png copy +image I_CIRCLE source_assets/image/circle.png copy +image I_SQUARE source_assets/image/square.png copy +image I_TRIANGLE source_assets/image/triangle.png copy +image I_BUTTON source_assets/image/button.png copy +image I_LOGO android/res/drawable-mdpi/ic_launcher.png copy diff --git a/source_assets/image/dropshadow.png b/source_assets/image/dropshadow.png new file mode 100644 index 0000000000..424d99f32f Binary files /dev/null and b/source_assets/image/dropshadow.png differ