windows gui option for buffered rendering. Misc fixes, prettier checkbox on android.

This commit is contained in:
Henrik Rydgard 2012-11-20 11:35:48 +01:00
parent f378f959e1
commit 4b87da74cb
16 changed files with 347 additions and 347 deletions

View File

@ -119,11 +119,7 @@ int MIPSState::RunLoopUntil(u64 globalTicks)
while (coreState == CORE_RUNNING)
{
// NEVER stop in a delay slot!
#ifdef _DEBUG
while (CoreTiming::downcount >= 0 && coreState == CORE_RUNNING)
#else
while (CoreTiming::downcount >= 0 && mipsr4k.pc)
#endif
{
// int cycles = 0;
{

View File

@ -56,13 +56,12 @@ extern u32 curTextureHeight;
GLES_GPU::GLES_GPU(int renderWidth, int renderHeight)
: interruptsEnabled_(true),
dlIdGenerator(1),
renderWidth_(renderWidth),
renderHeight_(renderHeight)
renderHeight_(renderHeight),
dlIdGenerator(1)
{
widthFactor_ = (float)renderWidth / 480.0f;
heightFactor_ = (float)renderHeight / 272.0f;
}
GLES_GPU::~GLES_GPU()
@ -94,6 +93,7 @@ void GLES_GPU::BeginFrame()
u8 *pspframebuf = Memory::GetPointer((0x44000000)|(displayFramebufPtr_ & 0x1FFFFF)); // TODO - check
DisplayDrawer_DrawFramebuffer(pspframebuf, displayFormat_, displayStride_);
}
currentRenderVfb_ = 0;
}
void GLES_GPU::SetDisplayFramebuffer(u32 framebuf, u32 stride, int format)
@ -128,7 +128,7 @@ void GLES_GPU::CopyDisplayToOutput()
}
DEBUG_LOG(HLE, "Displaying FBO %08x", vfb->fb_address);
glDisable(GL_BLEND);
glDisable(GL_CULL_FACE);
glDisable(GL_DEPTH_TEST);
@ -142,6 +142,7 @@ void GLES_GPU::CopyDisplayToOutput()
gstate_c.textureChanged = true;
// Restore some state
ExecuteOp(gstate.cmdmem[GE_CMD_ALPHABLENDENABLE], 0xFFFFFFFF);
ExecuteOp(gstate.cmdmem[GE_CMD_CULLFACEENABLE], 0xFFFFFFFF);
ExecuteOp(gstate.cmdmem[GE_CMD_ZTESTENABLE], 0xFFFFFFFF);
}

View File

@ -121,5 +121,6 @@ void ReapplyGfxState()
{
gpu->ExecuteOp(gstate.cmdmem[i], 0xFFFFFFFF);
}
// TODO: there's more...
}

View File

@ -336,6 +336,11 @@ namespace MainWindow
UpdateMenus();
break;
case ID_OPTIONS_BUFFEREDRENDERING:
g_Config.bBufferedRendering = !g_Config.bBufferedRendering;
UpdateMenus();
break;
case ID_FILE_EXIT:
DestroyWindow(hWnd);
break;
@ -593,7 +598,7 @@ namespace MainWindow
CHECKITEM(ID_OPTIONS_IGNOREILLEGALREADS,g_Config.bIgnoreBadMemAccess);
CHECKITEM(ID_CPU_INTERPRETER,!g_Config.bJIT);
CHECKITEM(ID_CPU_DYNAREC,g_Config.bJIT);
CHECKITEM(ID_OPTIONS_BUFFEREDRENDERING, g_Config.bBufferedRendering);
BOOL enable = !Core_IsStepping();
EnableMenuItem(menu,ID_EMULATION_RUN,enable);
EnableMenuItem(menu,ID_EMULATION_PAUSE,!enable);

View File

@ -213,6 +213,7 @@ BEGIN
BEGIN
MENUITEM "&Toggle Full Screen\tAlt+Enter", ID_OPTIONS_FULLSCREEN, GRAYED
MENUITEM "&Display raw framebuffer", ID_OPTIONS_DISPLAYRAWFRAMEBUFFER
MENUITEM "&Buffered rendering", ID_OPTIONS_BUFFEREDRENDERING
MENUITEM SEPARATOR
MENUITEM "Screen &1x", ID_OPTIONS_SCREEN1X
MENUITEM "Screen &2x", ID_OPTIONS_SCREEN2X

View File

@ -238,13 +238,14 @@
#define ID_OPTIONS_SCREEN3X 40115
#define ID_OPTIONS_SCREEN4X 40116
#define ID_OPTIONS_SCREEN2X 40117
#define ID_OPTIONS_BUFFEREDRENDERING 40118
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 232
#define _APS_NEXT_COMMAND_VALUE 40118
#define _APS_NEXT_COMMAND_VALUE 40119
#define _APS_NEXT_CONTROL_VALUE 1162
#define _APS_NEXT_SYMED_VALUE 101
#endif

Binary file not shown.

View File

@ -14,6 +14,7 @@ image I_DIR source_assets/image/dir.png copy
image I_ROUND source_assets/image/round.png copy
image I_STICK source_assets/image/stick.png copy
image I_SHOULDER source_assets/image/shoulder.png copy
image I_CHECKEDBOX source_assets/image/checkedbox.png copy
image I_RECT source_assets/image/rect.png copy
image I_STICKBG source_assets/image/stick_bg.png copy
image I_BG source_assets/image/background.png copy
@ -21,8 +22,6 @@ image I_L source_assets/image/L.png copy
image I_R source_assets/image/R.png copy
image I_BUTTON source_assets/image/button.png copy
image I_BUTTON_SELECTED source_assets/image/button_selected.png copy
image I_ACTIVE_ITEM source_assets/image/active_item.png copy
image I_INACTIVE_ITEM source_assets/image/inactive_item.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_ICON_EXE source_assets/image/exe.png copy

View File

@ -155,15 +155,14 @@ void EmuScreen::render()
// I think we need to allocate FBOs per framebuffer and just blit the displayed one here at the end of the frame.
// Also - we should add another option to the core that lets us run it until a vblank event happens or the N cycles have passed
// - then the synchronization would at least not be able to drift off.
int retval = 1;
// Let's do 120 "blocks" per second just to try it
int blockTicks = usToCycles(1000000 / 120);
// The actual number of cycles doesn't matter so much here as we will break due to CORE_NEXTFRAME, most of the time hopefully...
int blockTicks = usToCycles(1000000 / 2);
// Run until CORE_NEXTFRAME
while (coreState == CORE_RUNNING) {
u64 nowTicks = CoreTiming::GetTicks();
retval = mipsr4k.RunLoopUntil(nowTicks + blockTicks);
mipsr4k.RunLoopUntil(nowTicks + blockTicks);
}
// Hopefully coreState is now CORE_NEXTFRAME
if (coreState == CORE_NEXTFRAME) {
@ -171,30 +170,29 @@ void EmuScreen::render()
coreState = CORE_RUNNING;
}
//if (hasRendered)
{
UIShader_Prepare();
fbo_unbind();
uiTexture->Bind(0);
UIShader_Prepare();
ui_draw2d.Begin(DBMODE_NORMAL);
uiTexture->Bind(0);
// Don't want the gamepad on MacOSX and Linux
glViewport(0, 0, dp_xres, dp_yres);
ui_draw2d.Begin(DBMODE_NORMAL);
// Don't want the gamepad on MacOSX and Linux
// #ifdef ANDROID
DrawGamepad(ui_draw2d);
DrawGamepad(ui_draw2d);
// #endif
DrawWatermark();
DrawWatermark();
glsl_bind(UIShader_Get());
ui_draw2d.End();
ui_draw2d.Flush(UIShader_Get());
glsl_bind(UIShader_Get());
ui_draw2d.End();
ui_draw2d.Flush(UIShader_Get());
//hasRendered = false;
// Reapply the graphics state of the PSP
ReapplyGfxState();
}
// Reapply the graphics state of the PSP
ReapplyGfxState();
// Tiled renderers like PowerVR should benefit greatly from this. However - seems I can't call it?
#if defined(ANDROID) || defined(BLACKBERRY)

View File

@ -240,7 +240,7 @@ void SettingsScreen::render() {
int y = 50;
UICheckBox(GEN_ID, x, y += 50, "Enable Sound Emulation", ALIGN_TOPLEFT, &g_Config.bEnableSound);
UICheckBox(GEN_ID, x, y += 50, "Show Analog Stick", ALIGN_TOPLEFT, &g_Config.bShowAnalogStick);
UICheckBox(GEN_ID, x, y += 50, "Buffered Rendering", ALIGN_TOPLEFT, &g_Config.bBufferedRendering);
UICheckBox(GEN_ID, x, y += 50, "Buffered Rendering (may fix flicker)", ALIGN_TOPLEFT, &g_Config.bBufferedRendering);
// UICheckBox(GEN_ID, x, y += 50, "Draw raw framebuffer (for some homebrew)", ALIGN_TOPLEFT, &g_Config.bDisplayFramebuffer);
if (UIButton(GEN_ID, Pos(dp_xres - 10, dp_yres-10), LARGE_BUTTON_WIDTH, "Back", ALIGN_RIGHT | ALIGN_BOTTOM)) {

View File

@ -68,7 +68,7 @@ public:
struct FileSelectScreenOptions {
char* filter; // Enforced extension filter. Case insensitive, extensions separated by ":".
const char* filter; // Enforced extension filter. Case insensitive, extensions separated by ":".
bool allowChooseDirectory;
int folderIcon;
std::map<std::string, int> iconMapping;

View File

@ -237,7 +237,7 @@ void NativeInitGraphics()
theme.uiFontSmaller = UBUNTU24;
theme.buttonImage = I_BUTTON;
theme.buttonSelected = I_BUTTON_SELECTED;
theme.checkOn = I_CROSS;
theme.checkOn = I_CHECKEDBOX;
theme.checkOff = I_SQUARE;
UIInit(&ui_atlas, theme);

View File

@ -9,101 +9,101 @@ const AtlasFont font_UBUNTU24 = {
0.750000f, // distslope
{
{0.865234f, 0.101563f, 0.867188f, 0.103516f, -2.0000f, -2.0000f, 7.0625f, 1, 1}, // 32
{0.734375f, 0.337891f, 0.750000f, 0.388672f, -0.3750f, -23.1250f, 6.3750f, 8, 26}, // 33
{0.361328f, 0.402344f, 0.384766f, 0.425781f, -0.5000f, -23.0625f, 10.2500f, 12, 12}, // 34
{0.787109f, 0.662109f, 0.824219f, 0.712891f, -1.5625f, -23.0625f, 15.3125f, 19, 26}, // 35
{0.210938f, 0.238281f, 0.242188f, 0.289063f, -1.1875f, -23.0625f, 13.8125f, 16, 26}, // 36
{0.548828f, 0.623047f, 0.593750f, 0.673828f, -0.7500f, -23.3750f, 20.9375f, 23, 26}, // 37
{0.787109f, 0.714844f, 0.820313f, 0.765625f, -0.9375f, -23.0625f, 14.1250f, 17, 26}, // 38
{0.720703f, 0.423828f, 0.734375f, 0.447266f, -0.5000f, -23.0625f, 5.3125f, 7, 12}, // 39
{0.214844f, 0.808594f, 0.238281f, 0.878906f, 0.3750f, -26.9375f, 10.7500f, 12, 36}, // 40
{0.240234f, 0.808594f, 0.263672f, 0.878906f, -1.3750f, -26.9375f, 10.7500f, 12, 36}, // 41
{0.843750f, 0.939453f, 0.875000f, 0.968750f, -1.2500f, -23.0625f, 12.8750f, 16, 15}, // 42
{0.230469f, 0.933594f, 0.261719f, 0.964844f, -0.5000f, -18.3750f, 14.7500f, 16, 16}, // 43
{0.750000f, 0.244141f, 0.765625f, 0.267578f, -0.5000f, -4.9375f, 5.7500f, 8, 12}, // 44
{0.056641f, 0.308594f, 0.076172f, 0.320313f, -1.4375f, -12.6250f, 7.1250f, 10, 6}, // 45
{0.835938f, 0.275391f, 0.851563f, 0.289063f, -0.5000f, -4.9375f, 6.1250f, 8, 7}, // 46
{0.300781f, 0.798828f, 0.330078f, 0.855469f, -3.0625f, -23.0625f, 9.1250f, 15, 29}, // 47
{0.693359f, 0.718750f, 0.726563f, 0.769531f, -0.7500f, -23.0625f, 15.4375f, 17, 26}, // 48
{0.074219f, 0.693359f, 0.091797f, 0.744141f, -1.7500f, -23.0625f, 6.6250f, 9, 26}, // 49
{0.728516f, 0.718750f, 0.761719f, 0.769531f, -0.8125f, -23.0625f, 14.3750f, 17, 26}, // 50
{0.968750f, 0.742188f, 0.998047f, 0.792969f, -1.1875f, -23.0625f, 12.8750f, 15, 26}, // 51
{0.908203f, 0.689453f, 0.943359f, 0.740234f, -1.6250f, -23.0625f, 13.8125f, 18, 26}, // 52
{0.496094f, 0.728516f, 0.529297f, 0.779297f, -0.7500f, -23.0625f, 14.8750f, 17, 26}, // 53
{0.531250f, 0.732422f, 0.564453f, 0.783203f, -0.7500f, -23.0625f, 14.9375f, 17, 26}, // 54
{0.357422f, 0.832031f, 0.388672f, 0.882813f, -1.5000f, -23.0625f, 12.1250f, 16, 26}, // 55
{0.945313f, 0.689453f, 0.980469f, 0.740234f, -0.8750f, -23.0625f, 15.5625f, 18, 26}, // 56
{0.652344f, 0.738281f, 0.685547f, 0.789063f, -0.8750f, -23.0625f, 15.0000f, 17, 26}, // 57
{0.693359f, 0.681641f, 0.708984f, 0.716797f, -0.3125f, -15.4375f, 6.5625f, 8, 18}, // 58
{0.962891f, 0.943359f, 0.978516f, 0.988281f, -0.3125f, -15.4375f, 6.5625f, 8, 23}, // 59
{0.593750f, 0.914063f, 0.625000f, 0.949219f, -0.5000f, -19.5000f, 14.7500f, 16, 18}, // 60
{0.427734f, 0.722656f, 0.458984f, 0.746094f, -0.5000f, -16.3750f, 14.7500f, 16, 12}, // 61
{0.390625f, 0.919922f, 0.421875f, 0.955078f, -0.5000f, -19.5000f, 14.7500f, 16, 18}, // 62
{0.130859f, 0.833984f, 0.162109f, 0.884766f, -1.7500f, -23.0625f, 12.3750f, 16, 26}, // 63
{0.615234f, 0.648438f, 0.656250f, 0.695313f, -0.8750f, -19.5625f, 18.5000f, 21, 24}, // 64
{0.000000f, 0.691406f, 0.035156f, 0.742188f, -1.8125f, -23.0625f, 14.1875f, 18, 26}, // 65
{0.863281f, 0.738281f, 0.896484f, 0.789063f, -0.5000f, -23.0625f, 15.0625f, 17, 26}, // 66
{0.000000f, 0.849609f, 0.029297f, 0.900391f, -0.7500f, -23.0625f, 12.6875f, 15, 26}, // 67
{0.267578f, 0.740234f, 0.300781f, 0.791016f, -0.5000f, -23.0625f, 15.5000f, 17, 26}, // 68
{0.070313f, 0.849609f, 0.099609f, 0.900391f, -0.5000f, -23.0625f, 12.8750f, 15, 26}, // 69
{0.031250f, 0.851563f, 0.060547f, 0.902344f, -0.5000f, -23.0625f, 11.8750f, 15, 26}, // 70
{0.195313f, 0.742188f, 0.228516f, 0.792969f, -0.7500f, -23.0625f, 15.2500f, 17, 26}, // 71
{0.898438f, 0.742188f, 0.931641f, 0.792969f, -0.5000f, -23.0625f, 15.8750f, 17, 26}, // 72
{0.734375f, 0.910156f, 0.750000f, 0.960938f, -0.4375f, -23.0625f, 6.2500f, 8, 26}, // 73
{0.783203f, 0.855469f, 0.812500f, 0.906250f, -1.7500f, -23.0625f, 11.8125f, 15, 26}, // 74
{0.933594f, 0.742188f, 0.966797f, 0.792969f, -0.5000f, -23.0625f, 14.5000f, 17, 26}, // 75
{0.234375f, 0.880859f, 0.261719f, 0.931641f, -0.5000f, -23.0625f, 11.1875f, 14, 26}, // 76
{0.000000f, 0.638672f, 0.041016f, 0.689453f, -0.5000f, -23.0625f, 19.7500f, 21, 26}, // 77
{0.000000f, 0.744141f, 0.033203f, 0.794922f, -0.5625f, -23.0625f, 15.8125f, 17, 26}, // 78
{0.093750f, 0.691406f, 0.128906f, 0.742188f, -0.7500f, -23.0625f, 16.1250f, 18, 26}, // 79
{0.074219f, 0.744141f, 0.107422f, 0.794922f, -0.5000f, -23.0625f, 14.5625f, 17, 26}, // 80
{0.630859f, 0.167969f, 0.666016f, 0.222656f, -0.7500f, -23.0625f, 16.3125f, 18, 28}, // 81
{0.035156f, 0.746094f, 0.068359f, 0.796875f, -0.5000f, -23.0625f, 15.4375f, 17, 26}, // 82
{0.302734f, 0.746094f, 0.335938f, 0.796875f, -1.3125f, -23.0625f, 13.6875f, 17, 26}, // 83
{0.492188f, 0.833984f, 0.523438f, 0.884766f, -1.7500f, -23.0625f, 12.3125f, 16, 26}, // 84
{0.037109f, 0.693359f, 0.072266f, 0.744141f, -0.6250f, -23.0625f, 16.3125f, 18, 26}, // 85
{0.326172f, 0.693359f, 0.361328f, 0.744141f, -1.8125f, -23.0625f, 13.8125f, 18, 26}, // 86
{0.929688f, 0.593750f, 0.980469f, 0.644531f, -1.7500f, -23.0625f, 22.2500f, 26, 26}, // 87
{0.427734f, 0.746094f, 0.460938f, 0.796875f, -1.5625f, -23.0625f, 13.5625f, 17, 26}, // 88
{0.462891f, 0.746094f, 0.496094f, 0.796875f, -1.9375f, -23.0625f, 12.5625f, 17, 26}, // 89
{0.525391f, 0.837891f, 0.556641f, 0.888672f, -1.0000f, -23.0625f, 13.0625f, 16, 26}, // 90
{0.332031f, 0.812500f, 0.355469f, 0.882813f, 0.3750f, -26.9375f, 10.7500f, 12, 36}, // 91
{0.429688f, 0.798828f, 0.458984f, 0.855469f, -2.0000f, -23.0625f, 9.1250f, 15, 29}, // 92
{0.105469f, 0.814453f, 0.128906f, 0.884766f, -1.3750f, -26.9375f, 10.7500f, 12, 36}, // 93
{0.000000f, 0.945313f, 0.027344f, 0.968750f, -1.1250f, -23.0625f, 11.4375f, 14, 12}, // 94
{0.113281f, 0.320313f, 0.144531f, 0.332031f, -2.0000f, 0.0625f, 11.6250f, 16, 6}, // 95
{0.566406f, 0.748047f, 0.591797f, 0.765625f, -0.5000f, -24.9375f, 11.9375f, 13, 9}, // 96
{0.625000f, 0.896484f, 0.658203f, 0.937500f, -1.0000f, -18.6875f, 14.4375f, 17, 21}, // 97
{0.615234f, 0.750000f, 0.648438f, 0.800781f, -0.5000f, -23.6875f, 15.3750f, 17, 26}, // 98
{0.033203f, 0.904297f, 0.062500f, 0.945313f, -0.7500f, -18.6875f, 12.3750f, 15, 21}, // 99
{0.230469f, 0.755859f, 0.263672f, 0.806641f, -0.7500f, -23.6875f, 15.3750f, 17, 26}, // 100
{0.843750f, 0.896484f, 0.876953f, 0.937500f, -0.7500f, -18.6875f, 14.5000f, 17, 21}, // 101
{0.660156f, 0.919922f, 0.681641f, 0.970703f, -0.5000f, -23.6875f, 8.1250f, 11, 26}, // 102
{0.498047f, 0.671875f, 0.531250f, 0.726563f, -0.7500f, -18.6875f, 15.3750f, 17, 28}, // 103
{0.337891f, 0.759766f, 0.371094f, 0.810547f, -0.5000f, -23.6875f, 15.6250f, 17, 26}, // 104
{0.121094f, 0.929688f, 0.136719f, 0.980469f, -0.4375f, -23.6875f, 6.1875f, 8, 26}, // 105
{0.367188f, 0.884766f, 0.388672f, 0.949219f, -3.3750f, -23.6875f, 6.6250f, 11, 33}, // 106
{0.632813f, 0.843750f, 0.664063f, 0.894531f, -0.5000f, -23.6875f, 13.6250f, 16, 26}, // 107
{0.550781f, 0.933594f, 0.566406f, 0.984375f, -0.5000f, -23.6875f, 6.0625f, 8, 26}, // 108
{0.042969f, 0.650391f, 0.091797f, 0.691406f, -0.5000f, -18.6875f, 23.1875f, 25, 21}, // 109
{0.263672f, 0.898438f, 0.296875f, 0.939453f, -0.5000f, -18.6875f, 15.6250f, 17, 21}, // 110
{0.169922f, 0.332031f, 0.205078f, 0.373047f, -0.7500f, -18.6875f, 15.5625f, 18, 21}, // 111
{0.533203f, 0.675781f, 0.566406f, 0.730469f, -0.5000f, -18.6875f, 15.3750f, 17, 28}, // 112
{0.658203f, 0.681641f, 0.691406f, 0.736328f, -0.7500f, -18.6875f, 15.3750f, 17, 28}, // 113
{0.763672f, 0.718750f, 0.787109f, 0.759766f, -0.6250f, -18.6875f, 9.6875f, 12, 21}, // 114
{0.000000f, 0.902344f, 0.031250f, 0.943359f, -1.1250f, -18.6875f, 13.6250f, 16, 21}, // 115
{0.687500f, 0.896484f, 0.710938f, 0.947266f, -0.6250f, -23.0625f, 8.9375f, 12, 26}, // 116
{0.162109f, 0.900391f, 0.195313f, 0.941406f, -0.6250f, -18.6875f, 15.5000f, 17, 21}, // 117
{0.197266f, 0.880859f, 0.232422f, 0.921875f, -1.7500f, -18.6875f, 14.3125f, 18, 21}, // 118
{0.658203f, 0.638672f, 0.708984f, 0.679688f, -1.6875f, -18.6875f, 22.4375f, 26, 21}, // 119
{0.330078f, 0.884766f, 0.365234f, 0.925781f, -1.7500f, -18.6875f, 13.8125f, 18, 21}, // 120
{0.394531f, 0.650391f, 0.429688f, 0.705078f, -1.7500f, -18.6875f, 14.0000f, 18, 28}, // 121
{0.298828f, 0.910156f, 0.328125f, 0.951172f, -1.0000f, -18.6875f, 12.7500f, 15, 21}, // 122
{0.431641f, 0.650391f, 0.457031f, 0.720703f, -0.6875f, -26.9375f, 10.9375f, 13, 36}, // 123
{0.982422f, 0.566406f, 0.996094f, 0.634766f, 0.6875f, -26.3125f, 7.9375f, 7, 35}, // 124
{0.568359f, 0.675781f, 0.593750f, 0.746094f, -1.3750f, -26.9375f, 10.9375f, 13, 36}, // 125
{0.630859f, 0.224609f, 0.662109f, 0.240234f, -0.5000f, -14.1875f, 14.7500f, 16, 8}, // 126
{0.000000f, 0.568359f, 0.048828f, 0.636719f, -0.5000f, -25.2500f, 23.1250f, 25, 35}, // 127
{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
},
"UBUNTU24", // name
};
@ -114,101 +114,101 @@ const AtlasFont font_UBUNTUBOLD24 = {
0.750000f, // distslope
{
{0.869141f, 0.101563f, 0.871094f, 0.103516f, -2.0000f, -2.0000f, 7.0625f, 1, 1}, // 32
{0.812500f, 0.941406f, 0.828125f, 0.992188f, -0.3750f, -23.1250f, 6.3750f, 8, 26}, // 33
{0.873047f, 0.654297f, 0.896484f, 0.677734f, -0.5000f, -23.0625f, 10.2500f, 12, 12}, // 34
{0.710938f, 0.666016f, 0.748047f, 0.716797f, -1.5625f, -23.0625f, 15.3125f, 19, 26}, // 35
{0.845703f, 0.843750f, 0.876953f, 0.894531f, -1.1875f, -23.0625f, 13.8125f, 16, 26}, // 36
{0.201172f, 0.632813f, 0.246094f, 0.683594f, -0.7500f, -23.3750f, 20.9375f, 23, 26}, // 37
{0.109375f, 0.761719f, 0.142578f, 0.812500f, -0.9375f, -23.0625f, 14.1250f, 17, 26}, // 38
{0.720703f, 0.449219f, 0.734375f, 0.472656f, -0.5000f, -23.0625f, 5.3125f, 7, 12}, // 39
{0.820313f, 0.816406f, 0.843750f, 0.886719f, 0.3750f, -26.9375f, 10.7500f, 12, 36}, // 40
{0.568359f, 0.820313f, 0.591797f, 0.890625f, -1.3750f, -26.9375f, 10.7500f, 12, 36}, // 41
{0.263672f, 0.941406f, 0.294922f, 0.970703f, -1.2500f, -23.0625f, 12.8750f, 16, 15}, // 42
{0.484375f, 0.933594f, 0.515625f, 0.964844f, -0.5000f, -18.3750f, 14.7500f, 16, 16}, // 43
{0.443359f, 0.527344f, 0.458984f, 0.550781f, -0.5000f, -4.9375f, 5.7500f, 8, 12}, // 44
{0.109375f, 0.744141f, 0.128906f, 0.755859f, -1.4375f, -12.6250f, 7.1250f, 10, 6}, // 45
{0.876953f, 0.546875f, 0.892578f, 0.560547f, -0.5000f, -4.9375f, 6.1250f, 8, 7}, // 46
{0.460938f, 0.798828f, 0.490234f, 0.855469f, -3.0625f, -23.0625f, 9.1250f, 15, 29}, // 47
{0.822266f, 0.763672f, 0.855469f, 0.814453f, -0.7500f, -23.0625f, 15.4375f, 17, 26}, // 48
{0.978516f, 0.847656f, 0.996094f, 0.898438f, -1.7500f, -23.0625f, 6.6250f, 9, 26}, // 49
{0.566406f, 0.767578f, 0.599609f, 0.818359f, -0.8125f, -23.0625f, 14.3750f, 17, 26}, // 50
{0.298828f, 0.857422f, 0.328125f, 0.908203f, -1.1875f, -23.0625f, 12.8750f, 15, 26}, // 51
{0.458984f, 0.693359f, 0.494141f, 0.744141f, -1.6250f, -23.0625f, 13.8125f, 18, 26}, // 52
{0.763672f, 0.767578f, 0.796875f, 0.818359f, -0.7500f, -23.0625f, 14.8750f, 17, 26}, // 53
{0.687500f, 0.771484f, 0.720703f, 0.822266f, -0.7500f, -23.0625f, 14.9375f, 17, 26}, // 54
{0.265625f, 0.845703f, 0.296875f, 0.896484f, -1.5000f, -23.0625f, 12.1250f, 16, 26}, // 55
{0.615234f, 0.697266f, 0.650391f, 0.748047f, -0.8750f, -23.0625f, 15.5625f, 18, 26}, // 56
{0.722656f, 0.771484f, 0.755859f, 0.822266f, -0.8750f, -23.0625f, 15.0000f, 17, 26}, // 57
{0.982422f, 0.707031f, 0.998047f, 0.742188f, -0.3125f, -15.4375f, 6.5625f, 8, 18}, // 58
{0.980469f, 0.943359f, 0.996094f, 0.988281f, -0.3125f, -15.4375f, 6.5625f, 8, 23}, // 59
{0.197266f, 0.923828f, 0.228516f, 0.958984f, -0.5000f, -19.5000f, 14.7500f, 16, 18}, // 60
{0.929688f, 0.943359f, 0.960938f, 0.966797f, -0.5000f, -16.3750f, 14.7500f, 16, 12}, // 61
{0.330078f, 0.927734f, 0.361328f, 0.962891f, -0.5000f, -19.5000f, 14.7500f, 16, 18}, // 62
{0.164063f, 0.847656f, 0.195313f, 0.898438f, -1.7500f, -23.0625f, 12.3750f, 16, 26}, // 63
{0.248047f, 0.654297f, 0.289063f, 0.701172f, -0.8750f, -19.5625f, 18.5000f, 21, 24}, // 64
{0.230469f, 0.703125f, 0.265625f, 0.753906f, -1.8125f, -23.0625f, 14.1875f, 18, 26}, // 65
{0.373047f, 0.779297f, 0.406250f, 0.830078f, -0.5000f, -23.0625f, 15.0625f, 17, 26}, // 66
{0.429688f, 0.857422f, 0.458984f, 0.908203f, -0.7500f, -23.0625f, 12.6875f, 15, 26}, // 67
{0.144531f, 0.781250f, 0.177734f, 0.832031f, -0.5000f, -23.0625f, 15.5000f, 17, 26}, // 68
{0.460938f, 0.857422f, 0.490234f, 0.908203f, -0.5000f, -23.0625f, 12.8750f, 15, 26}, // 69
{0.593750f, 0.861328f, 0.623047f, 0.912109f, -0.5000f, -23.0625f, 11.8750f, 15, 26}, // 70
{0.498047f, 0.781250f, 0.531250f, 0.832031f, -0.7500f, -23.0625f, 15.2500f, 17, 26}, // 71
{0.533203f, 0.785156f, 0.566406f, 0.835938f, -0.5000f, -23.0625f, 15.8750f, 17, 26}, // 72
{0.162109f, 0.943359f, 0.177734f, 0.994141f, -0.4375f, -23.0625f, 6.2500f, 8, 26}, // 73
{0.390625f, 0.867188f, 0.419922f, 0.917969f, -1.7500f, -23.0625f, 11.8125f, 15, 26}, // 74
{0.650391f, 0.791016f, 0.683594f, 0.841797f, -0.5000f, -23.0625f, 14.5000f, 17, 26}, // 75
{0.814453f, 0.888672f, 0.841797f, 0.939453f, -0.5000f, -23.0625f, 11.1875f, 14, 26}, // 76
{0.099609f, 0.638672f, 0.140625f, 0.689453f, -0.5000f, -23.0625f, 19.7500f, 21, 26}, // 77
{0.857422f, 0.791016f, 0.890625f, 0.841797f, -0.5625f, -23.0625f, 15.8125f, 17, 26}, // 78
{0.363281f, 0.707031f, 0.398438f, 0.757813f, -0.7500f, -23.0625f, 16.1250f, 18, 26}, // 79
{0.265625f, 0.792969f, 0.298828f, 0.843750f, -0.5000f, -23.0625f, 14.5625f, 17, 26}, // 80
{0.835938f, 0.654297f, 0.871094f, 0.708984f, -0.7500f, -23.0625f, 16.3125f, 18, 28}, // 81
{0.179688f, 0.794922f, 0.212891f, 0.845703f, -0.5000f, -23.0625f, 15.4375f, 17, 26}, // 82
{0.892578f, 0.794922f, 0.925781f, 0.845703f, -1.3125f, -23.0625f, 13.6875f, 17, 26}, // 83
{0.878906f, 0.847656f, 0.910156f, 0.898438f, -1.7500f, -23.0625f, 12.3125f, 16, 26}, // 84
{0.130859f, 0.708984f, 0.166016f, 0.759766f, -0.6250f, -23.0625f, 16.3125f, 18, 26}, // 85
{0.826172f, 0.710938f, 0.861328f, 0.761719f, -1.8125f, -23.0625f, 13.8125f, 18, 26}, // 86
{0.783203f, 0.609375f, 0.833984f, 0.660156f, -1.7500f, -23.0625f, 22.2500f, 26, 26}, // 87
{0.927734f, 0.794922f, 0.960938f, 0.845703f, -1.5625f, -23.0625f, 13.5625f, 17, 26}, // 88
{0.962891f, 0.794922f, 0.996094f, 0.845703f, -1.9375f, -23.0625f, 12.5625f, 17, 26}, // 89
{0.912109f, 0.847656f, 0.943359f, 0.898438f, -1.0000f, -23.0625f, 13.0625f, 16, 26}, // 90
{0.757813f, 0.820313f, 0.781250f, 0.890625f, 0.3750f, -26.9375f, 10.7500f, 12, 36}, // 91
{0.601563f, 0.802734f, 0.630859f, 0.859375f, -2.0000f, -23.0625f, 9.1250f, 15, 29}, // 92
{0.685547f, 0.824219f, 0.708984f, 0.894531f, -1.3750f, -26.9375f, 10.7500f, 12, 36}, // 93
{0.064453f, 0.945313f, 0.091797f, 0.968750f, -1.1250f, -23.0625f, 11.4375f, 14, 12}, // 94
{0.363281f, 0.693359f, 0.394531f, 0.705078f, -2.0000f, 0.0625f, 11.6250f, 16, 6}, // 95
{0.373047f, 0.759766f, 0.398438f, 0.777344f, -0.5000f, -24.9375f, 11.9375f, 13, 9}, // 96
{0.878906f, 0.900391f, 0.912109f, 0.941406f, -1.0000f, -18.6875f, 14.4375f, 17, 21}, // 97
{0.000000f, 0.796875f, 0.033203f, 0.847656f, -0.5000f, -23.6875f, 15.3750f, 17, 26}, // 98
{0.421875f, 0.910156f, 0.451172f, 0.951172f, -0.7500f, -18.6875f, 12.3750f, 15, 21}, // 99
{0.070313f, 0.796875f, 0.103516f, 0.847656f, -0.7500f, -23.6875f, 15.3750f, 17, 26}, // 100
{0.914063f, 0.900391f, 0.947266f, 0.941406f, -0.7500f, -18.6875f, 14.5000f, 17, 21}, // 101
{0.097656f, 0.929688f, 0.119141f, 0.980469f, -0.5000f, -23.6875f, 8.1250f, 11, 26}, // 102
{0.873047f, 0.681641f, 0.906250f, 0.736328f, -0.7500f, -18.6875f, 15.3750f, 17, 28}, // 103
{0.035156f, 0.798828f, 0.068359f, 0.849609f, -0.5000f, -23.6875f, 15.6250f, 17, 26}, // 104
{0.179688f, 0.943359f, 0.195313f, 0.994141f, -0.4375f, -23.6875f, 6.1875f, 8, 26}, // 105
{0.138672f, 0.886719f, 0.160156f, 0.951172f, -3.3750f, -23.6875f, 6.6250f, 11, 33}, // 106
{0.945313f, 0.847656f, 0.976563f, 0.898438f, -0.5000f, -23.6875f, 13.6250f, 16, 26}, // 107
{0.568359f, 0.943359f, 0.583984f, 0.994141f, -0.5000f, -23.6875f, 6.0625f, 8, 26}, // 108
{0.343750f, 0.650391f, 0.392578f, 0.691406f, -0.5000f, -18.6875f, 23.1875f, 25, 21}, // 109
{0.949219f, 0.900391f, 0.982422f, 0.941406f, -0.5000f, -18.6875f, 15.6250f, 17, 21}, // 110
{0.101563f, 0.886719f, 0.136719f, 0.927734f, -0.7500f, -18.6875f, 15.5625f, 18, 21}, // 111
{0.291016f, 0.683594f, 0.324219f, 0.738281f, -0.5000f, -18.6875f, 15.3750f, 17, 28}, // 112
{0.195313f, 0.685547f, 0.228516f, 0.740234f, -0.7500f, -18.6875f, 15.3750f, 17, 28}, // 113
{0.626953f, 0.939453f, 0.650391f, 0.980469f, -0.6250f, -18.6875f, 9.6875f, 12, 21}, // 114
{0.753906f, 0.908203f, 0.785156f, 0.949219f, -1.1250f, -18.6875f, 13.6250f, 16, 21}, // 115
{0.787109f, 0.908203f, 0.810547f, 0.958984f, -0.6250f, -23.0625f, 8.9375f, 12, 26}, // 116
{0.062500f, 0.902344f, 0.095703f, 0.943359f, -0.6250f, -18.6875f, 15.5000f, 17, 21}, // 117
{0.492188f, 0.890625f, 0.527344f, 0.931641f, -1.7500f, -18.6875f, 14.3125f, 18, 21}, // 118
{0.929688f, 0.646484f, 0.980469f, 0.687500f, -1.6875f, -18.6875f, 22.4375f, 26, 21}, // 119
{0.529297f, 0.890625f, 0.564453f, 0.931641f, -1.7500f, -18.6875f, 13.8125f, 18, 21}, // 120
{0.750000f, 0.662109f, 0.785156f, 0.716797f, -1.7500f, -18.6875f, 14.0000f, 18, 28}, // 121
{0.453125f, 0.910156f, 0.482422f, 0.951172f, -1.0000f, -18.6875f, 12.7500f, 15, 21}, // 122
{0.400391f, 0.707031f, 0.425781f, 0.777344f, -0.6875f, -26.9375f, 10.9375f, 13, 36}, // 123
{0.982422f, 0.636719f, 0.996094f, 0.705078f, 0.6875f, -26.3125f, 7.9375f, 7, 35}, // 124
{0.167969f, 0.708984f, 0.193359f, 0.779297f, -1.3750f, -26.9375f, 10.9375f, 13, 36}, // 125
{0.843750f, 0.546875f, 0.875000f, 0.562500f, -0.5000f, -14.1875f, 14.7500f, 16, 8}, // 126
{0.097656f, 0.568359f, 0.146484f, 0.636719f, -0.5000f, -25.2500f, 23.1250f, 25, 35}, // 127
{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
};
@ -219,100 +219,100 @@ const AtlasFont font_UBUNTU48 = {
0.750000f, // distslope
{
{0.873047f, 0.101563f, 0.875000f, 0.103516f, -2.0000f, -2.0000f, 13.0000f, 1, 1}, // 32
{0.710938f, 0.824219f, 0.730469f, 0.908203f, 1.0000f, -40.7500f, 11.7500f, 10, 43}, // 33
{0.460938f, 0.429688f, 0.496094f, 0.464844f, 0.7500f, -40.6250f, 18.8750f, 18, 18}, // 34
{0.630859f, 0.244141f, 0.691406f, 0.328125f, -1.2500f, -40.6250f, 27.9375f, 31, 43}, // 35
{0.166016f, 0.460938f, 0.216797f, 0.544922f, -0.4375f, -40.6250f, 25.3750f, 26, 43}, // 36
{0.853516f, 0.201172f, 0.927734f, 0.287109f, 0.3125f, -41.1875f, 38.3750f, 38, 44}, // 37
{0.621094f, 0.330078f, 0.675781f, 0.414063f, 0.0000f, -40.6250f, 25.9375f, 28, 43}, // 38
{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.951172f, 0.373047f, 0.988281f, 0.494141f, 2.3750f, -47.6250f, 19.7500f, 19, 62}, // 40
{0.283203f, 0.375000f, 0.320313f, 0.496094f, -0.9375f, -47.6250f, 19.6875f, 19, 62}, // 41
{0.498047f, 0.623047f, 0.546875f, 0.669922f, -0.5625f, -40.6250f, 23.6250f, 25, 24}, // 42
{0.148438f, 0.617188f, 0.199219f, 0.667969f, 0.7500f, -32.0000f, 27.0000f, 26, 26}, // 43
{0.267578f, 0.703125f, 0.287109f, 0.740234f, 0.7500f, -7.4375f, 10.5625f, 10, 19}, // 44
{0.029297f, 0.947266f, 0.060547f, 0.962891f, -1.0000f, -21.5000f, 13.0625f, 16, 8}, // 45
{0.144531f, 0.761719f, 0.164063f, 0.781250f, 0.7500f, -7.3750f, 11.2500f, 10, 10}, // 46
{0.414063f, 0.429688f, 0.458984f, 0.525391f, -3.9375f, -40.6250f, 16.7500f, 23, 49}, // 47
{0.113281f, 0.332031f, 0.167969f, 0.416016f, 0.3125f, -40.6250f, 28.3750f, 28, 43}, // 48
{0.894531f, 0.289063f, 0.919922f, 0.373047f, -1.5625f, -40.6250f, 12.1250f, 13, 43}, // 49
{0.056641f, 0.408203f, 0.109375f, 0.492188f, 0.1250f, -40.6250f, 26.2500f, 27, 43}, // 50
{0.460938f, 0.466797f, 0.509766f, 0.550781f, -0.4375f, -40.6250f, 23.6875f, 25, 43}, // 51
{0.210938f, 0.289063f, 0.267578f, 0.373047f, -1.3125f, -40.6250f, 25.3125f, 29, 43}, // 52
{0.611328f, 0.416016f, 0.664063f, 0.500000f, 0.3125f, -40.6250f, 27.2500f, 27, 43}, // 53
{0.677734f, 0.337891f, 0.732422f, 0.421875f, 0.3125f, -40.6250f, 27.5000f, 28, 43}, // 54
{0.511719f, 0.466797f, 0.560547f, 0.550781f, -1.0625f, -40.6250f, 22.3125f, 25, 43}, // 55
{0.269531f, 0.289063f, 0.326172f, 0.373047f, 0.0625f, -40.6250f, 28.5625f, 29, 43}, // 56
{0.384766f, 0.343750f, 0.439453f, 0.427734f, 0.0625f, -40.6250f, 27.5625f, 28, 43}, // 57
{0.712891f, 0.910156f, 0.732422f, 0.966797f, 1.1250f, -26.6875f, 12.0625f, 10, 29}, // 58
{0.666016f, 0.843750f, 0.685547f, 0.917969f, 1.1250f, -26.6875f, 12.0625f, 10, 38}, // 59
{0.605469f, 0.587891f, 0.656250f, 0.646484f, 0.7500f, -34.0000f, 27.0000f, 26, 30}, // 60
{0.142578f, 0.669922f, 0.193359f, 0.707031f, 0.7500f, -28.4375f, 27.0000f, 26, 19}, // 61
{0.843750f, 0.593750f, 0.894531f, 0.652344f, 0.7500f, -34.0000f, 27.0000f, 26, 30}, // 62
{0.218750f, 0.460938f, 0.269531f, 0.544922f, -1.5625f, -40.6250f, 22.6250f, 26, 43}, // 63
{0.083984f, 0.238281f, 0.150391f, 0.318359f, 0.0625f, -34.2500f, 33.9375f, 34, 41}, // 64
{0.929688f, 0.287109f, 0.988281f, 0.371094f, -1.5625f, -40.6250f, 26.0000f, 30, 43}, // 65
{0.441406f, 0.343750f, 0.496094f, 0.427734f, 0.7500f, -40.6250f, 27.5000f, 28, 43}, // 66
{0.000000f, 0.482422f, 0.046875f, 0.566406f, 0.3125f, -40.6250f, 23.2500f, 24, 43}, // 67
{0.894531f, 0.373047f, 0.949219f, 0.457031f, 0.7500f, -40.6250f, 28.5000f, 28, 43}, // 68
{0.048828f, 0.494141f, 0.095703f, 0.578125f, 0.7500f, -40.6250f, 23.6250f, 24, 43}, // 69
{0.271484f, 0.498047f, 0.316406f, 0.582031f, 0.7500f, -40.6250f, 21.7500f, 23, 43}, // 70
{0.169922f, 0.375000f, 0.224609f, 0.458984f, 0.3125f, -40.6250f, 27.9375f, 28, 43}, // 71
{0.226563f, 0.375000f, 0.281250f, 0.458984f, 0.7500f, -40.6250f, 29.1250f, 28, 43}, // 72
{0.732422f, 0.824219f, 0.751953f, 0.908203f, 0.8750f, -40.6250f, 11.5000f, 10, 43}, // 73
{0.613281f, 0.501953f, 0.658203f, 0.585938f, -1.5000f, -40.6250f, 21.6250f, 23, 43}, // 74
{0.835938f, 0.375000f, 0.890625f, 0.458984f, 0.7500f, -40.6250f, 26.6250f, 28, 43}, // 75
{0.218750f, 0.546875f, 0.261719f, 0.630859f, 0.7500f, -40.6250f, 20.4375f, 22, 43}, // 76
{0.929688f, 0.201172f, 0.998047f, 0.285156f, 0.6875f, -40.6250f, 36.0625f, 35, 43}, // 77
{0.498047f, 0.380859f, 0.552734f, 0.464844f, 0.6250f, -40.6250f, 28.9375f, 28, 43}, // 78
{0.835938f, 0.289063f, 0.892578f, 0.373047f, 0.3125f, -40.6250f, 29.5625f, 29, 43}, // 79
{0.554688f, 0.380859f, 0.609375f, 0.464844f, 0.7500f, -40.6250f, 26.7500f, 28, 43}, // 80
{0.330078f, 0.218750f, 0.388672f, 0.312500f, 0.3125f, -40.6250f, 30.0000f, 30, 48}, // 81
{0.000000f, 0.396484f, 0.054688f, 0.480469f, 0.7500f, -40.6250f, 28.3750f, 28, 43}, // 82
{0.111328f, 0.417969f, 0.164063f, 0.501953f, -0.7500f, -40.6250f, 25.0000f, 27, 43}, // 83
{0.830078f, 0.460938f, 0.880859f, 0.544922f, -1.5625f, -40.6250f, 22.5000f, 26, 43}, // 84
{0.503906f, 0.294922f, 0.560547f, 0.378906f, 0.5000f, -40.6250f, 29.8750f, 29, 43}, // 85
{0.562500f, 0.294922f, 0.619141f, 0.378906f, -1.5625f, -40.6250f, 25.3750f, 29, 43}, // 86
{0.765625f, 0.189453f, 0.851563f, 0.273438f, -1.5625f, -40.6250f, 40.8125f, 44, 43}, // 87
{0.734375f, 0.398438f, 0.789063f, 0.482422f, -1.1875f, -40.6250f, 24.8750f, 28, 43}, // 88
{0.666016f, 0.423828f, 0.718750f, 0.507813f, -1.8125f, -40.6250f, 23.0625f, 27, 43}, // 89
{0.562500f, 0.466797f, 0.611328f, 0.550781f, -0.1875f, -40.6250f, 23.8750f, 25, 43}, // 90
{0.791016f, 0.398438f, 0.828125f, 0.519531f, 2.3750f, -47.6250f, 19.7500f, 19, 62}, // 91
{0.892578f, 0.458984f, 0.937500f, 0.554688f, -2.0000f, -40.6250f, 16.7500f, 23, 49}, // 92
{0.322266f, 0.402344f, 0.359375f, 0.523438f, -0.9375f, -47.6250f, 19.6875f, 19, 62}, // 93
{0.343750f, 0.583984f, 0.386719f, 0.619141f, -0.3750f, -40.6250f, 20.9375f, 22, 18}, // 94
{0.876953f, 0.943359f, 0.927734f, 0.958984f, -2.0000f, 1.7500f, 21.2500f, 26, 8}, // 95
{0.781250f, 0.521484f, 0.822266f, 0.546875f, 0.7500f, -43.9375f, 21.8750f, 21, 13}, // 96
{0.443359f, 0.552734f, 0.496094f, 0.621094f, -0.1875f, -32.5625f, 26.4375f, 27, 35}, // 97
{0.000000f, 0.308594f, 0.054688f, 0.394531f, 0.7500f, -41.6875f, 28.2500f, 28, 44}, // 98
{0.263672f, 0.583984f, 0.308594f, 0.652344f, 0.3125f, -32.5625f, 22.6875f, 23, 35}, // 99
{0.328125f, 0.314453f, 0.382813f, 0.400391f, 0.3125f, -41.6875f, 28.2500f, 28, 44}, // 100
{0.498047f, 0.552734f, 0.550781f, 0.621094f, 0.3125f, -32.5625f, 26.6250f, 27, 35}, // 101
{0.896484f, 0.593750f, 0.927734f, 0.679688f, 0.7500f, -41.6875f, 15.0000f, 16, 44}, // 102
{0.693359f, 0.244141f, 0.748047f, 0.335938f, 0.3125f, -32.5625f, 28.2500f, 28, 47}, // 103
{0.056641f, 0.320313f, 0.111328f, 0.406250f, 0.7500f, -41.6875f, 28.6250f, 28, 44}, // 104
{0.798828f, 0.767578f, 0.818359f, 0.853516f, 0.8750f, -41.7500f, 11.3750f, 10, 44}, // 105
{0.716797f, 0.554688f, 0.748047f, 0.664063f, -4.5625f, -41.7500f, 12.1250f, 16, 56}, // 106
{0.361328f, 0.429688f, 0.412109f, 0.515625f, 0.7500f, -41.6875f, 25.0000f, 26, 44}, // 107
{0.408203f, 0.779297f, 0.427734f, 0.865234f, 0.7500f, -41.6875f, 11.1250f, 10, 44}, // 108
{0.000000f, 0.238281f, 0.082031f, 0.306641f, 0.7500f, -32.5625f, 42.5625f, 42, 35}, // 109
{0.660156f, 0.509766f, 0.714844f, 0.578125f, 0.7500f, -32.5625f, 28.6250f, 28, 35}, // 110
{0.386719f, 0.527344f, 0.441406f, 0.595703f, 0.3125f, -32.5625f, 28.6250f, 28, 35}, // 111
{0.390625f, 0.250000f, 0.445313f, 0.341797f, 0.7500f, -32.5625f, 28.2500f, 28, 47}, // 112
{0.447266f, 0.250000f, 0.501953f, 0.341797f, 0.3125f, -32.5625f, 28.2500f, 28, 47}, // 113
{0.458984f, 0.623047f, 0.496094f, 0.691406f, 0.5000f, -32.5625f, 17.7500f, 19, 35}, // 114
{0.552734f, 0.552734f, 0.603516f, 0.621094f, -0.3750f, -32.5625f, 25.0000f, 26, 35}, // 115
{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.162109f, 0.546875f, 0.216797f, 0.615234f, 0.5000f, -32.5625f, 28.3750f, 28, 35}, // 117
{0.720703f, 0.484375f, 0.779297f, 0.552734f, -1.5000f, -32.5625f, 26.2500f, 30, 35}, // 118
{0.242188f, 0.218750f, 0.328125f, 0.287109f, -1.3750f, -32.5625f, 41.0625f, 44, 35}, // 119
{0.939453f, 0.496094f, 0.996094f, 0.564453f, -1.5625f, -32.5625f, 25.3750f, 29, 35}, // 120
{0.152344f, 0.238281f, 0.208984f, 0.330078f, -1.5000f, -32.5625f, 25.6250f, 29, 47}, // 121
{0.050781f, 0.580078f, 0.097656f, 0.648438f, -0.1875f, -32.5625f, 23.3750f, 24, 35}, // 122
{0.750000f, 0.275391f, 0.791016f, 0.396484f, 0.3125f, -47.6250f, 19.9375f, 21, 62}, // 123
{0.595703f, 0.648438f, 0.613281f, 0.765625f, 2.8750f, -46.5000f, 14.5000f, 9, 60}, // 124
{0.792969f, 0.275391f, 0.833984f, 0.396484f, -0.8750f, -47.6250f, 20.0625f, 21, 62}, // 125
{0.388672f, 0.597656f, 0.439453f, 0.619141f, 0.7500f, -24.3125f, 27.0000f, 26, 11}, // 126
{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
},
"UBUNTU48", // name
@ -322,28 +322,27 @@ const AtlasFont *ui_fonts[3] = {
&font_UBUNTUBOLD24,
&font_UBUNTU48,
};
const AtlasImage ui_images[24] = {
{0.518555f, 0.934570f, 0.547852f, 0.963867f, 16, 16, "SOLIDWHITE"},
{0.782227f, 0.547852f, 0.840820f, 0.606445f, 31, 31, "I_CROSS"},
{0.098633f, 0.504883f, 0.159180f, 0.565430f, 32, 32, "I_CIRCLE"},
{0.661133f, 0.581055f, 0.715820f, 0.635742f, 29, 29, "I_SQUARE"},
{0.319336f, 0.526367f, 0.383789f, 0.581055f, 34, 29, "I_TRIANGLE"},
{0.844727f, 0.567383f, 0.977539f, 0.590820f, 69, 13, "I_SELECT"},
{0.344727f, 0.624023f, 0.456055f, 0.647461f, 58, 13, "I_START"},
{0.567383f, 0.893555f, 0.590820f, 0.940430f, 13, 25, "I_ARROW"},
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.291992f, 0.655273f, 0.307617f, 0.682617f, 9, 15, "I_L"},
{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.311523f, 0.584961f, 0.340820f, 0.680664f, 16, 50, "I_BUTTON"},
{0.750977f, 0.555664f, 0.780273f, 0.653320f, 16, 51, "I_BUTTON_SELECTED"},
{0.502930f, 0.168945f, 0.563477f, 0.291992f, 32, 64, "I_ACTIVE_ITEM"},
{0.567383f, 0.168945f, 0.627930f, 0.291992f, 32, 64, "I_INACTIVE_ITEM"},
{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"},
@ -351,5 +350,5 @@ const AtlasImage ui_images[24] = {
const Atlas ui_atlas = {
"ui_atlas.zim",
ui_fonts, 3,
ui_images, 24,
ui_images, 23,
};

View File

@ -22,19 +22,18 @@
#define I_ROUND 9
#define I_STICK 10
#define I_SHOULDER 11
#define I_RECT 12
#define I_STICKBG 13
#define I_BG 14
#define I_L 15
#define I_R 16
#define I_BUTTON 17
#define I_BUTTON_SELECTED 18
#define I_ACTIVE_ITEM 19
#define I_INACTIVE_ITEM 20
#define I_ICON_UMD 21
#define I_ICON_FOLDER 22
#define I_ICON_EXE 23
#define I_CHECKEDBOX 12
#define I_RECT 13
#define I_STICKBG 14
#define I_BG 15
#define I_L 16
#define I_R 17
#define I_BUTTON 18
#define I_BUTTON_SELECTED 19
#define I_ICON_UMD 20
#define I_ICON_FOLDER 21
#define I_ICON_EXE 22
extern const Atlas ui_atlas;
extern const AtlasImage ui_images[24];
extern const AtlasImage ui_images[23];

Binary file not shown.

After

Width:  |  Height:  |  Size: 501 B

View File

@ -15,4 +15,4 @@ public class PpssppActivity extends NativeActivity {
{
return false;
}
}
}