lpnf
/
lovr
mirror of https://github.com/bjornbytes/lovr.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Font filtering now respects the default setting.

This commit is contained in:
murat g 2022-02-26 19:18:51 -08:00 committed by Bjorn
parent ea1bc6c5c4
commit ee3ba6ef3e
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/l_graphics.c
View File

@ -1247,8 +1247,8 @@ static int l_lovrGraphicsNewFont(lua_State* L) {
padding = luaL_optinteger(L, 2, padding);
spread = luaL_optnumber(L, 3, spread);
}
Font* font = lovrFontCreate(rasterizer, padding, spread);
TextureFilter defaultFilter = lovrGraphicsGetDefaultFilter();
Font* font = lovrFontCreate(rasterizer, padding, spread, defaultFilter.mode);
luax_pushtype(L, Font, font);
lovrRelease(rasterizer, lovrRasterizerDestroy);
lovrRelease(font, lovrFontDestroy);

6
src/modules/graphics/font.c
View File

@ -27,6 +27,7 @@ struct Font {
uint32_t padding;
float lineHeight;
float pixelDensity;
FilterMode filterMode;
bool flip;
};
@ -49,7 +50,7 @@ static void lovrFontAddGlyph(Font* font, Glyph* glyph);
static void lovrFontExpandTexture(Font* font);
static void lovrFontCreateTexture(Font* font);
Font* lovrFontCreate(Rasterizer* rasterizer, uint32_t padding, double spread) {
Font* lovrFontCreate(Rasterizer* rasterizer, uint32_t padding, double spread, FilterMode filterMode) {
Font* font = calloc(1, sizeof(Font));
lovrAssert(font, "Out of memory");
font->ref = 1;
@ -60,6 +61,7 @@ Font* lovrFontCreate(Rasterizer* rasterizer, uint32_t padding, double spread) {
font->spread = spread;
font->lineHeight = 1.f;
font->pixelDensity = (float) lovrRasterizerGetHeight(rasterizer);
font->filterMode = filterMode;
map_init(&font->kerning, 0);
// Atlas
@ -354,7 +356,7 @@ static void lovrFontCreateTexture(Font* font) {
lovrRelease(font->texture, lovrTextureDestroy);
Image* image = lovrImageCreate(font->atlas.width, font->atlas.height, NULL, 0x0, FORMAT_RGBA16F);
font->texture = lovrTextureCreate(TEXTURE_2D, &image, 1, false, false, 0);
lovrTextureSetFilter(font->texture, (TextureFilter) { .mode = FILTER_BILINEAR });
lovrTextureSetFilter(font->texture, (TextureFilter) { .mode = font->filterMode });
lovrTextureSetWrap(font->texture, (TextureWrap) { .s = WRAP_CLAMP, .t = WRAP_CLAMP });
lovrRelease(image, lovrImageDestroy);
}

3
src/modules/graphics/font.h
View File

@ -1,6 +1,7 @@
#include <stdbool.h>
#include <stdint.h>
#include <stddef.h>
#include "data/modelData.h"
#pragma once
@ -20,7 +21,7 @@ typedef enum {
} VerticalAlign;
typedef struct Font Font;
Font* lovrFontCreate(struct Rasterizer* rasterizer, uint32_t padding, double spread);
Font* lovrFontCreate(struct Rasterizer* rasterizer, uint32_t padding, double spread, FilterMode filterMode);
void lovrFontDestroy(void* ref);
struct Rasterizer* lovrFontGetRasterizer(Font* font);
struct Texture* lovrFontGetTexture(Font* font);

2
src/modules/graphics/graphics.c
View File

@ -483,7 +483,7 @@ Font* lovrGraphicsGetFont() {
if (!state.font) {
if (!state.defaultFont) {
Rasterizer* rasterizer = lovrRasterizerCreate(NULL, 32);
state.defaultFont = lovrFontCreate(rasterizer, 1, 3.);
state.defaultFont = lovrFontCreate(rasterizer, 1, 3., state.defaultFilter.mode);
lovrRelease(rasterizer, lovrRasterizerDestroy);
}