X-Git-Url: https://git.lukelau.me/?p=opengl.git;a=blobdiff_plain;f=material.cpp;h=85ff7d7ce803f4ebe9ecff8f10c6ae33775acadc;hp=838f6736d637e2a8792959932afcfceab32acd9c;hb=a5d6aeceecd964d4bb0a1eebaf99e8e216feb677;hpb=dbd855720a9af7d6e599ddc50bbbb0dee85458a5 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);