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

lovrFontRender uses raw float* instead of VertexPointer;

This commit is contained in:
bjorn 2018-12-05 10:23:26 -08:00
parent a8361677f5
commit b586bc2cce
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/graphics/font.c
View File

@ -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;

3
src/graphics/font.h
View File

@ -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);

2
src/graphics/graphics.c
View File

@ -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();