X-Git-Url: https://git.lukelau.me/?p=opengl.git;a=blobdiff_plain;f=image.cpp;h=e3c5cbdb81fe2355c63c9452b25f8a92adec68f9;hp=1565b859142df1d3897932c4790026ab77a71825;hb=0291188124d08368ce28b308482604218bd75393;hpb=d80972d96e5fcd444657f937ab2700039efa83d2

diff --git a/image.cpp b/image.cpp
index 1565b85..e3c5cbd 100644
--- a/image.cpp
+++ b/image.cpp
@@ -11,6 +11,7 @@ Image::Image(const std::string &path) {
 	info = CGImageGetBitmapInfo(ref);
 	alphaInfo = CGImageGetAlphaInfo(ref);
 	colorSpace = CGImageGetColorSpace(ref);
+	bitsPerComponent = CGImageGetBitsPerComponent(ref);
 
 	dataRef = CGDataProviderCopyData(CGImageGetDataProvider(ref));
 	CGImageRelease(ref);
@@ -25,7 +26,7 @@ GLfloat Image::width() const { return _width; }
 GLfloat Image::height() const { return _height; }
 
 // TODO: Properly implement this for both internal format + format
-GLuint Image::format() const {
+GLenum Image::format() const {
 	if (CGColorSpaceGetModel(colorSpace) == kCGColorSpaceModelMonochrome) {
 		return GL_DEPTH_COMPONENT;
 	}
@@ -35,4 +36,24 @@ GLuint Image::format() const {
 	return GL_RGBA;
 }
 
+GLint Image::internalFormat() const {
+	switch (format()) {
+		case GL_DEPTH_COMPONENT: return GL_DEPTH_COMPONENT;
+		case GL_RGB: return GL_RGB;
+		default: return GL_RGBA;
+	}
+}
+
+GLenum Image::type() const {
+	bool isFloat = info & kCGBitmapFloatComponents;
+	if (isFloat) return GL_FLOAT;
+	return GL_UNSIGNED_BYTE;
+	
+	//TODO:
+	/* switch (bitsPerComponent) { */
+	/* 	case 1: return GL_UNSIGNED_BYTE; */
+	/* 	case 16: return GL_UNSIGNED_SHORT; */
+	/*  case 24: */ 
+}
+
 Image::~Image() { CFRelease(dataRef); }