PBR checkpoint

[opengl.git] / material.cpp

diff --git a/material.cpp b/material.cpp
index d55386f7b701818db465846d2b07cc2fc7ddf6bb..df8ef8b1867b36ba9e8a80b8eab6e17a9009d393 100644 (file)
--- a/material.cpp
+++ b/material.cpp
@@ -39,28 +39,35 @@ Material::Texture::Texture(const std::string &fileName) {
 }
 
 void Material::bind() const {
+       /* glUniform3f(glGetUniformLocation(progId, "albedo"), 0.5f, 0.f, 0.f); */
+       /* glUniform1f(glGetUniformLocation(progId, "metallic"), 0.2f); */
+       /* glUniform1f(glGetUniformLocation(progId, "roughness"), 0.3f); */
+       /* glUniform1f(glGetUniformLocation(progId, "ao"), 1.f); */
+
        /* glUniform4f(glGetUniformLocation(progId, "material.ambient"), ambient.r, ambient.g, ambient.b, ambient.a); */
-       glUniform4f(glGetUniformLocation(progId, "material.ambient"), 0.2, 0.2, 0.2, 1);
-       glUniform4f(glGetUniformLocation(progId, "material.diffuse"), diffuse.r, diffuse.g, diffuse.b, diffuse.a);
-       glUniform4f(glGetUniformLocation(progId, "material.specular"), specular.r, specular.g, specular.b, specular.a);
-       glUniform1f(glGetUniformLocation(progId, "material.shininess"), shininess);
-       glUniform1f(glGetUniformLocation(progId, "material.reflectivity"), reflectivity);
-       glUniform1f(glGetUniformLocation(progId, "material.refractiveIndex"), refractiveIndex);
-       glUniform1f(glGetUniformLocation(progId, "material.opacity"), opacity);
+       /* glUniform4f(glGetUniformLocation(progId, "material.diffuse"), diffuse.r, diffuse.g, diffuse.b, diffuse.a); */
+       /* glUniform4f(glGetUniformLocation(progId, "material.specular"), specular.r, specular.g, specular.b, specular.a); */
+       /* glUniform1f(glGetUniformLocation(progId, "material.shininess"), shininess); */
+       /* glUniform1f(glGetUniformLocation(progId, "material.reflectivity"), reflectivity); */
+       /* glUniform1f(glGetUniformLocation(progId, "material.refractiveIndex"), refractiveIndex); */
+       /* glUniform1f(glGetUniformLocation(progId, "material.opacity"), opacity); */
 
-       glUniform1i(glGetUniformLocation(progId, "material.hasTexture"), diffuseMap != nullptr);
-       glUniform1i(glGetUniformLocation(progId, "material.hasSpecularMap"), specularMap != nullptr);
-       glUniform1i(glGetUniformLocation(progId, "material.hasNormalMap"), normalMap != nullptr);
+       /* glUniform1i(glGetUniformLocation(progId, "material.hasTexture"), diffuseMap != nullptr); */
+       /* glUniform1i(glGetUniformLocation(progId, "material.hasSpecularMap"), specularMap != nullptr); */
+       /* glUniform1i(glGetUniformLocation(progId, "material.hasNormalMap"), normalMap != nullptr); */
+       /* glUniform1i(glGetUniformLocation(progId, "material.hasTexture"), diffuseMap != nullptr); */
+       /* glUniform1i(glGetUniformLocation(progId, "material.hasSpecularMap"), specularMap != nullptr); */
+       /* glUniform1i(glGetUniformLocation(progId, "material.hasNormalMap"), normalMap != nullptr); */
        
-       glUniform1i(glGetUniformLocation(progId, "material.diffuseMap"), 2);
-       glActiveTexture(GL_TEXTURE2);
-       if (diffuseMap) glBindTexture(GL_TEXTURE_2D, diffuseMap->texId);
+       /* glUniform1i(glGetUniformLocation(progId, "material.diffuseMap"), 2); */
+       /* glActiveTexture(GL_TEXTURE2); */
+       /* if (diffuseMap) glBindTexture(GL_TEXTURE_2D, diffuseMap->texId); */
 
-       glUniform1i(glGetUniformLocation(progId, "material.specularMap"), 3);
-       glActiveTexture(GL_TEXTURE3);
-       if (specularMap) glBindTexture(GL_TEXTURE_2D, specularMap->texId);
+       /* glUniform1i(glGetUniformLocation(progId, "material.specularMap"), 3); */
+       /* glActiveTexture(GL_TEXTURE3); */
+       /* if (specularMap) glBindTexture(GL_TEXTURE_2D, specularMap->texId); */
 
-       glUniform1i(glGetUniformLocation(progId, "material.normalMap"), 4);
-       glActiveTexture(GL_TEXTURE4);
-       if (normalMap) glBindTexture(GL_TEXTURE_2D, normalMap->texId);
+       /* glUniform1i(glGetUniformLocation(progId, "material.normalMap"), 4); */
+       /* glActiveTexture(GL_TEXTURE4); */
+       /* if (normalMap) glBindTexture(GL_TEXTURE_2D, normalMap->texId); */
 }