summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilrik de Loose <wilrik@wilrik.nl>2008-01-08 15:58:30 (GMT)
committerWilrik de Loose <wilrik@wilrik.nl>2008-01-08 15:58:30 (GMT)
commitabff75592f31e40e8cefd67dcc1b29ea26981524 (patch)
tree397dcbfae0d8095930e1b473e67f1f2e0a09a76c
parentc8e37eae0f1e10547c3b347182fb105f0e43b8d7 (diff)
download2iv35-abff75592f31e40e8cefd67dcc1b29ea26981524.zip
2iv35-abff75592f31e40e8cefd67dcc1b29ea26981524.tar.gz
2iv35-abff75592f31e40e8cefd67dcc1b29ea26981524.tar.bz2
images werken weer
-rw-r--r--Smoke/Week 2.suobin66048 -> 67072 bytes
-rw-r--r--Smoke/renderer_gl.c6
2 files changed, 4 insertions, 2 deletions
diff --git a/Smoke/Week 2.suo b/Smoke/Week 2.suo
index 6d38775..df1f488 100644
--- a/Smoke/Week 2.suo
+++ b/Smoke/Week 2.suo
Binary files differ
diff --git a/Smoke/renderer_gl.c b/Smoke/renderer_gl.c
index 795d4f2..4864c25 100644
--- a/Smoke/renderer_gl.c
+++ b/Smoke/renderer_gl.c
@@ -439,7 +439,8 @@ static void render_glyph(GLUquadricObj *qobj, float x_value, float y_value, floa
glPushMatrix();
- glBindTexture(GL_TEXTURE_2D, texture);
+ glEnable(GL_TEXTURE_2D);
+
glTranslatef(x0, y0, z0);
glRotatef(theta, 0.0, 0.0, 1.0);
glTranslatef(-x0, -y0, -z0);
@@ -452,7 +453,8 @@ static void render_glyph(GLUquadricObj *qobj, float x_value, float y_value, floa
glEnd();
glRotatef(-theta, 0.0, 0.0, 1.0);
- glBindTexture(GL_TEXTURE_2D, 0);
+
+ glDisable(GL_TEXTURE_2D);
glPopMatrix();
break;