From: Luke Lau <luke_lau@icloud.com>
Date: Tue, 11 Feb 2020 23:56:15 +0000 (+0000)
Subject: Fix maps not being bound in materials
X-Git-Tag: cs7gv5-a2~5
X-Git-Url: http://git.lukelau.me/?p=opengl.git;a=commitdiff_plain;h=a5d6aeceecd964d4bb0a1eebaf99e8e216feb677;ds=sidebyside

Fix maps not being bound in materials

woops
---

diff --git a/material.cpp b/material.cpp
index 838f673..85ff7d7 100644
--- a/material.cpp
+++ b/material.cpp
@@ -72,7 +72,7 @@ void Material::bind() const {
 	}
 
 	if (metallicRoughness != nullptr) {
-		glUniform1i(glGetUniformLocation(progId, "metallicRoughnessMap"), 2);
+		glUniform1i(glGetUniformLocation(progId, "mat.metallicRoughnessMap"), 2);
 		glActiveTexture(GL_TEXTURE2);
 		glBindTexture(GL_TEXTURE_2D, metallicRoughness->texId);
 		glUniform1i(glGetUniformLocation(progId, "mat.hasMetallicRoughness"), 1);
@@ -81,7 +81,7 @@ void Material::bind() const {
 	}
 
 	if (ambientOcclusion != nullptr) {
-		glUniform1i(glGetUniformLocation(progId, "aoMap"), 3);
+		glUniform1i(glGetUniformLocation(progId, "mat.aoMap"), 3);
 		glActiveTexture(GL_TEXTURE3);
 		glBindTexture(GL_TEXTURE_2D, ambientOcclusion->texId);
 		glUniform1i(glGetUniformLocation(progId, "mat.hasAo"), 1);