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

diff --git a/material.cpp b/material.cpp
index 7cd8d80..0e655a1 100644
--- a/material.cpp
+++ b/material.cpp
@@ -1,7 +1,5 @@
 #include "material.hpp"
-#include <iostream>
-#include <fstream>
-#include <CoreGraphics/CoreGraphics.h>
+#include "image.hpp"
 
 Material::Material(const aiMaterial &ai, GLuint progId): progId(progId) {
 	if (ai.GetTextureCount(aiTextureType_DIFFUSE) > 0) {
@@ -26,31 +24,11 @@ Material::Material(const aiMaterial &ai, GLuint progId): progId(progId) {
 }
 
 Material::Texture::Texture(const std::string &fileName) {
-	auto path = "models/" + fileName;
-	auto provider = CGDataProviderCreateWithFilename(path.c_str());
-	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);
-
 	glGenTextures(1, &texId);
 	glBindTexture(GL_TEXTURE_2D, texId);
-	auto width = CGImageGetWidth(ref), height = CGImageGetHeight(ref);
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, img);
+	Image img("models/" + fileName);
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, img.width(), img.height(), 0, GL_RGBA, GL_UNSIGNED_BYTE, img.data());
 	glGenerateMipmap(GL_TEXTURE_2D);
-
-	CGImageRelease(ref);
-	CFRelease(dataRef);
 }
 
 void Material::bind() const {