josh/jes-ruby
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GL.draw_text: use baseline_offset when rendering text

Browse Source
This commit is contained in:
Josh Holtrop 2014-08-07 21:05:40 -04:00
parent 807e61dc8a
commit 8a7c3d8112
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/GL.cc
View File

@ -48,6 +48,7 @@ static VALUE GL_draw_text(VALUE klass,
VALUE r, VALUE g, VALUE b, VALUE a) VALUE r, VALUE g, VALUE b, VALUE a)
{ {
int x_int = FIX2INT(x); int x_int = FIX2INT(x);
int y_int = FIX2INT(y) + FIX2INT(rb_iv_get(font, "@baseline_offset"));
glUseProgram(programs[PROGRAM_TEXT]->id); glUseProgram(programs[PROGRAM_TEXT]->id);
glUniform1i(programs[PROGRAM_TEXT]->uniforms[UNIFORM_TEXTURE], 0); glUniform1i(programs[PROGRAM_TEXT]->uniforms[UNIFORM_TEXTURE], 0);
glUniform4f(programs[PROGRAM_TEXT]->uniforms[UNIFORM_COLOR], glUniform4f(programs[PROGRAM_TEXT]->uniforms[UNIFORM_COLOR],
@ -61,7 +62,7 @@ static VALUE GL_draw_text(VALUE klass,
int advance = FIX2INT(rb_iv_get(font, "@advance")); int advance = FIX2INT(rb_iv_get(font, "@advance"));
for (int i = 0; i < length; i++) for (int i = 0; i < length; i++)
{ {
glUniform2i(programs[PROGRAM_TEXT]->uniforms[UNIFORM_POSITION], x_int, FIX2INT(y)); glUniform2i(programs[PROGRAM_TEXT]->uniforms[UNIFORM_POSITION], x_int, y_int);
Font_RenderGlyph(font, string_ptr[i]); Font_RenderGlyph(font, string_ptr[i]);
x_int += advance; x_int += advance;
} }