Changeset 4f63fa8 in opengl-game

Timestamp:

Aug 2, 2019, 5:17:11 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

2c87504, adcd252

Parents:

fba08f2

Message:

Fix the MVP matrix

Files:

• shaders/shader.frag (modified) (1 diff)
• shaders/shader.vert (modified) (2 diffs)
• vulkan-game-ref.cpp (deleted)
• vulkan-game.cpp (modified) (2 diffs)

shaders/shader.frag

@@ -10 +10 @@
 
 void main() {
-   // outColor = vec4(fragColor, 1.0);
-   // outColor = texture(texSampler, fragTexCoord);
    outColor = vec4(fragColor * texture(texSampler, fragTexCoord).rgb, 1.0);
 }

shaders/shader.vert

@@ -1 +1 @@
 #version 450
 #extension GL_ARB_separate_shader_objects : enable
-
-vec2 positions[3] = vec2[](
-    vec2( 0.0,  0.5),
-    vec2(-0.5, -0.5),
-    vec2( 0.5, -0.5)
-);
 
 layout (binding = 0) uniform UniformBufferObject {
@@ -22 +16 @@
 
 void main() {
-   // gl_Position = ubo.proj * ubo.view * ubo.model * vec4(inPosition, 0.0, 1.0);
-   gl_Position = ubo.proj * ubo.view * ubo.model * vec4(positions[gl_VertexIndex], -5.0, 1.0);
+   gl_Position = ubo.proj * ubo.view * ubo.model * vec4(inPosition, 0.0, 1.0);
    fragColor = inColor;
    fragTexCoord = inTexCoord;

vulkan-game.cpp

@@ -110 +110 @@
 
 const vector<Vertex> vertices = {
-   {{-0.5f, -0.5f}, {1.0f, 0.0f, 0.0f}, {1.0f, 0.0f}},
-   {{ 0.5f, -0.5f}, {0.0f, 1.0f, 0.0f}, {0.0f, 0.0f}},
-   {{ 0.5f,  0.5f}, {0.0f, 0.0f, 1.0f}, {0.0f, 1.0f}},
-   {{-0.5f,  0.5f}, {1.0f, 1.0f, 1.0f}, {1.0f, 1.0f}}
+   {{-0.5f, -0.5f}, {1.0f, 0.0f, 0.0f}, {0.0f, 1.0f}},
+   {{ 0.5f, -0.5f}, {0.0f, 1.0f, 0.0f}, {1.0f, 1.0f}},
+   {{ 0.5f,  0.5f}, {0.0f, 0.0f, 1.0f}, {1.0f, 0.0f}},
+   {{-0.5f,  0.5f}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}}
 };
 
@@ -1466 +1466 @@
          UniformBufferObject ubo = {};
          ubo.model = glm::rotate(glm::mat4(1.0f), time * glm::radians(90.0f), glm::vec3(0.0f, 0.0f, 1.0f));
-         ubo.view = glm::lookAt(glm::vec3(2.0f, 2.0f, 2.0f), glm::vec3(0.0f, 0.0f, 0.0f), glm::vec3(0.0f, 0.0f, 1.0f));
+         ubo.view = glm::lookAt(glm::vec3(0.0f, 2.0f, 2.0f), glm::vec3(0.0f, 0.0f, 0.0f), glm::vec3(0.0f, 1.0f, 0.0f));
          ubo.proj = glm::perspective(glm::radians(45.0f), swapChainExtent.width / (float)swapChainExtent.height, 0.1f, 10.0f);
-         ubo.proj[1][1] *= -1;
-
-         ubo.view = glm::mat4(1.0f);
+         ubo.proj[1][1] *= -1; // flip the y-axis so that +y is up
 
          void* data;