diff --git a/src/graphics/font.c b/src/graphics/font.c index aaf41917..d8b43494 100644 --- a/src/graphics/font.c +++ b/src/graphics/font.c @@ -72,7 +72,7 @@ Rasterizer* lovrFontGetRasterizer(Font* font) { return font->rasterizer; } -void lovrFontRender(Font* font, const char* str, float wrap, HorizontalAlign halign, VerticalAlign valign, VertexPointer vertices, float* offsety, uint32_t* vertexCount) { +void lovrFontRender(Font* font, const char* str, float wrap, HorizontalAlign halign, VerticalAlign valign, float* vertices, float* offsety, uint32_t* vertexCount) { FontAtlas* atlas = &font->atlas; float cx = 0; @@ -88,8 +88,8 @@ void lovrFontRender(Font* font, const char* str, float wrap, HorizontalAlign hal unsigned int codepoint; size_t bytes; - float* cursor = vertices.floats; - float* lineStart = vertices.floats; + float* cursor = vertices; + float* lineStart = vertices; int lineCount = 1; *vertexCount = 0; diff --git a/src/graphics/font.h b/src/graphics/font.h index bd9abeae..c9f5220a 100644 --- a/src/graphics/font.h +++ b/src/graphics/font.h @@ -1,5 +1,4 @@ #include "data/rasterizer.h" -#include "data/vertexData.h" #include "util.h" #include "graphics/texture.h" #include "lib/map/map.h" @@ -42,7 +41,7 @@ typedef struct { Font* lovrFontCreate(Rasterizer* rasterizer); void lovrFontDestroy(void* ref); Rasterizer* lovrFontGetRasterizer(Font* font); -void lovrFontRender(Font* font, const char* str, float wrap, HorizontalAlign halign, VerticalAlign valign, VertexPointer vertices, float* offsety, uint32_t* vertexCount); +void lovrFontRender(Font* font, const char* str, float wrap, HorizontalAlign halign, VerticalAlign valign, float* vertices, float* offsety, uint32_t* vertexCount); float lovrFontGetWidth(Font* font, const char* string, float wrap); float lovrFontGetHeight(Font* font); float lovrFontGetAscent(Font* font); diff --git a/src/graphics/graphics.c b/src/graphics/graphics.c index 84c9860a..4cfe6b64 100644 --- a/src/graphics/graphics.c +++ b/src/graphics/graphics.c @@ -825,7 +825,7 @@ void lovrGraphicsPrint(const char* str, mat4 transform, float wrap, HorizontalAl uint32_t vertexCount; uint32_t maxVertices = strlen(str) * 6; VertexPointer vertexPointer = lovrGraphicsGetVertexPointer(maxVertices); - lovrFontRender(font, str, wrap, halign, valign, vertexPointer, &offsety, &vertexCount); + lovrFontRender(font, str, wrap, halign, valign, vertexPointer.floats, &offsety, &vertexCount); lovrMeshWriteIndices(state.defaultMesh, 0, 0); lovrGraphicsPush();