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 #28 from fluffyfreak/fix-instance-texturing

Browse Source 
Fix texture mapping in asteroid instancing example.
This commit is contained in:
Joey de Vries
2016-03-30 16:47:06 +02:00
parent d7ed65ff5d 7ee4d9b56a
commit f3b4c15984
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/4.advanced_opengl/10.instancing/instancing_asteroids_instanced.cpp
View File

@@ -173,6 +173,9 @@ int main()
// Draw meteorites // Draw meteorites
instanceShader.Use(); instanceShader.Use();
// NB: This could all be implemented as a method within the Model class, perhaps "DrawInstanced(const GLuint amount)"
glActiveTexture(GL_TEXTURE0); // Activate proper texture unit before binding
glUniform1i(glGetUniformLocation(instanceShader.Program, "texture_diffuse1"), 0); // Now set the sampler to the correct texture unit
glBindTexture(GL_TEXTURE_2D, rock.textures_loaded[0].id); // Note we also made the textures_loaded vector public (instead of private) from the model class. glBindTexture(GL_TEXTURE_2D, rock.textures_loaded[0].id); // Note we also made the textures_loaded vector public (instead of private) from the model class.
for(GLuint i = 0; i < rock.meshes.size(); i++) for(GLuint i = 0; i < rock.meshes.size(); i++)
{ {
@@ -180,6 +183,9 @@ int main()
glDrawElementsInstanced(GL_TRIANGLES, rock.meshes[i].vertices.size(), GL_UNSIGNED_INT, 0, amount); glDrawElementsInstanced(GL_TRIANGLES, rock.meshes[i].vertices.size(), GL_UNSIGNED_INT, 0, amount);
glBindVertexArray(0); glBindVertexArray(0);
} }
// reset our texture binding
glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, 0);
// Swap the buffers // Swap the buffers
glfwSwapBuffers(window); glfwSwapBuffers(window);