Hurlu/forkkmuopengl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Hugo Willaume 2019-06-14 16:23:12 +09:00
commit 03be372af2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BaseGLProject/Models/Mesh.cpp
View File

@ -361,7 +361,7 @@ void Mesh::draw(SceneContext &ctx) {
shader.addUniform("mvp", ctx.mvpMatrix); shader.addUniform("mvp", ctx.mvpMatrix);
shader.addUniform("NormalMatrix", ctx.normalMatrix); shader.addUniform("NormalMatrix", ctx.normalMatrix);
shader.addUniform("ModelMatrix", ctx.modelMatrix); shader.addUniform("ModelMatrix", ctx.modelMatrix);
glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, textures["0"].tex_ref); glBindTexture(GL_TEXTURE_2D, textures["0"].tex_ref);