Update gitattributes

[opengl.git] / material.cpp

diff --git a/material.cpp b/material.cpp
index a1d44beb6d07929865ee5309b6916f4ab109d951..852a4b5d9edffdc59849219d58854b12b41b8f70 100644 (file)
--- a/material.cpp
+++ b/material.cpp
@@ -55,6 +55,10 @@ Material::Texture::Texture(const aiString fileName, const aiScene &scene) {
        // which are themselves filtered linearly
        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
 
+       float aniso = 0;
+       glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &aniso);
+       glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, aniso); 
+    
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
     
@@ -62,7 +66,7 @@ Material::Texture::Texture(const aiString fileName, const aiScene &scene) {
 }
 
 void Material::bind() const {
-       if (ambientOcclusion != nullptr) {
+       if (albedo != nullptr) {
                glUniform1i(glGetUniformLocation(progId, "mat.albedoMap"), 0);
                glActiveTexture(GL_TEXTURE0);
                glBindTexture(GL_TEXTURE_2D, albedo->texId);