Changeset 646f3f2 in opengl-game for explosion.vert

Timestamp:

Jan 30, 2019, 3:10:23 AM (6 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

39ac76d

Parents:

fe5e3ca

Message:

Make explosions render correctly whenever a ship is destroyed.

File:

• explosion.vert (modified) (2 diffs)

explosion.vert

@@ -5 +5 @@
 uniform mat4 view, proj;
 uniform mat4 model_mat;
-
-/*
 layout (std140) uniform models {
   mat4 model_mats[MAX_NUM_OBJECTS];
 };
-*/
 
 uniform float explosion_start_time;
@@ -43 +40 @@
    p += normalize(v_i) * mod(t, duration) / duration * 0.3; // allow time to loop around so particle emitter keeps going
 
-   //gl_Position = proj * view * model_mats[0] * vec4(p, 1.0);
-   gl_Position = proj * view * model_mat * vec4(p, 1.0);
+   //gl_Position = proj * view * model_mats[ubo_index] * vec4(p, 1.0);
+   gl_Position = proj * view * model_mats[0] * vec4(p, 1.0);
    gl_PointSize = 15.0; // size in pixels
 }