X-Git-Url: http://git.lukelau.me/?a=blobdiff_plain;ds=sidebyside;f=material.hpp;h=7735f630206b1abf9c5f7a4ecfb03abee5eec154;hb=610bb8ddab4ec871cadfed0a0b66695b8fea41a4;hp=c28bcb452fe6a16f70c072e79ac21bd1f4a5b92e;hpb=ba9c738e8660304aa0341eb44118e63502a4a009;p=opengl.git

diff --git a/material.hpp b/material.hpp
index c28bcb4..7735f63 100644
--- a/material.hpp
+++ b/material.hpp
@@ -12,15 +12,16 @@ class Material {
 		void bind() const;
 	private:
 		GLuint progId;
-		aiColor3D ambient, diffuse, specular;
-		ai_real shininess;
+		aiColor4D ambient, diffuse, specular;
+		ai_real shininess, reflectivity, refractiveIndex, opacity;
 
 		struct Texture {
-			Texture(const std::string &path);
+			Texture(const std::string &file);
 			GLuint texId;
 		};
-		Texture *diffuseMap = nullptr;
-		Texture *specularMap = nullptr;
-		Texture *normalMap = nullptr;
+		Texture *albedo = nullptr;
+		Texture *normal = nullptr;
+		Texture *metallicRoughness = nullptr;
+		Texture *ambientOcclusion = nullptr;
 };