Changeset 667Tweet

Timestamp:

Feb 18, 2011, 4:55:34 PM (11 years ago)

Author:

sam

Message:

Minor GL code reorganisation and simplification.

File:

• trunk/src/video.cpp (modified) (5 diffs)

trunk/src/video.cpp

@@ -39 +39 @@
     "\n"
     "in vec3 in_Position;\n"
-    "in vec3 in_Color;\n"
+    //"in vec3 in_Color;\n"
     "in vec2 in_TexCoord;\n"
-    "out vec3 pass_Color;\n"
+    //"out vec3 pass_Color;\n"
     "uniform mat4 proj_matrix;\n"
     "uniform mat4 view_matrix;\n"
@@ -51 +51 @@
     "                * vec4(in_Position, 1.0f);\n"
     "    gl_TexCoord[0] = vec4(in_TexCoord, 0.0, 0.0);\n"
-    "    pass_Color = in_Color;\n"
+    //"    pass_Color = in_Color;\n"
     "}\n";
 
@@ -58 +58 @@
     "\n"
     "uniform sampler2D in_Texture;\n"
-    "in vec3 pass_Color;\n"
+    //"in vec3 pass_Color;\n"
     "out vec4 out_Color;\n"
     "\n"
@@ -132 +132 @@
     view_matrix = mat4(1.0f);
 
-#if !LOL_EXPERIMENTAL
-    glMatrixMode(GL_PROJECTION);
-    glLoadIdentity();
-    glMultMatrixf(&proj_matrix[0][0]);
-
-    /* Reset the model view matrix, just in case */
-    glMatrixMode(GL_MODELVIEW);
-    glLoadIdentity();
-    glMultMatrixf(&view_matrix[0][0]);
-#endif
-}
-
-void Video::SetDepth(bool set)
-{
-    if (set)
-        glEnable(GL_DEPTH_TEST);
-    else
-        glDisable(GL_DEPTH_TEST);
-}
-
-void Video::Clear()
-{
-    glViewport(0, 0, GetWidth(), GetHeight());
-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
-
 #if LOL_EXPERIMENTAL
     GLuint uni;
@@ -163 +138 @@
     uni = stdshader->GetUniformLocation("view_matrix");
     glUniformMatrix4fv(uni, 1, GL_FALSE, &view_matrix[0][0]);
-#endif
+#else
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+    glMultMatrixf(&proj_matrix[0][0]);
+
+    /* Reset the model view matrix, just in case */
+    glMatrixMode(GL_MODELVIEW);
+    glLoadIdentity();
+    glMultMatrixf(&view_matrix[0][0]);
+#endif
+}
+
+void Video::SetDepth(bool set)
+{
+    if (set)
+        glEnable(GL_DEPTH_TEST);
+    else
+        glDisable(GL_DEPTH_TEST);
+}
+
+void Video::Clear()
+{
+    glViewport(0, 0, GetWidth(), GetHeight());
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
 
     SetFov(0.0f);