summaryrefslogtreecommitdiff
path: root/mogltk/glbase.cpp
diff options
context:
space:
mode:
authorpixel <pixel>2002-11-11 20:07:41 +0000
committerpixel <pixel>2002-11-11 20:07:41 +0000
commit028c7dcfa9f1920d5fa2e573790bef40c4076275 (patch)
tree3c5f2bd9e90b7d57bae84111a200ee608c9d9bc3 /mogltk/glbase.cpp
parent9cde21d59d7c1f9b385d334cd60ae241ce9cf49b (diff)
Still working ;-)
Diffstat (limited to 'mogltk/glbase.cpp')
-rw-r--r--mogltk/glbase.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/mogltk/glbase.cpp b/mogltk/glbase.cpp
index b2512ca..0993b43 100644
--- a/mogltk/glbase.cpp
+++ b/mogltk/glbase.cpp
@@ -59,6 +59,9 @@ int mogltk::glbase::setup(int w, int h, int flags) throw(GeneralException) {
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
+ glEnable(GL_TEXTURE_2D);
+ glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL);
+
return 0;
}
@@ -81,7 +84,6 @@ void mogltk::glbase::Enter2DMode(void) {
glPushAttrib(GL_ENABLE_BIT);
glDisable(GL_DEPTH_TEST);
glDisable(GL_CULL_FACE);
- glEnable(GL_TEXTURE_2D);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -94,8 +96,6 @@ void mogltk::glbase::Enter2DMode(void) {
glPushMatrix();
glLoadIdentity();
- glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL);
-
twoD = 1;
}