X-Git-Url: https://git.lukelau.me/?p=opengl.git;a=blobdiff_plain;f=material.cpp;h=d55386f7b701818db465846d2b07cc2fc7ddf6bb;hp=49af1d4495b1b4128e441b442b3defe082dc3647;hb=bd433c5ca7fcf3ce60bdc8db6fc0c76b547fe10b;hpb=8abaf8f77191e1c660def0832d8036a8b4639ba8

diff --git a/material.cpp b/material.cpp
index 49af1d4..d55386f 100644
--- a/material.cpp
+++ b/material.cpp
@@ -21,6 +21,10 @@ Material::Material(const aiMaterial &ai, GLuint progId): progId(progId) {
 	}
 	ai.Get(AI_MATKEY_SHININESS, shininess);
 	ai.Get(AI_MATKEY_REFLECTIVITY, reflectivity);
+	ai.Get(AI_MATKEY_REFRACTI, refractiveIndex);
+	if (ai.Get(AI_MATKEY_OPACITY, opacity) == aiReturn_FAILURE)
+		opacity = 1.f;
+		
 	ai.Get(AI_MATKEY_COLOR_AMBIENT, ambient);
 	ai.Get(AI_MATKEY_COLOR_DIFFUSE, diffuse);
 	ai.Get(AI_MATKEY_COLOR_SPECULAR, specular);
@@ -35,11 +39,15 @@ Material::Texture::Texture(const std::string &fileName) {
 }
 
 void Material::bind() const {
-	glUniform4f(glGetUniformLocation(progId, "material.ambient"), ambient.r, ambient.g, ambient.b, ambient.a);
+	/* glUniform4f(glGetUniformLocation(progId, "material.ambient"), ambient.r, ambient.g, ambient.b, ambient.a); */
+	glUniform4f(glGetUniformLocation(progId, "material.ambient"), 0.2, 0.2, 0.2, 1);
 	glUniform4f(glGetUniformLocation(progId, "material.diffuse"), diffuse.r, diffuse.g, diffuse.b, diffuse.a);
 	glUniform4f(glGetUniformLocation(progId, "material.specular"), specular.r, specular.g, specular.b, specular.a);
 	glUniform1f(glGetUniformLocation(progId, "material.shininess"), shininess);
 	glUniform1f(glGetUniformLocation(progId, "material.reflectivity"), reflectivity);
+	glUniform1f(glGetUniformLocation(progId, "material.refractiveIndex"), refractiveIndex);
+	glUniform1f(glGetUniformLocation(progId, "material.opacity"), opacity);
+
 	glUniform1i(glGetUniformLocation(progId, "material.hasTexture"), diffuseMap != nullptr);
 	glUniform1i(glGetUniformLocation(progId, "material.hasSpecularMap"), specularMap != nullptr);
 	glUniform1i(glGetUniformLocation(progId, "material.hasNormalMap"), normalMap != nullptr);