lenn/LearnOpenGL
1
0
Fork 0
mirror of https://github.com/JoeyDeVries/LearnOpenGL.git synced 2026-01-02 04:37:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added Parallax Mapping code/resources

Browse Source 
Added code samples and necessary texture resources for upcoming Parallax
Mapping tutorial
This commit is contained in:
Joey de Vries
2015-06-04 19:59:04 +02:00
parent 2a0a415c8f
commit c4c3221de9
12 changed files with 309 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
includes/learnopengl/mesh.h
View File

@@ -58,6 +58,7 @@ public:
GLuint diffuseNr = 1;
GLuint specularNr = 1;
GLuint normalNr = 1;
GLuint heightNr = 1;
for(GLuint i = 0; i < this->textures.size(); i++)
{
glActiveTexture(GL_TEXTURE0 + i); // Active proper texture unit before binding
@@ -71,6 +72,8 @@ public:
ss << specularNr++; // Transfer GLuint to stream
else if(name == "texture_normal")
ss << normalNr++; // Transfer GLuint to stream
else if(name == "texture_height")
ss << heightNr++; // Transfer GLuint to stream
number = ss.str();
// Now set the sampler to the correct texture unit
glUniform1i(glGetUniformLocation(shader.Program, (name + number).c_str()), i);