mirror of https://github.com/bjornbytes/lovr.git
lovrFontRender uses raw float* instead of VertexPointer;
This commit is contained in:
parent
a8361677f5
commit
b586bc2cce
|
@ -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;
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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();
|
||||
|
|
Loading…
Reference in New Issue