Handle loading of embedded textures

[opengl.git] / material.hpp

diff --git a/material.hpp b/material.hpp
index 7735f630206b1abf9c5f7a4ecfb03abee5eec154..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,7 +16,7 @@ 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 *albedo = nullptr;