From 692e0ca9dfa5dead0294fe1b712268bcc13ac552 Mon Sep 17 00:00:00 2001 From: tleety Date: Thu, 17 Sep 2015 14:37:00 +0200 Subject: [PATCH] Fixed a bug where models normal and specular maps is not loaded. --- src/game/Core/Renderer.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/game/Core/Renderer.cpp b/src/game/Core/Renderer.cpp index 306eac4..6534db1 100755 --- a/src/game/Core/Renderer.cpp +++ b/src/game/Core/Renderer.cpp @@ -323,7 +323,7 @@ void dd::Renderer::DrawScene(RenderQueue &objects, ShaderProgram &program) glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, modelJob->DiffuseTexture); - if (modelJob->NormalTexture != 0 && false) { + if (modelJob->NormalTexture != 0) { glActiveTexture(GL_TEXTURE1); glBindTexture(GL_TEXTURE_2D, modelJob->NormalTexture); } else { @@ -331,11 +331,10 @@ void dd::Renderer::DrawScene(RenderQueue &objects, ShaderProgram &program) glBindTexture(GL_TEXTURE_2D, *m_StandardNormal); } - if (modelJob->SpecularTexture != 0 && false) { + if (modelJob->SpecularTexture != 0) { glActiveTexture(GL_TEXTURE2); glBindTexture(GL_TEXTURE_2D, modelJob->SpecularTexture); - } - else { + } else { glActiveTexture(GL_TEXTURE2); glBindTexture(GL_TEXTURE_2D, *m_StandardSpecular); }