summaryrefslogtreecommitdiffstats
path: root/Smoke/renderer_gl.c
diff options
context:
space:
mode:
authorWilrik de Loose <wilrik@wilrik.nl>2008-01-08 15:52:28 (GMT)
committerWilrik de Loose <wilrik@wilrik.nl>2008-01-08 15:52:28 (GMT)
commitc8e37eae0f1e10547c3b347182fb105f0e43b8d7 (patch)
treeffa49b90270dd44ac0e18b1ffef88ae100413231 /Smoke/renderer_gl.c
parenteffb3d7b3c795d3e59ebba01e97cff42bbc0ea86 (diff)
download2iv35-c8e37eae0f1e10547c3b347182fb105f0e43b8d7.zip
2iv35-c8e37eae0f1e10547c3b347182fb105f0e43b8d7.tar.gz
2iv35-c8e37eae0f1e10547c3b347182fb105f0e43b8d7.tar.bz2
Diffstat (limited to 'Smoke/renderer_gl.c')
-rw-r--r--Smoke/renderer_gl.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/Smoke/renderer_gl.c b/Smoke/renderer_gl.c
index 75c1514..795d4f2 100644
--- a/Smoke/renderer_gl.c
+++ b/Smoke/renderer_gl.c
@@ -337,9 +337,10 @@ GLuint LoadTextures(char *filename)
glGenTextures(1, &texture);
glBindTexture(GL_TEXTURE_2D, texture);
-// gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGB, width, height, GL_BGR, GL_UNSIGNED_BYTE, imagedata);
+ gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGB, width, height, GL_RGB, GL_UNSIGNED_BYTE, imagedata);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+ return_value = texture;
free(imagedata);
}
@@ -829,7 +830,7 @@ void renderer_init_gl(void)
float LightDiffuse[] = { 0.50f, 0.50f, 0.50f, 0.00f }; // Diffuse light values
float LightPosition[] = { -250.0f, -250.0f, -300.0f, 1.00f }; // Position of the light source
- glEnable(GL_TEXTURE_2D);
+ //glEnable(GL_TEXTURE_2D);
glShadeModel(GL_SMOOTH);
glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);