Changeset 12091 for data/branches/Shader_HS18/programs/Example/GLSL150/ParticleGS_DisplayGS.glsl

Timestamp:

Nov 9, 2018, 1:06:05 PM (6 years ago)

Author:

wiesep

Message:

Updated programs and adjusted Material to work with GLSL>150

File:

• data/branches/Shader_HS18/programs/Example/GLSL150/ParticleGS_DisplayGS.glsl (modified) (3 diffs)

data/branches/Shader_HS18/programs/Example/GLSL150/ParticleGS_DisplayGS.glsl

@@ -2 +2 @@
 
 in block {
-        vec3    pos;
-    vec4        color;
-        float   radius;
-} ColoredFirework[];
+    vec3 pos;
+    vec4 colour;
+    float radius;
+} ColouredFirework[];
 
 out block {
-        vec4    pos;
-    vec4        color;
-        vec2    texcoord;
+    vec4 pos;
+    vec4 colour;
+    vec2 texcoord;
 } Firework;
 
@@ -22 +22 @@
 void main()
 {
-        vec3 g_positions[4] = vec3[4](vec3(-1, 1, 0), vec3(-1, -1, 0), vec3(1, 1, 0), vec3(1, -1, 0));
+    vec3 g_positions[4] = vec3[4](vec3(-1, 1, 0), vec3(-1, -1, 0), vec3(1, 1, 0), vec3(1, -1, 0));
     vec2 g_texcoords[4] = vec2[4](vec2(0, 1), vec2(1, 1), vec2(0, 0), vec2(1, 0));
 
@@ -28 +28 @@
     // Emit two new triangles
     //
-    for(int i=0; i<4; i++)
+    for (int i = 0; i < 4; i++)
     {
-                vec3 position = -g_positions[i] * ColoredFirework[0].radius;
-        position = mat3(inverseView) * position + ColoredFirework[0].pos;
+        vec3 position = -g_positions[i] * ColouredFirework[0].radius;
+        position = mat3(inverseView) * position + ColouredFirework[0].pos;
         gl_Position = worldViewProj * vec4(position, 1.0);
 
         Firework.pos = gl_Position;
-        Firework.color = ColoredFirework[0].color;
+        Firework.colour = ColouredFirework[0].colour;
         Firework.texcoord = g_texcoords[i];
         EmitVertex();