From 98f0d881978eb1c35c9bc4ab7d951e22f873102b Mon Sep 17 00:00:00 2001
From: Vegard Storheil Eriksen <zyp@jvnv.net>
Date: Fri, 21 May 2010 22:15:35 +0200
Subject: Fixed RGB vs BGR in texture loading.

---
 engine/texture.cpp | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'engine/texture.cpp')

diff --git a/engine/texture.cpp b/engine/texture.cpp
index ca9d8e7..c3575f2 100644
--- a/engine/texture.cpp
+++ b/engine/texture.cpp
@@ -1,10 +1,4 @@
-#ifndef __APPLE__
-#include <GL/gl.h>
-#include <GL/glut.h>
-#else
-#include <OpenGL/gl.h>
-#include <GLUT/glut.h>
-#endif
+#include <SDL/SDL_opengl.h>
 #include <stdexcept>
 #include "texture.h"
 #include <stdio.h>
@@ -21,9 +15,5 @@ void Texture::build() {
 	glBindTexture(GL_TEXTURE_2D, texture);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-	if(byte_per_pixel == 4) {
-		gluBuild2DMipmaps(GL_TEXTURE_2D, 4, width, height, GL_RGBA, GL_UNSIGNED_BYTE, data);
-	} else if(byte_per_pixel == 3) {
-		gluBuild2DMipmaps(GL_TEXTURE_2D, 3, width, height, GL_RGB, GL_UNSIGNED_BYTE, data);
-	}
+	gluBuild2DMipmaps(GL_TEXTURE_2D, 4, width, height, format, GL_UNSIGNED_BYTE, data);
 }
-- 
cgit v1.2.3