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

fix texture1 uniform name & two shader variables

Browse Source
This commit is contained in:
Charles Zhang
2017-06-29 18:37:08 +08:00
parent 905be9ce52
commit e7382fdfb0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/4.advanced_opengl/2.stencil_testing/stencil_testing.cpp
View File

@@ -170,7 +170,7 @@ int main()
// shader configuration // shader configuration
// -------------------- // --------------------
shader.use(); shader.use();
shader.setInt("ourTexture", 0); shader.setInt("texture1", 0);
// render loop // render loop
// ----------- // -----------
@@ -243,12 +243,12 @@ int main()
model = glm::mat4(); model = glm::mat4();
model = glm::translate(model, glm::vec3(-1.0f, 0.0f, -1.0f)); model = glm::translate(model, glm::vec3(-1.0f, 0.0f, -1.0f));
model = glm::scale(model, glm::vec3(scale, scale, scale)); model = glm::scale(model, glm::vec3(scale, scale, scale));
shader.setMat4("model", model); shaderSingleColor.setMat4("model", model);
glDrawArrays(GL_TRIANGLES, 0, 36); glDrawArrays(GL_TRIANGLES, 0, 36);
model = glm::mat4(); model = glm::mat4();
model = glm::translate(model, glm::vec3(2.0f, 0.0f, 0.0f)); model = glm::translate(model, glm::vec3(2.0f, 0.0f, 0.0f));
model = glm::scale(model, glm::vec3(scale, scale, scale)); model = glm::scale(model, glm::vec3(scale, scale, scale));
shader.setMat4("model", model); shaderSingleColor.setMat4("model", model);
glDrawArrays(GL_TRIANGLES, 0, 36); glDrawArrays(GL_TRIANGLES, 0, 36);
glBindVertexArray(0); glBindVertexArray(0);
glStencilMask(0xFF); glStencilMask(0xFF);