Changeset 698Tweet

Timestamp:

Feb 28, 2011, 3:26:06 AM (10 years ago)

Author:

sam

Message:

Enable GL_TEXTURE_2D in the Scene class instead of Video.

Location:

trunk/src

Files:

• scene.cpp (modified) (1 diff)
• video.cpp (modified) (1 diff)

trunk/src/scene.cpp

@@ -168 +168 @@
     glUniform1i(uni_tex, 0);
 
+    glEnable(GL_TEXTURE_2D);
     glEnable(GL_DEPTH_TEST);
     glDepthFunc(GL_LEQUAL);

trunk/src/video.cpp

@@ -97 +97 @@
     glViewport(0, 0, width, height);
 
-    glEnable(GL_TEXTURE_2D);
+    glClearColor(0.1f, 0.2f, 0.3f, 0.0f);
+    glClearDepthf(1.0);
+
 #if defined HAVE_GL_2X || defined HAVE_GLES_1X
     glShadeModel(GL_SMOOTH);
 #endif
-    glClearColor(0.1f, 0.2f, 0.3f, 0.0f);
-    glClearDepthf(1.0);
-
 #if defined HAVE_GL_2X || defined HAVE_GLES_1X
     glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);