From 1fc526d40f6dedc997fdfdd81e4f18203f062b3c Mon Sep 17 00:00:00 2001 From: Sacha Date: Fri, 25 Jul 2014 03:50:58 +1000 Subject: [PATCH] Combine the low and highmem atlas in to one. Add this to the buildatlas script (it's just a diff). Used USING_QT_UI but technically win32_ui should use this too? --- Qt/PPSSPP.pro | 1 - UI/ui_atlas.cpp | 149 +++++++++++++++++++++++++++++++++++++ UI/ui_atlas_lowmem.cpp | 162 ----------------------------------------- buildatlas.sh | 6 +- 4 files changed, 153 insertions(+), 165 deletions(-) delete mode 100644 UI/ui_atlas_lowmem.cpp diff --git a/Qt/PPSSPP.pro b/Qt/PPSSPP.pro index bbd7f9e78f..bee2173210 100644 --- a/Qt/PPSSPP.pro +++ b/Qt/PPSSPP.pro @@ -69,7 +69,6 @@ symbian { # UI SOURCES += $$files($$P/UI/*.cpp) \ $$P/android/jni/TestRunner.cpp -SOURCES -= $$P/UI/ui_atlas.cpp arm:android: SOURCES += $$P/android/jni/ArmEmitterTest.cpp HEADERS += $$P/UI/*.h diff --git a/UI/ui_atlas.cpp b/UI/ui_atlas.cpp index 27b1e5a2e7..06afe6bfad 100644 --- a/UI/ui_atlas.cpp +++ b/UI/ui_atlas.cpp @@ -4,6 +4,7 @@ const AtlasChar font_UBUNTU24_chardata[] = { // RANGE: 0x20 - 0x80, start 0x21 +#ifndef USING_QT_UI {0.000000f, 0.000000f, 0.000488f, 0.000488f, -2.0000f, -4.0000f, 7.3750f, 1, 1}, // 0020 {0.252930f, 0.062012f, 0.256836f, 0.076172f, 0.2500f, -28.1875f, 7.8750f, 8, 29}, // 0021 {0.801758f, 0.070801f, 0.807617f, 0.077148f, -0.6250f, -29.8750f, 9.7500f, 12, 13}, // 0022 @@ -33922,9 +33923,110 @@ const AtlasChar font_UBUNTU24_chardata[] = { {0.534180f, 0.224609f, 0.542480f, 0.232910f, -0.9375f, -21.6875f, 15.0000f, 17, 17}, // ffed {0.515137f, 0.271484f, 0.523438f, 0.279785f, -0.9375f, -21.6875f, 15.0000f, 17, 17}, // ffee {0.647461f, 0.813965f, 0.660645f, 0.827148f, 1.7500f, -26.5000f, 30.0000f, 27, 27}, // ffef +#else /* USING_QT_UI */ + {0.000000f, 0.000000f, 0.001953f, 0.001953f, -2.0000f, -4.0000f, 7.3750f, 1, 1}, // 0020 + {0.283203f, 0.693359f, 0.298828f, 0.750000f, 0.2500f, -28.1875f, 7.8750f, 8, 29}, // 0021 + {0.142578f, 0.695313f, 0.166016f, 0.720703f, -0.6250f, -29.8750f, 9.7500f, 12, 13}, // 0022 + {0.298828f, 0.576172f, 0.337891f, 0.632813f, -1.0625f, -28.1875f, 17.7500f, 20, 29}, // 0023 + {0.212891f, 0.250000f, 0.248047f, 0.320313f, -0.5000f, -32.0000f, 16.6250f, 18, 36}, // 0024 + {0.658203f, 0.560547f, 0.705078f, 0.617188f, -0.4375f, -28.5000f, 22.4375f, 24, 29}, // 0025 + {0.542969f, 0.564453f, 0.585938f, 0.621094f, -0.9375f, -28.5000f, 19.4375f, 22, 29}, // 0026 + {0.167969f, 0.695313f, 0.181641f, 0.720703f, -0.6875f, -29.8750f, 5.3125f, 7, 13}, // 0027 + {0.603516f, 0.623047f, 0.626953f, 0.699219f, -0.0625f, -30.9375f, 10.0000f, 12, 39}, // 0028 + {0.187500f, 0.636719f, 0.210938f, 0.712891f, -1.6250f, -30.9375f, 10.0625f, 12, 39}, // 0029 + {0.707031f, 0.167969f, 0.740234f, 0.205078f, -1.5000f, -28.1875f, 13.3750f, 17, 19}, // 002a + {0.419922f, 0.363281f, 0.457031f, 0.406250f, -0.9375f, -24.0625f, 17.0000f, 19, 22}, // 002b + {0.322266f, 0.634766f, 0.339844f, 0.660156f, -1.1250f, -7.5625f, 6.5625f, 9, 13}, // 002c + {0.701172f, 0.699219f, 0.724609f, 0.712891f, -0.8125f, -15.5625f, 9.9375f, 12, 7}, // 002d + {0.726563f, 0.699219f, 0.742188f, 0.714844f, 0.2500f, -7.3750f, 8.2500f, 8, 8}, // 002e + {0.458984f, 0.667969f, 0.488281f, 0.728516f, -1.8750f, -28.1875f, 11.5000f, 15, 31}, // 002f + {0.248047f, 0.634766f, 0.283203f, 0.691406f, -0.4375f, -28.5000f, 16.6250f, 18, 29}, // 0030 + {0.050781f, 0.685547f, 0.076172f, 0.742188f, 0.3125f, -28.1875f, 16.6250f, 13, 29}, // 0031 + {0.285156f, 0.634766f, 0.320313f, 0.691406f, -0.7500f, -28.5000f, 16.6250f, 18, 29}, // 0032 + {0.076172f, 0.636719f, 0.111328f, 0.693359f, -0.8125f, -28.5000f, 16.6250f, 18, 29}, // 0033 + {0.632813f, 0.619141f, 0.669922f, 0.675781f, -1.1250f, -28.1875f, 16.6250f, 19, 29}, // 0034 + {0.113281f, 0.636719f, 0.148438f, 0.693359f, -0.0625f, -28.1875f, 16.6250f, 18, 29}, // 0035 + {0.150391f, 0.636719f, 0.185547f, 0.693359f, -0.2500f, -28.5000f, 16.6250f, 18, 29}, // 0036 + {0.525391f, 0.623047f, 0.562500f, 0.679688f, -0.9375f, -28.1875f, 16.6250f, 19, 29}, // 0037 + {0.708984f, 0.640625f, 0.744141f, 0.697266f, -0.5625f, -28.5000f, 16.6250f, 18, 29}, // 0038 + {0.746094f, 0.640625f, 0.781250f, 0.697266f, -0.7500f, -28.5000f, 16.6250f, 18, 29}, // 0039 + {0.904297f, 0.630859f, 0.919922f, 0.673828f, 0.2500f, -21.9375f, 7.8750f, 8, 22}, // 003a + {0.421875f, 0.613281f, 0.439453f, 0.666016f, -0.5000f, -21.9375f, 7.8125f, 9, 27}, // 003b + {0.777344f, 0.167969f, 0.808594f, 0.205078f, -1.0000f, -20.6875f, 14.9375f, 16, 19}, // 003c + {0.248047f, 0.693359f, 0.281250f, 0.720703f, 0.1250f, -20.0625f, 16.6250f, 17, 14}, // 003d + {0.742188f, 0.167969f, 0.775391f, 0.205078f, -0.1250f, -20.6875f, 15.1875f, 17, 19}, // 003e + {0.964844f, 0.287109f, 0.998047f, 0.343750f, -1.2500f, -28.5000f, 14.2500f, 17, 29}, // 003f + {0.865234f, 0.558594f, 0.921875f, 0.628906f, -0.8125f, -27.6250f, 27.1250f, 29, 36}, // 0040 + {0.953125f, 0.105469f, 0.998047f, 0.162109f, -1.5625f, -28.1875f, 18.8750f, 23, 29}, // 0041 + {0.564453f, 0.623047f, 0.601563f, 0.679688f, 0.3125f, -28.1875f, 18.6250f, 19, 29}, // 0042 + {0.087891f, 0.578125f, 0.126953f, 0.634766f, -0.5000f, -28.5000f, 18.0000f, 20, 29}, // 0043 + {0.128906f, 0.578125f, 0.167969f, 0.634766f, 0.3125f, -28.1875f, 19.1875f, 20, 29}, // 0044 + {0.783203f, 0.640625f, 0.818359f, 0.697266f, 0.3125f, -28.1875f, 16.8750f, 18, 29}, // 0045 + {0.820313f, 0.644531f, 0.855469f, 0.701172f, 0.3125f, -28.1875f, 16.9375f, 18, 29}, // 0046 + {0.169922f, 0.578125f, 0.208984f, 0.634766f, -0.3125f, -28.5000f, 19.8750f, 20, 29}, // 0047 + {0.707031f, 0.582031f, 0.746094f, 0.638672f, 0.3125f, -28.1875f, 20.6875f, 20, 29}, // 0048 + {0.300781f, 0.693359f, 0.316406f, 0.750000f, 0.5625f, -28.1875f, 8.5000f, 8, 29}, // 0049 + {0.421875f, 0.667969f, 0.457031f, 0.724609f, -1.0625f, -28.1875f, 16.4375f, 18, 29}, // 004a + {0.044922f, 0.566406f, 0.085938f, 0.623047f, 0.3125f, -28.1875f, 18.7500f, 21, 29}, // 004b + {0.964844f, 0.345703f, 0.998047f, 0.402344f, 0.3125f, -28.1875f, 15.8125f, 17, 29}, // 004c + {0.492188f, 0.560547f, 0.541016f, 0.617188f, 0.2500f, -28.1875f, 24.6250f, 25, 29}, // 004d + {0.748047f, 0.582031f, 0.787109f, 0.638672f, 0.3125f, -28.1875f, 20.6875f, 20, 29}, // 004e + {0.212891f, 0.576172f, 0.253906f, 0.632813f, -0.5000f, -28.5000f, 19.2500f, 21, 29}, // 004f + {0.789063f, 0.582031f, 0.828125f, 0.638672f, 0.3125f, -28.1875f, 18.8125f, 20, 29}, // 0050 + {0.447266f, 0.542969f, 0.490234f, 0.607422f, -0.5000f, -28.5000f, 20.1250f, 22, 33}, // 0051 + {0.447266f, 0.609375f, 0.486328f, 0.666016f, 0.3125f, -28.1250f, 19.3125f, 20, 29}, // 0052 + {0.339844f, 0.613281f, 0.378906f, 0.669922f, -0.7500f, -28.5000f, 18.0625f, 20, 29}, // 0053 + {0.380859f, 0.613281f, 0.419922f, 0.669922f, -1.4375f, -28.1875f, 16.8750f, 20, 29}, // 0054 + {0.923828f, 0.617188f, 0.962891f, 0.673828f, -0.0625f, -28.1875f, 19.2500f, 20, 29}, // 0055 + {0.587891f, 0.564453f, 0.630859f, 0.621094f, -1.6250f, -28.1875f, 18.5625f, 22, 29}, // 0056 + {0.923828f, 0.558594f, 0.980469f, 0.615234f, -1.3750f, -28.1875f, 25.7500f, 29, 29}, // 0057 + {0.255859f, 0.576172f, 0.296875f, 0.632813f, -1.2500f, -28.1875f, 18.4375f, 21, 29}, // 0058 + {0.000000f, 0.566406f, 0.042969f, 0.623047f, -1.6250f, -28.1875f, 18.2500f, 22, 29}, // 0059 + {0.000000f, 0.625000f, 0.037109f, 0.681641f, -0.7500f, -28.1875f, 16.7500f, 19, 29}, // 005a + {0.941406f, 0.675781f, 0.960938f, 0.750000f, 0.0625f, -31.7500f, 8.3750f, 10, 38}, // 005b + {0.964844f, 0.224609f, 0.996094f, 0.285156f, -1.6250f, -28.1875f, 12.2500f, 16, 31}, // 005c + {0.000000f, 0.683594f, 0.019531f, 0.757813f, -1.7500f, -31.7500f, 8.3750f, 10, 38}, // 005d + {0.962891f, 0.691406f, 0.992188f, 0.724609f, -1.1250f, -28.1875f, 12.5625f, 15, 17}, // 005e + {0.212891f, 0.695313f, 0.246094f, 0.708984f, -1.8750f, -4.0000f, 13.1875f, 17, 7}, // 005f + {0.707031f, 0.560547f, 0.728516f, 0.578125f, -0.6875f, -28.5625f, 9.8125f, 11, 9}, // 0060 + {0.263672f, 0.494141f, 0.298828f, 0.539063f, -0.6250f, -22.3125f, 15.8750f, 18, 23}, // 0061 + {0.830078f, 0.582031f, 0.865234f, 0.642578f, -0.1250f, -29.8750f, 16.5000f, 18, 31}, // 0062 + {0.964844f, 0.404297f, 0.998047f, 0.449219f, -0.8125f, -22.3125f, 15.3125f, 17, 23}, // 0063 + {0.488281f, 0.619141f, 0.523438f, 0.679688f, -0.7500f, -29.8750f, 16.5000f, 18, 31}, // 0064 + {0.666016f, 0.679688f, 0.699219f, 0.724609f, -0.6875f, -22.3125f, 15.4375f, 17, 23}, // 0065 + {0.353516f, 0.671875f, 0.380859f, 0.732422f, -1.2500f, -30.2500f, 10.3125f, 14, 31}, // 0066 + {0.671875f, 0.619141f, 0.707031f, 0.677734f, -0.7500f, -22.3125f, 16.5000f, 18, 30}, // 0067 + {0.964844f, 0.164063f, 0.998047f, 0.222656f, -0.1250f, -29.8750f, 16.5000f, 17, 30}, // 0068 + {0.982422f, 0.558594f, 0.998047f, 0.617188f, 0.1250f, -29.8750f, 7.6875f, 8, 30}, // 0069 + {0.382813f, 0.671875f, 0.404297f, 0.746094f, -3.0625f, -29.8750f, 7.7500f, 11, 38}, // 006a + {0.039063f, 0.625000f, 0.074219f, 0.683594f, -0.0625f, -29.8750f, 15.3125f, 18, 30}, // 006b + {0.406250f, 0.671875f, 0.421875f, 0.730469f, 0.1250f, -29.8750f, 7.6875f, 8, 30}, // 006c + {0.765625f, 0.400391f, 0.816406f, 0.445313f, -0.1250f, -22.3125f, 25.3125f, 26, 23}, // 006d + {0.490234f, 0.681641f, 0.523438f, 0.726563f, -0.1250f, -22.3125f, 16.5000f, 17, 23}, // 006e + {0.300781f, 0.494141f, 0.335938f, 0.539063f, -0.7500f, -22.3125f, 16.5000f, 18, 23}, // 006f + {0.867188f, 0.630859f, 0.902344f, 0.689453f, -0.1250f, -22.3125f, 16.5000f, 18, 30}, // 0070 + {0.210938f, 0.634766f, 0.246094f, 0.693359f, -0.7500f, -22.3125f, 16.5000f, 18, 30}, // 0071 + {0.632813f, 0.564453f, 0.658203f, 0.609375f, -0.1250f, -22.3125f, 10.5000f, 13, 23}, // 0072 + {0.525391f, 0.681641f, 0.558594f, 0.726563f, -0.9375f, -22.3125f, 14.8125f, 17, 23}, // 0073 + {0.021484f, 0.685547f, 0.048828f, 0.738281f, -1.5000f, -26.4375f, 10.4375f, 14, 27}, // 0074 + {0.560547f, 0.681641f, 0.593750f, 0.726563f, -0.1875f, -21.9375f, 16.5000f, 17, 23}, // 0075 + {0.904297f, 0.675781f, 0.939453f, 0.718750f, -1.4375f, -21.9375f, 14.8125f, 18, 22}, // 0076 + {0.212891f, 0.494141f, 0.261719f, 0.537109f, -1.3750f, -21.9375f, 21.6875f, 25, 22}, // 0077 + {0.628906f, 0.677734f, 0.664063f, 0.720703f, -1.4375f, -21.9375f, 14.8125f, 18, 22}, // 0078 + {0.728516f, 0.490234f, 0.765625f, 0.548828f, -1.6875f, -21.9375f, 14.8125f, 19, 30}, // 0079 + {0.857422f, 0.691406f, 0.888672f, 0.734375f, -0.7500f, -21.9375f, 14.3750f, 16, 22}, // 007a + {0.466797f, 0.238281f, 0.492188f, 0.310547f, -1.1250f, -30.5000f, 9.8750f, 13, 37}, // 007b + {0.890625f, 0.691406f, 0.904297f, 0.755859f, 0.5625f, -28.1875f, 7.3750f, 7, 33}, // 007c + {0.964844f, 0.617188f, 0.990234f, 0.689453f, -1.5625f, -30.5000f, 9.8750f, 13, 37}, // 007d + {0.078125f, 0.695313f, 0.117188f, 0.716797f, -0.2500f, -17.3125f, 19.3125f, 20, 11}, // 007e + {0.000000f, 0.000000f, 0.001953f, 0.001953f, -2.0000f, -4.0000f, 7.3750f, 1, 1}, // 007f +// RANGE: 0xfffd - 0xfffe, start 0x81 + {0.146484f, 0.375000f, 0.207031f, 0.470703f, -0.6250f, -39.6875f, 29.7500f, 31, 49}, // fffd +#endif /* USING_QT_UI */ }; const AtlasCharRange font_UBUNTU24_ranges[] = { { 32, 128, 0 }, +#ifndef USING_QT_UI { 128, 129, 96 }, { 162, 256, 97 }, { 256, 384, 191 }, @@ -33944,21 +34046,33 @@ const AtlasCharRange font_UBUNTU24_ranges[] = { { 19968, 40960, 1495 }, { 44032, 55204, 22487 }, { 65280, 65520, 33659 }, +#else /* USING_QT_UI */ + { 65533, 65534, 96 }, +#endif /* USING_QT_UI */ }; const AtlasFont font_UBUNTU24 = { +#ifndef USING_QT_UI -6.500000f, // padding +#else /* USING_QT_UI */ + -4.187500f, // padding +#endif /* USING_QT_UI */ 49.000000f, // height 37.687500f, // ascend 0.750000f, // distslope font_UBUNTU24_chardata, font_UBUNTU24_ranges, +#ifndef USING_QT_UI 20, +#else /* USING_QT_UI */ + 2, +#endif /* USING_QT_UI */ "UBUNTU24", // name }; const AtlasFont *ui_fonts[1] = { &font_UBUNTU24, }; const AtlasImage ui_images[33] = { +#ifndef USING_QT_UI {0.856201f, 0.065186f, 0.863525f, 0.072510f, 16, 16, "I_SOLIDWHITE"}, {0.958252f, 0.000244f, 0.975830f, 0.017822f, 37, 37, "I_CROSS"}, {0.902588f, 0.000244f, 0.921143f, 0.018799f, 39, 39, "I_CIRCLE"}, @@ -33992,6 +34106,41 @@ const AtlasImage ui_images[33] = { {0.513428f, 0.000244f, 0.548096f, 0.034912f, 72, 72, "I_ICONGOLD"}, {0.723877f, 0.000244f, 0.752197f, 0.025635f, 59, 53, "I_FOLDER"}, {0.753174f, 0.000244f, 0.782471f, 0.023193f, 61, 48, "I_UP_DIRECTORY"}, +#else /* USING_QT_UI */ + {0.340820f, 0.577148f, 0.370117f, 0.606445f, 16, 16, "I_SOLIDWHITE"}, + {0.584961f, 0.491211f, 0.655273f, 0.561523f, 37, 37, "I_CROSS"}, + {0.747070f, 0.323242f, 0.821289f, 0.397461f, 39, 39, "I_CIRCLE"}, + {0.659180f, 0.491211f, 0.725586f, 0.557617f, 35, 35, "I_SQUARE"}, + {0.502930f, 0.491211f, 0.581055f, 0.557617f, 41, 35, "I_TRIANGLE"}, + {0.213867f, 0.543945f, 0.374023f, 0.573242f, 83, 16, "I_SELECT"}, + {0.729492f, 0.549805f, 0.862305f, 0.579102f, 69, 16, "I_START"}, + {0.323242f, 0.672852f, 0.350586f, 0.729492f, 15, 30, "I_ARROW"}, + {0.000977f, 0.483398f, 0.114258f, 0.563477f, 59, 42, "I_DIR"}, + {0.887695f, 0.454102f, 0.991211f, 0.555664f, 54, 53, "I_ROUND"}, + {0.346680f, 0.483398f, 0.499023f, 0.540039f, 79, 30, "I_RECT"}, + {0.708008f, 0.000977f, 0.875977f, 0.165039f, 87, 85, "I_STICK"}, + {0.254883f, 0.000977f, 0.493164f, 0.235352f, 123, 121, "I_STICK_BG"}, + {0.346680f, 0.413086f, 0.569336f, 0.479492f, 115, 35, "I_SHOULDER"}, + {0.000977f, 0.375977f, 0.143555f, 0.479492f, 74, 54, "I_DIR_LINE"}, + {0.213867f, 0.364258f, 0.342773f, 0.491211f, 67, 66, "I_ROUND_LINE"}, + {0.573242f, 0.413086f, 0.762695f, 0.487305f, 98, 39, "I_RECT_LINE"}, + {0.467773f, 0.323242f, 0.743164f, 0.409180f, 142, 45, "I_SHOULDER_LINE"}, + {0.497070f, 0.000977f, 0.704102f, 0.204102f, 107, 105, "I_STICK_LINE"}, + {0.000977f, 0.000977f, 0.250977f, 0.247070f, 129, 127, "I_STICK_BG_LINE"}, + {0.377930f, 0.543945f, 0.444336f, 0.610352f, 35, 35, "I_CHECKEDBOX"}, + {0.254883f, 0.239258f, 0.463867f, 0.360352f, 108, 63, "I_BG"}, + {0.000977f, 0.250977f, 0.209961f, 0.372070f, 108, 63, "I_BG_GOLD"}, + {0.120117f, 0.696289f, 0.139648f, 0.729492f, 11, 18, "I_L"}, + {0.213867f, 0.323242f, 0.243164f, 0.356445f, 16, 18, "I_R"}, + {0.118164f, 0.483398f, 0.209961f, 0.575195f, 48, 48, "I_DROP_SHADOW"}, + {0.879883f, 0.106445f, 0.950195f, 0.155273f, 37, 26, "I_LINES"}, + {0.346680f, 0.364258f, 0.416992f, 0.411133f, 37, 25, "I_GRID"}, + {0.497070f, 0.208008f, 0.819336f, 0.319336f, 166, 58, "I_LOGO"}, + {0.823242f, 0.168945f, 0.961914f, 0.307617f, 72, 72, "I_ICON"}, + {0.823242f, 0.311523f, 0.961914f, 0.450195f, 72, 72, "I_ICONGOLD"}, + {0.879883f, 0.000977f, 0.993164f, 0.102539f, 59, 53, "I_FOLDER"}, + {0.766602f, 0.454102f, 0.883789f, 0.545898f, 61, 48, "I_UP_DIRECTORY"}, +#endif /* USING_QT_UI */ }; const Atlas ui_atlas = { "ui_atlas.zim", diff --git a/UI/ui_atlas_lowmem.cpp b/UI/ui_atlas_lowmem.cpp deleted file mode 100644 index ca67cdbc86..0000000000 --- a/UI/ui_atlas_lowmem.cpp +++ /dev/null @@ -1,162 +0,0 @@ -// C++ generated by atlastool from atlasscript_lowmem.txt (hrydgard@gmail.com) - -#include "ui_atlas.h" - -const AtlasChar font_UBUNTU24_chardata[] = { -// RANGE: 0x20 - 0x80, start 0x21 - {0.000000f, 0.000000f, 0.001953f, 0.001953f, -2.0000f, -4.0000f, 7.3750f, 1, 1}, // 0020 - {0.283203f, 0.693359f, 0.298828f, 0.750000f, 0.2500f, -28.1875f, 7.8750f, 8, 29}, // 0021 - {0.142578f, 0.695313f, 0.166016f, 0.720703f, -0.6250f, -29.8750f, 9.7500f, 12, 13}, // 0022 - {0.298828f, 0.576172f, 0.337891f, 0.632813f, -1.0625f, -28.1875f, 17.7500f, 20, 29}, // 0023 - {0.212891f, 0.250000f, 0.248047f, 0.320313f, -0.5000f, -32.0000f, 16.6250f, 18, 36}, // 0024 - {0.658203f, 0.560547f, 0.705078f, 0.617188f, -0.4375f, -28.5000f, 22.4375f, 24, 29}, // 0025 - {0.542969f, 0.564453f, 0.585938f, 0.621094f, -0.9375f, -28.5000f, 19.4375f, 22, 29}, // 0026 - {0.167969f, 0.695313f, 0.181641f, 0.720703f, -0.6875f, -29.8750f, 5.3125f, 7, 13}, // 0027 - {0.603516f, 0.623047f, 0.626953f, 0.699219f, -0.0625f, -30.9375f, 10.0000f, 12, 39}, // 0028 - {0.187500f, 0.636719f, 0.210938f, 0.712891f, -1.6250f, -30.9375f, 10.0625f, 12, 39}, // 0029 - {0.707031f, 0.167969f, 0.740234f, 0.205078f, -1.5000f, -28.1875f, 13.3750f, 17, 19}, // 002a - {0.419922f, 0.363281f, 0.457031f, 0.406250f, -0.9375f, -24.0625f, 17.0000f, 19, 22}, // 002b - {0.322266f, 0.634766f, 0.339844f, 0.660156f, -1.1250f, -7.5625f, 6.5625f, 9, 13}, // 002c - {0.701172f, 0.699219f, 0.724609f, 0.712891f, -0.8125f, -15.5625f, 9.9375f, 12, 7}, // 002d - {0.726563f, 0.699219f, 0.742188f, 0.714844f, 0.2500f, -7.3750f, 8.2500f, 8, 8}, // 002e - {0.458984f, 0.667969f, 0.488281f, 0.728516f, -1.8750f, -28.1875f, 11.5000f, 15, 31}, // 002f - {0.248047f, 0.634766f, 0.283203f, 0.691406f, -0.4375f, -28.5000f, 16.6250f, 18, 29}, // 0030 - {0.050781f, 0.685547f, 0.076172f, 0.742188f, 0.3125f, -28.1875f, 16.6250f, 13, 29}, // 0031 - {0.285156f, 0.634766f, 0.320313f, 0.691406f, -0.7500f, -28.5000f, 16.6250f, 18, 29}, // 0032 - {0.076172f, 0.636719f, 0.111328f, 0.693359f, -0.8125f, -28.5000f, 16.6250f, 18, 29}, // 0033 - {0.632813f, 0.619141f, 0.669922f, 0.675781f, -1.1250f, -28.1875f, 16.6250f, 19, 29}, // 0034 - {0.113281f, 0.636719f, 0.148438f, 0.693359f, -0.0625f, -28.1875f, 16.6250f, 18, 29}, // 0035 - {0.150391f, 0.636719f, 0.185547f, 0.693359f, -0.2500f, -28.5000f, 16.6250f, 18, 29}, // 0036 - {0.525391f, 0.623047f, 0.562500f, 0.679688f, -0.9375f, -28.1875f, 16.6250f, 19, 29}, // 0037 - {0.708984f, 0.640625f, 0.744141f, 0.697266f, -0.5625f, -28.5000f, 16.6250f, 18, 29}, // 0038 - {0.746094f, 0.640625f, 0.781250f, 0.697266f, -0.7500f, -28.5000f, 16.6250f, 18, 29}, // 0039 - {0.904297f, 0.630859f, 0.919922f, 0.673828f, 0.2500f, -21.9375f, 7.8750f, 8, 22}, // 003a - {0.421875f, 0.613281f, 0.439453f, 0.666016f, -0.5000f, -21.9375f, 7.8125f, 9, 27}, // 003b - {0.777344f, 0.167969f, 0.808594f, 0.205078f, -1.0000f, -20.6875f, 14.9375f, 16, 19}, // 003c - {0.248047f, 0.693359f, 0.281250f, 0.720703f, 0.1250f, -20.0625f, 16.6250f, 17, 14}, // 003d - {0.742188f, 0.167969f, 0.775391f, 0.205078f, -0.1250f, -20.6875f, 15.1875f, 17, 19}, // 003e - {0.964844f, 0.287109f, 0.998047f, 0.343750f, -1.2500f, -28.5000f, 14.2500f, 17, 29}, // 003f - {0.865234f, 0.558594f, 0.921875f, 0.628906f, -0.8125f, -27.6250f, 27.1250f, 29, 36}, // 0040 - {0.953125f, 0.105469f, 0.998047f, 0.162109f, -1.5625f, -28.1875f, 18.8750f, 23, 29}, // 0041 - {0.564453f, 0.623047f, 0.601563f, 0.679688f, 0.3125f, -28.1875f, 18.6250f, 19, 29}, // 0042 - {0.087891f, 0.578125f, 0.126953f, 0.634766f, -0.5000f, -28.5000f, 18.0000f, 20, 29}, // 0043 - {0.128906f, 0.578125f, 0.167969f, 0.634766f, 0.3125f, -28.1875f, 19.1875f, 20, 29}, // 0044 - {0.783203f, 0.640625f, 0.818359f, 0.697266f, 0.3125f, -28.1875f, 16.8750f, 18, 29}, // 0045 - {0.820313f, 0.644531f, 0.855469f, 0.701172f, 0.3125f, -28.1875f, 16.9375f, 18, 29}, // 0046 - {0.169922f, 0.578125f, 0.208984f, 0.634766f, -0.3125f, -28.5000f, 19.8750f, 20, 29}, // 0047 - {0.707031f, 0.582031f, 0.746094f, 0.638672f, 0.3125f, -28.1875f, 20.6875f, 20, 29}, // 0048 - {0.300781f, 0.693359f, 0.316406f, 0.750000f, 0.5625f, -28.1875f, 8.5000f, 8, 29}, // 0049 - {0.421875f, 0.667969f, 0.457031f, 0.724609f, -1.0625f, -28.1875f, 16.4375f, 18, 29}, // 004a - {0.044922f, 0.566406f, 0.085938f, 0.623047f, 0.3125f, -28.1875f, 18.7500f, 21, 29}, // 004b - {0.964844f, 0.345703f, 0.998047f, 0.402344f, 0.3125f, -28.1875f, 15.8125f, 17, 29}, // 004c - {0.492188f, 0.560547f, 0.541016f, 0.617188f, 0.2500f, -28.1875f, 24.6250f, 25, 29}, // 004d - {0.748047f, 0.582031f, 0.787109f, 0.638672f, 0.3125f, -28.1875f, 20.6875f, 20, 29}, // 004e - {0.212891f, 0.576172f, 0.253906f, 0.632813f, -0.5000f, -28.5000f, 19.2500f, 21, 29}, // 004f - {0.789063f, 0.582031f, 0.828125f, 0.638672f, 0.3125f, -28.1875f, 18.8125f, 20, 29}, // 0050 - {0.447266f, 0.542969f, 0.490234f, 0.607422f, -0.5000f, -28.5000f, 20.1250f, 22, 33}, // 0051 - {0.447266f, 0.609375f, 0.486328f, 0.666016f, 0.3125f, -28.1250f, 19.3125f, 20, 29}, // 0052 - {0.339844f, 0.613281f, 0.378906f, 0.669922f, -0.7500f, -28.5000f, 18.0625f, 20, 29}, // 0053 - {0.380859f, 0.613281f, 0.419922f, 0.669922f, -1.4375f, -28.1875f, 16.8750f, 20, 29}, // 0054 - {0.923828f, 0.617188f, 0.962891f, 0.673828f, -0.0625f, -28.1875f, 19.2500f, 20, 29}, // 0055 - {0.587891f, 0.564453f, 0.630859f, 0.621094f, -1.6250f, -28.1875f, 18.5625f, 22, 29}, // 0056 - {0.923828f, 0.558594f, 0.980469f, 0.615234f, -1.3750f, -28.1875f, 25.7500f, 29, 29}, // 0057 - {0.255859f, 0.576172f, 0.296875f, 0.632813f, -1.2500f, -28.1875f, 18.4375f, 21, 29}, // 0058 - {0.000000f, 0.566406f, 0.042969f, 0.623047f, -1.6250f, -28.1875f, 18.2500f, 22, 29}, // 0059 - {0.000000f, 0.625000f, 0.037109f, 0.681641f, -0.7500f, -28.1875f, 16.7500f, 19, 29}, // 005a - {0.941406f, 0.675781f, 0.960938f, 0.750000f, 0.0625f, -31.7500f, 8.3750f, 10, 38}, // 005b - {0.964844f, 0.224609f, 0.996094f, 0.285156f, -1.6250f, -28.1875f, 12.2500f, 16, 31}, // 005c - {0.000000f, 0.683594f, 0.019531f, 0.757813f, -1.7500f, -31.7500f, 8.3750f, 10, 38}, // 005d - {0.962891f, 0.691406f, 0.992188f, 0.724609f, -1.1250f, -28.1875f, 12.5625f, 15, 17}, // 005e - {0.212891f, 0.695313f, 0.246094f, 0.708984f, -1.8750f, -4.0000f, 13.1875f, 17, 7}, // 005f - {0.707031f, 0.560547f, 0.728516f, 0.578125f, -0.6875f, -28.5625f, 9.8125f, 11, 9}, // 0060 - {0.263672f, 0.494141f, 0.298828f, 0.539063f, -0.6250f, -22.3125f, 15.8750f, 18, 23}, // 0061 - {0.830078f, 0.582031f, 0.865234f, 0.642578f, -0.1250f, -29.8750f, 16.5000f, 18, 31}, // 0062 - {0.964844f, 0.404297f, 0.998047f, 0.449219f, -0.8125f, -22.3125f, 15.3125f, 17, 23}, // 0063 - {0.488281f, 0.619141f, 0.523438f, 0.679688f, -0.7500f, -29.8750f, 16.5000f, 18, 31}, // 0064 - {0.666016f, 0.679688f, 0.699219f, 0.724609f, -0.6875f, -22.3125f, 15.4375f, 17, 23}, // 0065 - {0.353516f, 0.671875f, 0.380859f, 0.732422f, -1.2500f, -30.2500f, 10.3125f, 14, 31}, // 0066 - {0.671875f, 0.619141f, 0.707031f, 0.677734f, -0.7500f, -22.3125f, 16.5000f, 18, 30}, // 0067 - {0.964844f, 0.164063f, 0.998047f, 0.222656f, -0.1250f, -29.8750f, 16.5000f, 17, 30}, // 0068 - {0.982422f, 0.558594f, 0.998047f, 0.617188f, 0.1250f, -29.8750f, 7.6875f, 8, 30}, // 0069 - {0.382813f, 0.671875f, 0.404297f, 0.746094f, -3.0625f, -29.8750f, 7.7500f, 11, 38}, // 006a - {0.039063f, 0.625000f, 0.074219f, 0.683594f, -0.0625f, -29.8750f, 15.3125f, 18, 30}, // 006b - {0.406250f, 0.671875f, 0.421875f, 0.730469f, 0.1250f, -29.8750f, 7.6875f, 8, 30}, // 006c - {0.765625f, 0.400391f, 0.816406f, 0.445313f, -0.1250f, -22.3125f, 25.3125f, 26, 23}, // 006d - {0.490234f, 0.681641f, 0.523438f, 0.726563f, -0.1250f, -22.3125f, 16.5000f, 17, 23}, // 006e - {0.300781f, 0.494141f, 0.335938f, 0.539063f, -0.7500f, -22.3125f, 16.5000f, 18, 23}, // 006f - {0.867188f, 0.630859f, 0.902344f, 0.689453f, -0.1250f, -22.3125f, 16.5000f, 18, 30}, // 0070 - {0.210938f, 0.634766f, 0.246094f, 0.693359f, -0.7500f, -22.3125f, 16.5000f, 18, 30}, // 0071 - {0.632813f, 0.564453f, 0.658203f, 0.609375f, -0.1250f, -22.3125f, 10.5000f, 13, 23}, // 0072 - {0.525391f, 0.681641f, 0.558594f, 0.726563f, -0.9375f, -22.3125f, 14.8125f, 17, 23}, // 0073 - {0.021484f, 0.685547f, 0.048828f, 0.738281f, -1.5000f, -26.4375f, 10.4375f, 14, 27}, // 0074 - {0.560547f, 0.681641f, 0.593750f, 0.726563f, -0.1875f, -21.9375f, 16.5000f, 17, 23}, // 0075 - {0.904297f, 0.675781f, 0.939453f, 0.718750f, -1.4375f, -21.9375f, 14.8125f, 18, 22}, // 0076 - {0.212891f, 0.494141f, 0.261719f, 0.537109f, -1.3750f, -21.9375f, 21.6875f, 25, 22}, // 0077 - {0.628906f, 0.677734f, 0.664063f, 0.720703f, -1.4375f, -21.9375f, 14.8125f, 18, 22}, // 0078 - {0.728516f, 0.490234f, 0.765625f, 0.548828f, -1.6875f, -21.9375f, 14.8125f, 19, 30}, // 0079 - {0.857422f, 0.691406f, 0.888672f, 0.734375f, -0.7500f, -21.9375f, 14.3750f, 16, 22}, // 007a - {0.466797f, 0.238281f, 0.492188f, 0.310547f, -1.1250f, -30.5000f, 9.8750f, 13, 37}, // 007b - {0.890625f, 0.691406f, 0.904297f, 0.755859f, 0.5625f, -28.1875f, 7.3750f, 7, 33}, // 007c - {0.964844f, 0.617188f, 0.990234f, 0.689453f, -1.5625f, -30.5000f, 9.8750f, 13, 37}, // 007d - {0.078125f, 0.695313f, 0.117188f, 0.716797f, -0.2500f, -17.3125f, 19.3125f, 20, 11}, // 007e - {0.000000f, 0.000000f, 0.001953f, 0.001953f, -2.0000f, -4.0000f, 7.3750f, 1, 1}, // 007f -// RANGE: 0xfffd - 0xfffe, start 0x81 - {0.146484f, 0.375000f, 0.207031f, 0.470703f, -0.6250f, -39.6875f, 29.7500f, 31, 49}, // fffd -}; -const AtlasCharRange font_UBUNTU24_ranges[] = { - { 32, 128, 0 }, - { 65533, 65534, 96 }, -}; -const AtlasFont font_UBUNTU24 = { - -4.187500f, // padding - 49.000000f, // height - 37.687500f, // ascend - 0.750000f, // distslope - font_UBUNTU24_chardata, - font_UBUNTU24_ranges, - 2, - "UBUNTU24", // name -}; -const AtlasFont *ui_fonts[1] = { - &font_UBUNTU24, -}; -const AtlasImage ui_images[33] = { - {0.340820f, 0.577148f, 0.370117f, 0.606445f, 16, 16, "I_SOLIDWHITE"}, - {0.584961f, 0.491211f, 0.655273f, 0.561523f, 37, 37, "I_CROSS"}, - {0.747070f, 0.323242f, 0.821289f, 0.397461f, 39, 39, "I_CIRCLE"}, - {0.659180f, 0.491211f, 0.725586f, 0.557617f, 35, 35, "I_SQUARE"}, - {0.502930f, 0.491211f, 0.581055f, 0.557617f, 41, 35, "I_TRIANGLE"}, - {0.213867f, 0.543945f, 0.374023f, 0.573242f, 83, 16, "I_SELECT"}, - {0.729492f, 0.549805f, 0.862305f, 0.579102f, 69, 16, "I_START"}, - {0.323242f, 0.672852f, 0.350586f, 0.729492f, 15, 30, "I_ARROW"}, - {0.000977f, 0.483398f, 0.114258f, 0.563477f, 59, 42, "I_DIR"}, - {0.887695f, 0.454102f, 0.991211f, 0.555664f, 54, 53, "I_ROUND"}, - {0.346680f, 0.483398f, 0.499023f, 0.540039f, 79, 30, "I_RECT"}, - {0.708008f, 0.000977f, 0.875977f, 0.165039f, 87, 85, "I_STICK"}, - {0.254883f, 0.000977f, 0.493164f, 0.235352f, 123, 121, "I_STICK_BG"}, - {0.346680f, 0.413086f, 0.569336f, 0.479492f, 115, 35, "I_SHOULDER"}, - {0.000977f, 0.375977f, 0.143555f, 0.479492f, 74, 54, "I_DIR_LINE"}, - {0.213867f, 0.364258f, 0.342773f, 0.491211f, 67, 66, "I_ROUND_LINE"}, - {0.573242f, 0.413086f, 0.762695f, 0.487305f, 98, 39, "I_RECT_LINE"}, - {0.467773f, 0.323242f, 0.743164f, 0.409180f, 142, 45, "I_SHOULDER_LINE"}, - {0.497070f, 0.000977f, 0.704102f, 0.204102f, 107, 105, "I_STICK_LINE"}, - {0.000977f, 0.000977f, 0.250977f, 0.247070f, 129, 127, "I_STICK_BG_LINE"}, - {0.377930f, 0.543945f, 0.444336f, 0.610352f, 35, 35, "I_CHECKEDBOX"}, - {0.254883f, 0.239258f, 0.463867f, 0.360352f, 108, 63, "I_BG"}, - {0.000977f, 0.250977f, 0.209961f, 0.372070f, 108, 63, "I_BG_GOLD"}, - {0.120117f, 0.696289f, 0.139648f, 0.729492f, 11, 18, "I_L"}, - {0.213867f, 0.323242f, 0.243164f, 0.356445f, 16, 18, "I_R"}, - {0.118164f, 0.483398f, 0.209961f, 0.575195f, 48, 48, "I_DROP_SHADOW"}, - {0.879883f, 0.106445f, 0.950195f, 0.155273f, 37, 26, "I_LINES"}, - {0.346680f, 0.364258f, 0.416992f, 0.411133f, 37, 25, "I_GRID"}, - {0.497070f, 0.208008f, 0.819336f, 0.319336f, 166, 58, "I_LOGO"}, - {0.823242f, 0.168945f, 0.961914f, 0.307617f, 72, 72, "I_ICON"}, - {0.823242f, 0.311523f, 0.961914f, 0.450195f, 72, 72, "I_ICONGOLD"}, - {0.879883f, 0.000977f, 0.993164f, 0.102539f, 59, 53, "I_FOLDER"}, - {0.766602f, 0.454102f, 0.883789f, 0.545898f, 61, 48, "I_UP_DIRECTORY"}, -}; -const Atlas ui_atlas = { - "ui_atlas.zim", - ui_fonts, 1, - ui_images, 33, -}; diff --git a/buildatlas.sh b/buildatlas.sh index 7ca2ec5ab4..049c0ab2ed 100755 --- a/buildatlas.sh +++ b/buildatlas.sh @@ -1,2 +1,4 @@ -./native/tools/build/atlastool atlasscript.txt ui 8888 && cp ui_atlas.zim assets && mv ui_atlas.zim android/assets && mv ui_atlas.cpp ui_atlas.h UI -./native/tools/build/atlastool atlasscript_lowmem.txt ui 8888 && mv ui_atlas.zim assets/ui_atlas_lowmem.zim && mv ui_atlas.cpp UI/ui_atlas_lowmem.cpp && rm ui_atlas.h +./native/tools/build/atlastool atlasscript.txt ui 8888 && cp ui_atlas.zim assets && mv ui_atlas.zim android/assets && mv ui_atlas.h UI +./native/tools/build/atlastool atlasscript_lowmem.txt ui 8888 && mv ui_atlas.zim assets/ui_atlas_lowmem.zim && mv ui_atlas.cpp ui_atlas_lowmem.cpp +diff -I'^//.*' -D USING_QT_UI ui_atlas.cpp ui_atlas_lowmem.cpp > UI/ui_atlas.cpp +rm ui_atlas_highmem.cpp ui_atlas_lowmem.cpp ui_atlas.h