Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 18:23:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #4251 from jherico/master

Browse source 
Fixing bug in text renderer causing glyphs to float at different depths
This commit is contained in:
Brad Hefta-Gaub 2015-02-09 12:24:47 -08:00
commit 967b04af1a
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/render-utils/src/TextRenderer.cpp
View file

@ -345,7 +345,7 @@ void Font::setupGL() {
int posLoc = _program->attributeLocation("Position");
int texLoc = _program->attributeLocation("TexCoord");
glEnableVertexAttribArray(posLoc);
glVertexAttribPointer(posLoc, 3, GL_FLOAT, false, stride, nullptr);
glVertexAttribPointer(posLoc, 2, GL_FLOAT, false, stride, nullptr);
glEnableVertexAttribArray(texLoc);
glVertexAttribPointer(texLoc, 2, GL_FLOAT, false, stride, offset);
_vao->release();

4
libraries/render-utils/src/sdf_text.slv
View file

@ -13,12 +13,12 @@
uniform mat4 Projection;
uniform mat4 ModelView;
attribute vec3 Position;
attribute vec2 Position;
attribute vec2 TexCoord;
varying vec2 vTexCoord;
void main() {
vTexCoord = TexCoord;
gl_Position = Projection * ModelView * vec4(Position, 1.0);
gl_Position = Projection * ModelView * vec4(Position, 0.0, 1.0);
}