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/model.h
View File

@@ -157,6 +157,9 @@ private:
// 3. Normal maps
std::vector<Texture> normalMaps = this->loadMaterialTextures(material, aiTextureType_HEIGHT, "texture_normal");
textures.insert(textures.end(), normalMaps.begin(), normalMaps.end());
// 4. Height maps
std::vector<Texture> heightMaps = this->loadMaterialTextures(material, aiTextureType_AMBIENT, "texture_height");
textures.insert(textures.end(), heightMaps.begin(), heightMaps.end());
}
// Return a mesh object created from the extracted mesh data