Changeset 67527a5 in opengl-game for shaders/ship.vert

Timestamp:

Jun 21, 2021, 4:12:08 PM (3 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

27e580e

Parents:

b01b50c

git-author:

Dmitry Portnoy <dportnoy@…> (06/21/21 15:13:03)

git-committer:

Dmitry Portnoy <dportnoy@…> (06/21/21 16:12:08)

Message:

Switch all per-object buffers to be dynamic uniform buffers instead of shader storage buffers

File:

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

shaders/ship.vert

@@ -6 +6 @@
 };
 
-layout (binding = 0) uniform UniformBufferObject {
+layout (binding = 0) uniform camera_block {
    mat4 view;
    mat4 proj;
+} camera;
+
+layout(binding = 1) uniform ubo_block {
+   Object objects[1024];
 } ubo;
-
-layout(binding = 1) readonly buffer StorageBufferObject {
-   Object objects[];
-} sbo;
 
 layout(location = 0) in vec3 vertex_position;
@@ -35 +35 @@
 // Check Anton's book to see how to fix this
 void main() {
-   position_eye = vec3(ubo.view * sbo.objects[obj_index].model * vec4(vertex_position, 1.0));
+   position_eye = vec3(camera.view * ubo.objects[obj_index].model * vec4(vertex_position, 1.0));
 
    // Using 0.0 instead of 1.0 means translations won't effect the normal
-   normal_eye = normalize(vec3(ubo.view * sbo.objects[obj_index].model * vec4(vertex_normal, 0.0)));
+   normal_eye = normalize(vec3(camera.view * ubo.objects[obj_index].model * vec4(vertex_normal, 0.0)));
 
    color = vertex_color;
@@ -44 +44 @@
    fragTexCoord = inTexCoord;
 
-   light_position_eye = vec3(ubo.view * vec4(light_position_world, 1.0));
-   light2_position_eye = vec3(ubo.view * vec4(light2_position_world, 1.0));
+   light_position_eye = vec3(camera.view * vec4(light_position_world, 1.0));
+   light2_position_eye = vec3(camera.view * vec4(light2_position_world, 1.0));
 
-   gl_Position = ubo.proj * vec4(position_eye, 1.0);
+   gl_Position = camera.proj * vec4(position_eye, 1.0);
 }