Skip to content
This repository has been archived by the owner on Dec 2, 2019. It is now read-only.

Commit

Permalink
Fixed blurry font for examples
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
vurtun committed Apr 20, 2016
1 parent 7ccd95f commit ca4d5ba
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions example/calculator.c
Expand Up @@ -311,8 +311,8 @@ int main(int argc, char *argv[])
const char *font_path = (argc > 1) ? argv[1]: 0;
nk_font_atlas_init_default(&atlas);
nk_font_atlas_begin(&atlas);
if (font_path) font = nk_font_atlas_add_from_file(&atlas, font_path, 14.0f, NULL);
else font = nk_font_atlas_add_default(&atlas, 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, 13.0f, NULL);
image = nk_font_atlas_bake(&atlas, &w, &h, NK_FONT_ATLAS_RGBA32);
device_upload_atlas(&device, image, w, h);
nk_font_atlas_end(&atlas, nk_handle_id((int)device.font_tex), &device.null);}
Expand Down
6 changes: 3 additions & 3 deletions example/file_browser.c
Expand Up @@ -402,7 +402,7 @@ file_browser_run(struct file_browser *browser, struct nk_context *ctx)
struct nk_rect total_space;

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;
static float ratio[] = {0.25f, NK_UNDEFINED};
Expand Down Expand Up @@ -808,8 +808,8 @@ int main(int argc, char *argv[])
const char *font_path = (argc > 1) ? argv[1]: 0;
nk_font_atlas_init_default(&atlas);
nk_font_atlas_begin(&atlas);
if (font_path) font = nk_font_atlas_add_from_file(&atlas, font_path, 14.0f, NULL);
else font = nk_font_atlas_add_default(&atlas, 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, 13.0f, NULL);
image = nk_font_atlas_bake(&atlas, &w, &h, NK_FONT_ATLAS_RGBA32);
device_upload_atlas(&device, image, w, h);
nk_font_atlas_end(&atlas, nk_handle_id((int)device.font_tex), &device.null);}
Expand Down
4 changes: 2 additions & 2 deletions example/node_editor.c
Expand Up @@ -656,8 +656,8 @@ int main(int argc, char *argv[])
const char *font_path = (argc > 1) ? argv[1]: 0;
nk_font_atlas_init_default(&atlas);
nk_font_atlas_begin(&atlas);
if (font_path) font = nk_font_atlas_add_from_file(&atlas, font_path, 14.0f, NULL);
else font = nk_font_atlas_add_default(&atlas, 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, 13.0f, NULL);
image = nk_font_atlas_bake(&atlas, &w, &h, NK_FONT_ATLAS_RGBA32);
device_upload_atlas(&device, image, w, h);
nk_font_atlas_end(&atlas, nk_handle_id((int)device.font_tex), &device.null);}
Expand Down
4 changes: 2 additions & 2 deletions example/overview.c
Expand Up @@ -1407,8 +1407,8 @@ int main(int argc, char *argv[])
const char *font_path = (argc > 1) ? argv[1]: 0;
nk_font_atlas_init_default(&atlas);
nk_font_atlas_begin(&atlas);
if (font_path) font = nk_font_atlas_add_from_file(&atlas, font_path, 14.0f, NULL);
else font = nk_font_atlas_add_default(&atlas, 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, 13.0f, NULL);
image = nk_font_atlas_bake(&atlas, &w, &h, NK_FONT_ATLAS_RGBA32);
device_upload_atlas(&device, image, w, h);
nk_font_atlas_end(&atlas, nk_handle_id((int)device.font_tex), &device.null);}
Expand Down

0 comments on commit ca4d5ba

Please sign in to comment.