X-Git-Url: https://git.lukelau.me/?p=opengl.git;a=blobdiff_plain;f=material.cpp;h=7cd8d8045f509ab51d9afd1e3cb042c06a0bab58;hp=470f1a2caa370bd2292a474f2ccc34f39e9662bf;hb=85f8f7278f24fe73fef1a19174376b155319072f;hpb=37cba564a96018a5500e942498d4e48c0ebe73ed

diff --git a/material.cpp b/material.cpp
index 470f1a2..7cd8d80 100644
--- a/material.cpp
+++ b/material.cpp
@@ -1,12 +1,23 @@
 #include "material.hpp"
 #include <iostream>
+#include <fstream>
 #include <CoreGraphics/CoreGraphics.h>
 
 Material::Material(const aiMaterial &ai, GLuint progId): progId(progId) {
 	if (ai.GetTextureCount(aiTextureType_DIFFUSE) > 0) {
 		aiString path;
 		ai.GetTexture(aiTextureType_DIFFUSE, 0, &path);
-		texture = new Texture(std::string(path.C_Str()));
+		diffuseMap = new Texture(std::string(path.C_Str()));
+	}
+	if (ai.GetTextureCount(aiTextureType_SPECULAR) > 0) {
+		aiString path;
+		ai.GetTexture(aiTextureType_SPECULAR, 0, &path);
+		specularMap = new Texture(std::string(path.C_Str()));
+	}
+	if (ai.GetTextureCount(aiTextureType_NORMALS) > 0) {
+		aiString path;
+		ai.GetTexture(aiTextureType_NORMALS, 0, &path);
+		normalMap = new Texture(std::string(path.C_Str()));
 	}
 	ai.Get(AI_MATKEY_SHININESS, shininess);
 	ai.Get(AI_MATKEY_COLOR_AMBIENT, ambient);
@@ -14,9 +25,21 @@ Material::Material(const aiMaterial &ai, GLuint progId): progId(progId) {
 	ai.Get(AI_MATKEY_COLOR_SPECULAR, specular);
 }
 
-Material::Texture::Texture(const std::string &path) {
+Material::Texture::Texture(const std::string &fileName) {
+	auto path = "models/" + fileName;
 	auto provider = CGDataProviderCreateWithFilename(path.c_str());
-	auto ref = CGImageCreateWithJPEGDataProvider(provider, nullptr, false, kCGRenderingIntentDefault);
+	std::ifstream file(path);
+	long magic;
+	file.read((char*)&magic, 8);
+	file.close();
+
+	CGImageRef ref;
+
+	if (magic == 0x0a1a0a0d474e5089) // png magic number
+		ref = CGImageCreateWithPNGDataProvider(provider, nullptr, false, kCGRenderingIntentDefault);
+	else
+		ref = CGImageCreateWithJPEGDataProvider(provider, nullptr, false, kCGRenderingIntentDefault);
+	
 	auto dataRef = CGDataProviderCopyData(CGImageGetDataProvider(ref));
 	auto img = (unsigned char*) CFDataGetBytePtr(dataRef);
 
@@ -31,12 +54,27 @@ Material::Texture::Texture(const std::string &path) {
 }
 
 void Material::bind() const {
-	glUniform3f(glGetUniformLocation(progId, "material.ambient"), ambient.r, ambient.g, ambient.b);
-	glUniform3f(glGetUniformLocation(progId, "material.diffuse"), diffuse.r, diffuse.g, diffuse.b);
-	glUniform3f(glGetUniformLocation(progId, "material.specular"), specular.r, specular.g, specular.b);
+	glUniform4f(glGetUniformLocation(progId, "material.ambient"), ambient.r, ambient.g, ambient.b, ambient.a);
+	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);
-	glUniform1i(glGetUniformLocation(progId, "material.hasTexture"), texture != nullptr);
+	glUniform1i(glGetUniformLocation(progId, "material.hasTexture"), diffuseMap != nullptr);
+	glUniform1i(glGetUniformLocation(progId, "material.hasSpecularMap"), specularMap != nullptr);
+	glUniform1i(glGetUniformLocation(progId, "material.hasNormalMap"), normalMap != nullptr);
 
-	if (texture) 
-		glBindTexture(GL_TEXTURE_2D, texture->texId);
+	if (diffuseMap) {
+		glUniform1i(glGetUniformLocation(progId, "material.diffuseMap"), 0);
+		glActiveTexture(GL_TEXTURE0);
+		glBindTexture(GL_TEXTURE_2D, diffuseMap->texId);
+	}
+	if (specularMap) {
+		glUniform1i(glGetUniformLocation(progId, "material.specularMap"), 1);
+		glActiveTexture(GL_TEXTURE1);
+		glBindTexture(GL_TEXTURE_2D, specularMap->texId);
+	}
+	if (normalMap) {
+		glUniform1i(glGetUniformLocation(progId, "material.normalMap"), 2);
+		glActiveTexture(GL_TEXTURE2);
+		glBindTexture(GL_TEXTURE_2D, normalMap->texId);
+	}
 }