Changeset 657Tweet

Timestamp:

Feb 17, 2011, 7:06:26 PM (10 years ago)

Author:

sam

Message:

Clean up stuff in the shader crap.

Location:

trunk/src

Files:

• scene.cpp (modified) (5 diffs)
• video.cpp (modified) (3 diffs)

trunk/src/scene.cpp

@@ -37 +37 @@
 
 #if SHADER_CRAP
-#   define ATTRIB_POSITION 42 /* arbitrary id */
-    extern GLuint prog;
-    extern GLint uni_mvp, uni_color;
+extern GLuint prog;
 #endif
 
@@ -163 +161 @@
     {  1.0,  0.0  } };
 
-    GLuint id[4];
-    glGenVertexArrays(1, &id[0]);
-    glBindVertexArray(id[0]);
-    glGenBuffers(3, &id[1]);
-
-    glBindBuffer(GL_ARRAY_BUFFER, id[1]);
+    GLuint vao, vbo[3];
+    glGenVertexArrays(1, &vao);
+    glBindVertexArray(vao);
+    glGenBuffers(3, &vbo[0]);
+
+    glBindBuffer(GL_ARRAY_BUFFER, vbo[0]);
     glBufferData(GL_ARRAY_BUFFER, 18 * sizeof(GLfloat), vertices, GL_STATIC_DRAW);
     glVertexAttribPointer((GLuint)0, 3, GL_FLOAT, GL_FALSE, 0, 0);
     glEnableVertexAttribArray(0);
 
-    glBindBuffer(GL_ARRAY_BUFFER, id[2]);
+    glBindBuffer(GL_ARRAY_BUFFER, vbo[1]);
     glBufferData(GL_ARRAY_BUFFER, 18 * sizeof(GLfloat), colors, GL_STATIC_DRAW);
     glVertexAttribPointer((GLuint)1, 3, GL_FLOAT, GL_FALSE, 0, 0);
     glEnableVertexAttribArray(1);
 
-    glBindBuffer(GL_ARRAY_BUFFER, id[3]);
+    glBindBuffer(GL_ARRAY_BUFFER, vbo[2]);
     glBufferData(GL_ARRAY_BUFFER, 12 * sizeof(GLfloat), tex, GL_STATIC_DRAW);
     glVertexAttribPointer((GLuint)2, 2, GL_FLOAT, GL_FALSE, 0, 0);
@@ -186 +184 @@
 
     glUseProgram(prog);
-    glBindVertexArray(id[0]);
+    glBindVertexArray(vao);
     Tiler::Bind(1 << 16);
     glDrawArrays(GL_TRIANGLES, 0, 6);
@@ -233 +231 @@
         glEnableClientState(GL_VERTEX_ARRAY);
         glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-#if SHADER_CRAP
-        glUseProgram(prog);
-        //float4x4 mvp(1.0f);
-        //mvp = mvp - mvp;
-        //glUniformMatrix4fv(uni_mvp, 1, GL_FALSE, (GLfloat *)&mvp[0][0]);
-        //glUniform4f(uni_color, 1.0f, 0.0f, 1.0f, 1.0f);
-#endif
 
         glBindBuffer(GL_ARRAY_BUFFER, data->bufs[buf]);
@@ -245 +236 @@
                      vertex, GL_DYNAMIC_DRAW);
         glVertexPointer(3, GL_FLOAT, 0, NULL);
-#if SHADER_CRAP
-        glVertexAttribPointer(ATTRIB_POSITION, (n - i) * 6, GL_FLOAT, false, 0, vertex);
-        glEnableVertexAttribArray(ATTRIB_POSITION);
-#endif
 
         glBindBuffer(GL_ARRAY_BUFFER, data->bufs[buf + 1]);

trunk/src/video.cpp

@@ -30 +30 @@
 
 #if SHADER_CRAP
-#   define ATTRIB_POSITION 42 /* arbitrary id */
     GLuint prog, sh1, sh2;
     GLint uni_m1, uni_m2, uni_m3;
@@ -51 +50 @@
     "void main()\n"
     "{\n"
-    "    //gl_Position = projection_matrix * view_matrix * model_matrix * vec4(in_Position, 1.0f);\n"
-    "    gl_Position = projection_matrix * view_matrix * model_matrix * vec4(in_Position, 1.0f);\n"
+    "    gl_Position = projection_matrix * view_matrix *"
+    "                  model_matrix * vec4(in_Position, 1.0f);\n"
     "    gl_TexCoord[0] = vec4(in_TexCoord, 0.0, 0.0);\n"
     "    pass_Color = in_Color;\n"
@@ -108 +107 @@
     glAttachShader(prog, sh2);
 
-    //glBindAttribLocation(prog, ATTRIB_POSITION, "position");
     glBindAttribLocation(prog, 0, "in_Position");
     glBindAttribLocation(prog, 1, "in_Color");