X-Git-Url: https://git.lukelau.me/?p=opengl.git;a=blobdiff_plain;f=material.hpp;fp=material.hpp;h=c814c9eab8451bc23b0a418b8244b69045b71e10;hp=7735f630206b1abf9c5f7a4ecfb03abee5eec154;hb=d381f617bef400fc157edf782008cafb018ed594;hpb=c0811ee866ca2b6d002c15394ea5d4b7a1067a80 diff --git a/material.hpp b/material.hpp index 7735f63..c814c9e 100644 --- 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;