Changeset 22217d4 in opengl-game

Timestamp:

Mar 22, 2020, 10:07:01 PM (4 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

1add0ed

Parents:

0807aeb

Message:

Make the view and projection matrices instaces variables of the VulkanGame class

Files:

• gl-shaders/ship.frag (modified) (1 diff)
• shaders/ship.frag (modified) (1 diff)
• vulkan-game.cpp (modified) (1 diff)
• vulkan-game.hpp (modified) (1 diff)

gl-shaders/ship.frag

@@ -49 +49 @@
   vec3 Is2 = Ls * Ks * specular_factor2;
 
-  frag_color = vec4((Is + Id + Ia + Is2 + Id2 + Ia2)/2, 1.0);
+  frag_color = vec4((Is + Id + Ia + Is2 + Id2 + Ia2) / 2.0, 1.0);
 }

shaders/ship.frag

@@ -57 +57 @@
    vec3 Is2 = Ls * Ks * specular_factor2;
 
-   frag_color = vec4((Is + Id + Ia + Is2 + Id2 + Ia2)/2, 1.0);
+   frag_color = vec4((Is + Id + Ia + Is2 + Id2 + Ia2) / 2.0, 1.0);
 }

vulkan-game.cpp

@@ -568 +568 @@
    mat4 R_view = pitch_mat * yaw_mat;
    mat4 T_view = translate(mat4(1.0f), vec3(-cam_pos.x, -cam_pos.y, -cam_pos.z));
-   mat4 view = R_view * T_view;
-
-   mat4 proj = perspective(radians(FOV_ANGLE), (float)swapChainExtent.width / (float)swapChainExtent.height, NEAR_CLIP, FAR_CLIP);
-   proj[1][1] *= -1; // flip the y-axis so that +y is up
-
-   object_VP_mats.view = view;
-   object_VP_mats.proj = proj;
-
-   ship_VP_mats.view = view;
-   ship_VP_mats.proj = proj;
-
-   asteroid_VP_mats.view = view;
-   asteroid_VP_mats.proj = proj;
+   viewMat = R_view * T_view;
+
+   projMat = perspective(radians(FOV_ANGLE), (float)swapChainExtent.width / (float)swapChainExtent.height, NEAR_CLIP, FAR_CLIP);
+   projMat[1][1] *= -1; // flip the y-axis so that +y is up
+
+   object_VP_mats.view = viewMat;
+   object_VP_mats.proj = projMat;
+
+   ship_VP_mats.view = viewMat;
+   ship_VP_mats.proj = projMat;
+
+   asteroid_VP_mats.view = viewMat;
+   asteroid_VP_mats.proj = projMat;
 }
 

vulkan-game.hpp

@@ -149 +149 @@
 
       bool framebufferResized;
+
+      mat4 viewMat, projMat;
 
       GraphicsPipeline_Vulkan<OverlayVertex, void*> overlayPipeline;