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

Timestamp:

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

Author:

wiesep

Message:

Updated programs and adjusted Material to work with GLSL>150

File:

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

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

@@ -4 +4 @@
 // Explanation of different particle types
 //
-#define PT_LAUNCHER 0 //Firework Launcher - launches a PT_SHELL every so many seconds
-#define PT_SHELL    1 //Unexploded shell - flies from the origin and explodes into many PT_EMBERXs
-#define PT_EMBER1   2 //basic particle - after it's emitted from the shell, it dies
-#define PT_EMBER2   3 //after it's emitted, it explodes again into many PT_EMBER1s
-#define PT_EMBER3   4 //just a differently colored ember1
+// Firework Launcher - launches a PT_SHELL every so many seconds.
+#define PT_LAUNCHER 0 
+// Unexploded shell - flies from the origin and explodes into many PT_EMBERX's.
+#define PT_SHELL    1 
+// Basic particle - after it's emitted from the shell, it dies.
+#define PT_EMBER1   2 
+// After it's emitted, it explodes again into many PT_EMBER1's.
+#define PT_EMBER2   3 
+// Just a differently colored ember1.
+#define PT_EMBER3   4 
 #define P_SHELLLIFE 3.0
 #define P_EMBER1LIFE 2.5
@@ -14 +19 @@
 #define P_EMBER3LIFE 2.0
 
-in vec4 position;
-uniform float inTimer;
-uniform float inType;
-uniform vec3 inVelocity;
+in vec3 position;
+// timer
+in float uv0;
+// type
+in float uv1;
+// velocity
+in vec3 uv2;
 
 out block {
-        vec3    pos;
-    vec4        color;
-        float   radius;
-} ColoredFirework;
+    vec3 pos;
+    vec4 colour;
+    float radius;
+} ColouredFirework;
 
 uniform mat4 worldViewProj;
@@ -30 +38 @@
 void main()
 {
+    float inTimer = uv0;
+    float inType = uv1;
+    
     //
     // Pass the point through
     //
-    ColoredFirework.pos = position.xyz; //Multiply by world matrix?
-    ColoredFirework.radius = 1.5;
+    ColouredFirework.pos = position; // Multiply by world matrix?
+    ColouredFirework.radius = 1.5;
     
     //  
-    // calculate the color
+    // calculate the colour
     //
-    if( inType == PT_LAUNCHER )
+    if (inType == PT_LAUNCHER)
     {
-        ColoredFirework.color = vec4(1,0.1,0.1,1);
-        ColoredFirework.radius = 1.0;
+        // red
+        ColouredFirework.colour = vec4(1, 0.1, 0.1, 1);
+        ColouredFirework.radius = 1.0;
     }
-    else if( inType == PT_SHELL )
+    else if (inType == PT_SHELL)
     {
-        ColoredFirework.color = vec4(0.1,1,1,1);
-        ColoredFirework.radius = 1.0;
+        // cyan
+        ColouredFirework.colour = vec4(0.1, 1, 1, 1);
+        ColouredFirework.radius = 1.0;
     }
-    else if( inType == PT_EMBER1 )
+    else if (inType == PT_EMBER1)
     {
-        ColoredFirework.color = vec4(1,1,0.1,1);
-        ColoredFirework.color *= (inTimer / P_EMBER1LIFE );
+        // yellow
+        ColouredFirework.colour = vec4(1, 1, 0.1, 1);
+        ColouredFirework.colour *= (inTimer / P_EMBER1LIFE);
     }
-    else if( inType == PT_EMBER2 )
+    else if (inType == PT_EMBER2)
     {
-        ColoredFirework.color = vec4(1,0.1,1,1);
+        // fuschia
+        ColouredFirework.colour = vec4(1, 0.1, 1, 1);
     }
-    else if( inType == PT_EMBER3 )
+    else if (inType == PT_EMBER3)
     {
-        ColoredFirework.color = vec4(1,0.1,0.1,1);
-        ColoredFirework.color *= (inTimer / P_EMBER3LIFE );
+        // red
+        ColouredFirework.colour = vec4(1, 0.1, 0.1, 1);
+        ColouredFirework.colour *= (inTimer / P_EMBER3LIFE);
     }
 }