Changeset 8e02b6b in opengl-game for shaders/ship.vert

Timestamp:

Nov 22, 2019, 6:27:13 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

f97c5e7

Parents:

683dd55

git-author:

Dmitry Portnoy <dmitry.portnoy@…> (11/22/19 18:26:59)

git-committer:

Dmitry Portnoy <dmitry.portnoy@…> (11/22/19 18:27:13)

Message:

To move to a more generic way of updating the scene, rename updateUniformBuffers() to updateScene() in VulkanGame and move the code to copy the data into a new copyDataToMemory() function in VulkanUtils.

File:

• shaders/ship.vert (modified) (3 diffs)

shaders/ship.vert

@@ -2 +2 @@
 #extension GL_ARB_separate_shader_objects : enable
 
+// TODO: Figure out if the UniformBufferObject label is necessary and, if not, remove it
 layout (binding = 0) uniform UniformBufferObject {
    mat4 model;
@@ -10 +11 @@
 layout(location = 0) in vec3 vertex_position;
 layout(location = 1) in vec3 vertex_color;
+//layout(location = 2) in vec3 vertex_normal;
+//layout(location = 3) in uint ubo_index;
 
 //out vec3 position_eye, normal_eye, color, light_position_eye, light2_position_eye;
@@ -20 +23 @@
 
 void main() {
-  // ORIG: position_eye = vec3(view * model_mats[ubo_index] * vec4(vertex_position, 1.0));
-  position_eye = vec3(ubo.view * ubo.model * vec4(vertex_position, 1.0));
-  //normal_eye = normalize(vec3(view * model_mats[ubo_index] * vec4(vertex_normal, 0.0)));
-  color = vertex_color;
-  //light_position_eye = vec3(view * vec4(light_position_world, 1.0));
-  //light2_position_eye = vec3(view * vec4(light2_position_world, 1.0));
+   //position_eye = vec3(view * model_mats[ubo_index] * vec4(vertex_position, 1.0));
+   position_eye = vec3(ubo.view * ubo.model * vec4(vertex_position, 1.0));
+   //normal_eye = normalize(vec3(view * model_mats[ubo_index] * vec4(vertex_normal, 0.0)));
+   color = vertex_color;
+   //light_position_eye = vec3(view * vec4(light_position_world, 1.0));
+   //light2_position_eye = vec3(view * vec4(light2_position_world, 1.0));
 
-  gl_Position = ubo.proj * vec4(position_eye, 1.0);
+   gl_Position = ubo.proj * vec4(position_eye, 1.0);
 }