lenn/LearnOpenGL
1
0
Fork 0
mirror of https://github.com/JoeyDeVries/LearnOpenGL.git synced 2026-01-30 20:13:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #191 from ButchDean/master

Browse Source 
Fixed compile warning.
This commit is contained in:
Joey de Vries
2020-08-16 13:21:03 +02:00
committed by GitHub
parent 9ee05dda15 6ccb76e4c8
commit a25bb571c8
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/7.in_practice/2.text_rendering/text_rendering.cpp
View File

@@ -145,7 +145,7 @@ int main()
texture, texture,
glm::ivec2(face->glyph->bitmap.width, face->glyph->bitmap.rows), glm::ivec2(face->glyph->bitmap.width, face->glyph->bitmap.rows),
glm::ivec2(face->glyph->bitmap_left, face->glyph->bitmap_top), glm::ivec2(face->glyph->bitmap_left, face->glyph->bitmap_top),
face->glyph->advance.x static_cast<unsigned int>(face->glyph->advance.x)
}; };
Characters.insert(std::pair<char, Character>(c, character)); Characters.insert(std::pair<char, Character>(c, character));
} }
@@ -258,4 +258,3 @@ void RenderText(Shader &shader, std::string text, float x, float y, float scale,
glBindVertexArray(0); glBindVertexArray(0);
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
} }