From 3d3aaa3c3c08f46022318703c82d27007ee6cade Mon Sep 17 00:00:00 2001 From: Warwick Date: Wed, 20 Jul 2022 16:30:40 +0100 Subject: [PATCH] Solved multiple texture loading problem. --- data/shaders/pbrFragment.glsl | 5 +---- src/Mesh.cpp | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/data/shaders/pbrFragment.glsl b/data/shaders/pbrFragment.glsl index 5b2f1e8..1851336 100644 --- a/data/shaders/pbrFragment.glsl +++ b/data/shaders/pbrFragment.glsl @@ -121,8 +121,5 @@ void main() color = color / (color + vec3(1.0)); color = pow(color, vec3(1.0/2.2)); - //FragColor = texture(texture_diffuse1, ourTexCoord); - FragColor = texture(texture_metalness1, ourTexCoord); - //FragColor = texture(texture_diffuse1, ourTexCoord) * vec4(color, 0.0); - //FragColor = vec4(CameraPos,1.0); + FragColor = texture(texture_diffuse1, ourTexCoord) * vec4(color, 0.0); } diff --git a/src/Mesh.cpp b/src/Mesh.cpp index 90645af..61a5975 100644 --- a/src/Mesh.cpp +++ b/src/Mesh.cpp @@ -59,7 +59,7 @@ void Mesh::draw(ShaderLoader &shader) { error.log(("material." + name + number).c_str() + std::string(" ") + std::to_string(i) + " " + std::to_string(textures[i].id)); - shader.setInt(("material." + name + number).c_str(), i); + shader.setInt((name + number).c_str(), i); glBindTexture(GL_TEXTURE_2D, textures[i].id); // error.log(std::to_string(i)); }