BTH/squidout
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed a bug where models normal and specular maps is not loaded.

Browse Source
This commit is contained in:
tleety
2015-09-17 14:37:00 +02:00
parent bc5a5e5e92
commit 692e0ca9df
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Core/Renderer.cpp
+3 -4
View File
@@ -323,7 +323,7 @@ void dd::Renderer::DrawScene(RenderQueue &objects, ShaderProgram &program)
glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, modelJob->DiffuseTexture); glBindTexture(GL_TEXTURE_2D, modelJob->DiffuseTexture);
if (modelJob->NormalTexture != 0 && false) { if (modelJob->NormalTexture != 0) {
glActiveTexture(GL_TEXTURE1); glActiveTexture(GL_TEXTURE1);
glBindTexture(GL_TEXTURE_2D, modelJob->NormalTexture); glBindTexture(GL_TEXTURE_2D, modelJob->NormalTexture);
} else { } else {
@@ -331,11 +331,10 @@ void dd::Renderer::DrawScene(RenderQueue &objects, ShaderProgram &program)
glBindTexture(GL_TEXTURE_2D, *m_StandardNormal); glBindTexture(GL_TEXTURE_2D, *m_StandardNormal);
} }
if (modelJob->SpecularTexture != 0 && false) { if (modelJob->SpecularTexture != 0) {
glActiveTexture(GL_TEXTURE2); glActiveTexture(GL_TEXTURE2);
glBindTexture(GL_TEXTURE_2D, modelJob->SpecularTexture); glBindTexture(GL_TEXTURE_2D, modelJob->SpecularTexture);
} } else {
else {
glActiveTexture(GL_TEXTURE2); glActiveTexture(GL_TEXTURE2);
glBindTexture(GL_TEXTURE_2D, *m_StandardSpecular); glBindTexture(GL_TEXTURE_2D, *m_StandardSpecular);
} }