Fix metal roughness texture on streaked metal material

[opengl.git] / material.hpp

diff --git a/material.hpp b/material.hpp
index 074e8ae8117478afb454ec38a114e451ffa6506a..c814c9eab8451bc23b0a418b8244b69045b71e10 100644 (file)
--- a/material.hpp
+++ b/material.hpp
@@ -8,7 +8,7 @@
 
 class Material {
        public:
-               Material(const aiMaterial &aiMaterial, GLuint progId);
+               Material(const aiMaterial &aiMaterial, const aiScene &aiScene, GLuint progId);
                void bind() const;
        private:
                GLuint progId;
@@ -16,11 +16,12 @@ class Material {
                ai_real shininess, reflectivity, refractiveIndex, opacity;
 
                struct Texture {
-                       Texture(const std::string &file);
+                       Texture(const aiString file, const aiScene &aiScene);
                        GLuint texId;
                };
-               Texture *diffuseMap = nullptr;
-               Texture *specularMap = nullptr;
-               Texture *normalMap = nullptr;
+               Texture *albedo = nullptr;
+               Texture *normal = nullptr;
+               Texture *metallicRoughness = nullptr;
+               Texture *ambientOcclusion = nullptr;
 };