mirrors/Nuklear
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed blurry font for examples

Browse Source 
Oversampling for the default font is tweaked for the default font
with height 13. I set the wrong height for all examples which should
now be fixed.
This commit is contained in:
vurtun 2016-04-20 19:53:26 +02:00
parent 7ccd95f2f1
commit ca4d5bad8c
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
example/calculator.c
View File

@ -311,8 +311,8 @@ int main(int argc, char *argv[])
const char *font_path = (argc > 1) ? argv[1]: 0; const char *font_path = (argc > 1) ? argv[1]: 0;
nk_font_atlas_init_default(&atlas); nk_font_atlas_init_default(&atlas);
nk_font_atlas_begin(&atlas); nk_font_atlas_begin(&atlas);
if (font_path) font = nk_font_atlas_add_from_file(&atlas, font_path, 14.0f, NULL); if (font_path) font = nk_font_atlas_add_from_file(&atlas, font_path, 13.0f, NULL);
else font = nk_font_atlas_add_default(&atlas, 14.0f, NULL); else font = nk_font_atlas_add_default(&atlas, 13.0f, NULL);
image = nk_font_atlas_bake(&atlas, &w, &h, NK_FONT_ATLAS_RGBA32); image = nk_font_atlas_bake(&atlas, &w, &h, NK_FONT_ATLAS_RGBA32);
device_upload_atlas(&device, image, w, h); device_upload_atlas(&device, image, w, h);
nk_font_atlas_end(&atlas, nk_handle_id((int)device.font_tex), &device.null);} nk_font_atlas_end(&atlas, nk_handle_id((int)device.font_tex), &device.null);}

6
example/file_browser.c
View File

@ -402,7 +402,7 @@ file_browser_run(struct file_browser *browser, struct nk_context *ctx)
struct nk_rect total_space; struct nk_rect total_space;
if (nk_begin(ctx, &layout, "File Browser", nk_rect(50, 50, 800, 600), if (nk_begin(ctx, &layout, "File Browser", nk_rect(50, 50, 800, 600),
NK_WINDOW_BORDER|NK_WINDOW_NO_SCROLLBAR|NK_WINDOW_CLOSABLE|NK_WINDOW_MOVABLE)) NK_WINDOW_BORDER|NK_WINDOW_NO_SCROLLBAR|NK_WINDOW_MOVABLE))
{ {
struct nk_panel sub; struct nk_panel sub;
static float ratio[] = {0.25f, NK_UNDEFINED}; static float ratio[] = {0.25f, NK_UNDEFINED};
@ -808,8 +808,8 @@ int main(int argc, char *argv[])
const char *font_path = (argc > 1) ? argv[1]: 0; const char *font_path = (argc > 1) ? argv[1]: 0;
nk_font_atlas_init_default(&atlas); nk_font_atlas_init_default(&atlas);
nk_font_atlas_begin(&atlas); nk_font_atlas_begin(&atlas);
if (font_path) font = nk_font_atlas_add_from_file(&atlas, font_path, 14.0f, NULL); if (font_path) font = nk_font_atlas_add_from_file(&atlas, font_path, 13.0f, NULL);
else font = nk_font_atlas_add_default(&atlas, 14.0f, NULL); else font = nk_font_atlas_add_default(&atlas, 13.0f, NULL);
image = nk_font_atlas_bake(&atlas, &w, &h, NK_FONT_ATLAS_RGBA32); image = nk_font_atlas_bake(&atlas, &w, &h, NK_FONT_ATLAS_RGBA32);
device_upload_atlas(&device, image, w, h); device_upload_atlas(&device, image, w, h);
nk_font_atlas_end(&atlas, nk_handle_id((int)device.font_tex), &device.null);} nk_font_atlas_end(&atlas, nk_handle_id((int)device.font_tex), &device.null);}

4
example/node_editor.c
View File

@ -656,8 +656,8 @@ int main(int argc, char *argv[])
const char *font_path = (argc > 1) ? argv[1]: 0; const char *font_path = (argc > 1) ? argv[1]: 0;
nk_font_atlas_init_default(&atlas); nk_font_atlas_init_default(&atlas);
nk_font_atlas_begin(&atlas); nk_font_atlas_begin(&atlas);
if (font_path) font = nk_font_atlas_add_from_file(&atlas, font_path, 14.0f, NULL); if (font_path) font = nk_font_atlas_add_from_file(&atlas, font_path, 13.0f, NULL);
else font = nk_font_atlas_add_default(&atlas, 14.0f, NULL); else font = nk_font_atlas_add_default(&atlas, 13.0f, NULL);
image = nk_font_atlas_bake(&atlas, &w, &h, NK_FONT_ATLAS_RGBA32); image = nk_font_atlas_bake(&atlas, &w, &h, NK_FONT_ATLAS_RGBA32);
device_upload_atlas(&device, image, w, h); device_upload_atlas(&device, image, w, h);
nk_font_atlas_end(&atlas, nk_handle_id((int)device.font_tex), &device.null);} nk_font_atlas_end(&atlas, nk_handle_id((int)device.font_tex), &device.null);}

4
example/overview.c
View File

@ -1407,8 +1407,8 @@ int main(int argc, char *argv[])
const char *font_path = (argc > 1) ? argv[1]: 0; const char *font_path = (argc > 1) ? argv[1]: 0;
nk_font_atlas_init_default(&atlas); nk_font_atlas_init_default(&atlas);
nk_font_atlas_begin(&atlas); nk_font_atlas_begin(&atlas);
if (font_path) font = nk_font_atlas_add_from_file(&atlas, font_path, 14.0f, NULL); if (font_path) font = nk_font_atlas_add_from_file(&atlas, font_path, 13.0f, NULL);
else font = nk_font_atlas_add_default(&atlas, 14.0f, NULL); else font = nk_font_atlas_add_default(&atlas, 13.0f, NULL);
image = nk_font_atlas_bake(&atlas, &w, &h, NK_FONT_ATLAS_RGBA32); image = nk_font_atlas_bake(&atlas, &w, &h, NK_FONT_ATLAS_RGBA32);
device_upload_atlas(&device, image, w, h); device_upload_atlas(&device, image, w, h);
nk_font_atlas_end(&atlas, nk_handle_id((int)device.font_tex), &device.null);} nk_font_atlas_end(&atlas, nk_handle_id((int)device.font_tex), &device.null);}