doylet/Dengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed rounding in glyphs per row overestimating

Browse Source
This commit is contained in:
Doyle Thai 2016-07-07 22:44:22 +10:00
parent 13a2152bf6
commit a04c43681d
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/AssetManager.c
View File

@ -9,7 +9,7 @@
#include "Dengine/Platform.h" #include "Dengine/Platform.h"
#include "Dengine/AssetManager.h" #include "Dengine/AssetManager.h"
//#define WT_RENDER_FONT_FILE #define WT_RENDER_FONT_FILE
#ifdef WT_RENDER_FONT_FILE #ifdef WT_RENDER_FONT_FILE
#define STB_IMAGE_WRITE_IMPLEMENTATION #define STB_IMAGE_WRITE_IMPLEMENTATION
#include <STB/stb_image_write.h> #include <STB/stb_image_write.h>
@ -136,7 +136,7 @@ const i32 asset_loadTTFont(AssetManager *assetManager, const char *filePath)
CAST(GlyphBitmap *) calloc(numGlyphs, sizeof(GlyphBitmap)); CAST(GlyphBitmap *) calloc(numGlyphs, sizeof(GlyphBitmap));
v2i largestGlyphDimension = V2i(0, 0); v2i largestGlyphDimension = V2i(0, 0);
const f32 targetFontHeight = 64.0f; const f32 targetFontHeight = 32.0f;
f32 scaleY = stbtt_ScaleForPixelHeight(&fontInfo, targetFontHeight); f32 scaleY = stbtt_ScaleForPixelHeight(&fontInfo, targetFontHeight);
i32 ascent, descent, lineGap; i32 ascent, descent, lineGap;
@ -218,22 +218,14 @@ const i32 asset_loadTTFont(AssetManager *assetManager, const char *filePath)
/* /*
* NOTE(doyle): Use rasterised TTF bitmap-characters combine them all into * NOTE(doyle): Use rasterised TTF bitmap-characters combine them all into
* one bitmap as an atlas. We determine how many glyphs we can fit per row * one bitmap as an atlas. We determine how many glyphs we can fit per row
* by determining the largest glyph size we have. Rounding it to the nearest * by determining the largest glyph size we have.
* multiple of 2 and dividing by our target texture size.
* *
* For the amount of glyphs we fit per row, we iterate through them and * For the amount of glyphs we fit per row, we iterate through them and
* write each row of the glyph adjacent to the next until we finish writing * write each row of the glyph adjacent to the next until we finish writing
* all pixels for the glyphs, then move onto the next set of glyphs. * all pixels for the glyphs, then move onto the next set of glyphs.
*/ */
if ((largestGlyphDimension.w & 1) == 1)
largestGlyphDimension.w += 1;
if ((largestGlyphDimension.h & 1) == 1)
largestGlyphDimension.h += 1;
font->maxSize = largestGlyphDimension; font->maxSize = largestGlyphDimension;
i32 glyphsPerRow = (MAX_TEXTURE_SIZE / font->maxSize.w);
i32 glyphsPerRow = (MAX_TEXTURE_SIZE / font->maxSize.w) + 1;
#ifdef WT_DEBUG #ifdef WT_DEBUG
i32 glyphsPerCol = MAX_TEXTURE_SIZE / font->maxSize.h; i32 glyphsPerCol = MAX_TEXTURE_SIZE / font->maxSize.h;

2
src/WorldTraveller.c
View File

@ -39,7 +39,7 @@ void worldTraveller_gameInit(GameState *state, v2i windowSize)
asset_loadShaderFiles(assetManager, "data/shaders/sprite.vert.glsl", asset_loadShaderFiles(assetManager, "data/shaders/sprite.vert.glsl",
"data/shaders/sprite.frag.glsl", shaderlist_sprite); "data/shaders/sprite.frag.glsl", shaderlist_sprite);
asset_loadTTFont(assetManager, "C:/Windows/Fonts/Arial.ttf"); asset_loadTTFont(assetManager, "C:/Windows/Fonts/Arialbd.ttf");
glCheckError(); glCheckError();
state->state = state_active; state->state = state_active;