Changeset 2b40f48 in opengl-game for shaders

Timestamp:

Dec 5, 2019, 5:48:59 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

7c929fc

Parents:

785333b (diff), cf727ca (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into hotfix/ship-shader-lights

File:

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

shaders/ship.vert

@@ -18 +18 @@
 layout(location = 1) in vec3 vertex_color;
 layout(location = 2) in vec3 vertex_normal;
-//layout(location = 3) in uint ubo_index;
+layout(location = 3) in uint obj_index;
 
 layout(location = 0) out vec3 position_eye;
@@ -33 +33 @@
 // Check Anton's book to see how to fix this
 void main() {
-   position_eye = vec3(ubo.view * sbo.objects[0].model * vec4(vertex_position, 1.0));
-   //position_eye = vec3(view * model_mats[ubo_index] * vec4(vertex_position, 1.0));
+   position_eye = vec3(ubo.view * sbo.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[0].model * vec4(vertex_normal, 0.0)));
-   //normal_eye = normalize(vec3(view * model_mats[ubo_index] * vec4(vertex_normal, 0.0)));
+   normal_eye = normalize(vec3(ubo.view * sbo.objects[obj_index].model * vec4(vertex_normal, 0.0)));
    color = vertex_color;
    light_position_eye = vec3(ubo.view * vec4(light_position_world, 1.0));