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

Timestamp:

Jun 21, 2021, 4:12:08 PM (4 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/asteroid.vert (modified) (3 diffs)

shaders/asteroid.vert

@@ -8 +8 @@
 };
 
-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 @@
 
 void main() {
-   position_eye = vec3(ubo.view * sbo.objects[obj_index].model * vec4(vertex_position, 1.0));
-   normal_eye = normalize(vec3(ubo.view * sbo.objects[obj_index].model * vec4(vertex_normal, 0.0)));
+   position_eye = vec3(camera.view * ubo.objects[obj_index].model * vec4(vertex_position, 1.0));
+   normal_eye = normalize(vec3(camera.view * ubo.objects[obj_index].model * vec4(vertex_normal, 0.0)));
 
-   float hp_percent = sbo.objects[obj_index].hp / 10.0;
+   float hp_percent = ubo.objects[obj_index].hp / 10.0;
    vec3 damage_color = vec3(1.0, 0.0, 0.0);
    color = (vertex_color * hp_percent) + (damage_color * (1.0 - hp_percent));
@@ -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));
 
-   if (sbo.objects[obj_index].deleted) {
+   if (ubo.objects[obj_index].deleted) {
       gl_Position = vec4(0.0, 0.0, 2.0, 1.0);
    } else {
-      gl_Position = ubo.proj * vec4(position_eye, 1.0);
+      gl_Position = camera.proj * vec4(position_eye, 1.0);
    }
 }