X-Git-Url: http://git.lukelau.me/?p=opengl.git;a=blobdiff_plain;f=material.cpp;h=3da687c3a87d0c40d20577a06848be7f6a520d2e;hp=a1d44beb6d07929865ee5309b6916f4ab109d951;hb=HEAD;hpb=45e43c5d0b6a1415185211128d82190fd19c3fe9 diff --git a/material.cpp b/material.cpp index a1d44be..852a4b5 100644 --- 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);