Changeset 656Tweet

Timestamp:

Feb 17, 2011, 1:53:38 AM (10 years ago)

Author:

sam

Message:

More shader crap. Texture coordinates now work. Still disabled.

Location:

trunk/src

Files:

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

trunk/src/scene.cpp

@@ -139 +139 @@
 #if SHADER_CRAP
     float *vertices = new float[18];
-    vertices[0] = -0.5f; vertices[1] = -0.5f; vertices[2] = 0.0f;
-    vertices[3] = -0.5f; vertices[4] = 0.5f; vertices[5] = 0.0f;
-    vertices[6] = 0.5f; vertices[7] = 0.5f; vertices[8] = 0.0f;
+    vertices[0] = -0.5f; vertices[1] = 0.5f; vertices[2] = 0.0f;
+    vertices[3] = 0.5f; vertices[4] = 0.5f; vertices[5] = 0.0f;
+    vertices[6] = -0.5f; vertices[7] = -0.5f; vertices[8] = 0.0f;
 
     vertices[9] = 0.5f; vertices[10] = -0.5f; vertices[11] = 0.0f;
@@ -148 +148 @@
 
     const GLfloat colors[6][3] = {
-    {  1.0,  0.0,  0.0  },
-    {  0.0,  1.0,  0.0  },
     {  0.0,  0.0,  1.0  },
     {  1.0,  0.0,  0.0  },
     {  0.0,  1.0,  0.0  },
-    {  1.0,  1.0,  0.0  } };
-
-    GLuint id[3];
+    {  1.0,  1.0,  0.0  },
+    {  0.0,  1.0,  0.0  },
+    {  1.0,  0.0,  0.0  } };
+
+    const GLfloat tex[6][2] = {
+    {  0.0,  0.0  },
+    {  1.0,  0.0  },
+    {  0.0,  1.0  },
+    {  1.0,  1.0  },
+    {  0.0,  1.0  },
+    {  1.0,  0.0  } };
+
+    GLuint id[4];
     glGenVertexArrays(1, &id[0]);
     glBindVertexArray(id[0]);
-    glGenBuffers(2, &id[1]);
+    glGenBuffers(3, &id[1]);
 
     glBindBuffer(GL_ARRAY_BUFFER, id[1]);
@@ -170 +178 @@
     glEnableVertexAttribArray(1);
 
+    glBindBuffer(GL_ARRAY_BUFFER, id[3]);
+    glBufferData(GL_ARRAY_BUFFER, 12 * sizeof(GLfloat), tex, GL_STATIC_DRAW);
+    glVertexAttribPointer((GLuint)2, 2, GL_FLOAT, GL_FALSE, 0, 0);
+    glEnableVertexAttribArray(2);
+
     delete[] vertices;
 
     glUseProgram(prog);
     glBindVertexArray(id[0]);
+    Tiler::Bind(1 << 16);
     glDrawArrays(GL_TRIANGLES, 0, 6);
     glBindVertexArray(0);

trunk/src/video.cpp

@@ -43 +43 @@
     "in vec3 in_Position;\n"
     "in vec3 in_Color;\n"
+    "in vec2 in_TexCoord;\n"
     "out vec3 pass_Color;\n"
     "uniform mat4 projection_matrix;\n"
@@ -51 +52 @@
     "{\n"
     "    //gl_Position = projection_matrix * view_matrix * model_matrix * vec4(in_Position, 1.0f);\n"
-    "    gl_Position = 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"
     "}\n";
@@ -58 +60 @@
     "#version 130\n"
     "\n"
+    "uniform sampler2D in_Texture;\n"
     "in vec3 pass_Color;\n"
     "out vec4 out_Color;\n"
@@ -63 +66 @@
     "void main()\n"
     "{\n"
-    "    gl_FragColor = vec4(pass_Color, 1.0);\n"
+    "    gl_FragColor = 0.5 * (texture2D(in_Texture, vec2(gl_TexCoord[0]))\n"
+    "                           + vec4(pass_Color, 1.0));\n"
     "}\n";
 #endif
@@ -107 +111 @@
     glBindAttribLocation(prog, 0, "in_Position");
     glBindAttribLocation(prog, 1, "in_Color");
+    glBindAttribLocation(prog, 2, "in_TexCoord");
     glLinkProgram(prog);
     glValidateProgram(prog);
@@ -123 +128 @@
     float width = GetWidth();
     float height = GetHeight();
-    float near = -width - height;
-    float far = width + height;
+    //float near = -width - height;
+    //float far = width + height;
+    float near = 20.0f;
+    float far = 0.1f;
     projection_matrix = float4x4::perspective(theta, width, height, near, far);
 #else
@@ -187 +194 @@
     view_matrix = float4x4(1.0f);
     view_matrix[3][0] = 0.0f;
-    view_matrix[3][0] = 0.0f;
-    view_matrix[3][0] = -5.0f;
+    view_matrix[3][1] = 0.0f;
+    view_matrix[3][2] = -5.0f;
 
     model_matrix = float4x4(1.0f);
@@ -209 +216 @@
 #endif
 
-    SetFov(0.0f);
+#if SHADER_CRAP
+    static float time;
+    time += 0.01f;
+    SetFov(1.0f + sinf(time));
+#else
+    SetFov(0.5f);
+#endif
 }