X-Git-Url: https://git.lukelau.me/?p=opengl.git;a=blobdiff_plain;f=material.hpp;h=cb3d49eabffbe1f38af2c2dad798f104fd5fcef7;hp=c28bcb452fe6a16f70c072e79ac21bd1f4a5b92e;hb=4b4ca69c7cb67e03931d089a27cefa23be0544ac;hpb=ba9c738e8660304aa0341eb44118e63502a4a009

diff --git a/material.hpp b/material.hpp
index c28bcb4..cb3d49e 100644
--- a/material.hpp
+++ b/material.hpp
@@ -8,19 +8,19 @@
 
 class Material {
 	public:
-		Material(const aiMaterial &aiMaterial, GLuint progId);
+		Material(const aiMaterial &aiMaterial, const aiScene &aiScene, GLuint progId);
 		void bind() const;
 	private:
 		GLuint progId;
-		aiColor3D ambient, diffuse, specular;
-		ai_real shininess;
+		aiColor4D ambient, diffuse, specular;
 
 		struct Texture {
-			Texture(const std::string &path);
+			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;
 };