Changeset 12091 for data/branches/Shader_HS18/programs/Example/GLSL150/HardwareMorphAnimationWithNormalsVp.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/HardwareMorphAnimationWithNormalsVp.glsl (modified) (2 diffs)

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

@@ -7 +7 @@
 in vec4 uv2; // normal2
 
-out vec2 oUv;
 out vec4 colour;
+// out vec2 oUv;
 
 uniform mat4 worldViewProj;
@@ -18 +18 @@
 void main()
 {
-        // interpolate position
-        vec4 posinterp = vec4(vertex.xyz + anim_t.x*(uv1.xyz - vertex.xyz), 1.0);
+    // interpolate position
+    vec4 posinterp = vec4(vertex.xyz + anim_t.x*(uv1.xyz - vertex.xyz), 1.0);
 
     // nlerp normal
-        vec3 ninterp = normal + anim_t.x*(uv2.xyz - normal);
-        ninterp = normalize(ninterp);
+    vec3 ninterp = normal + anim_t.x*(uv2.xyz - normal);
+    ninterp = normalize(ninterp);
 
-        gl_Position = worldViewProj * posinterp;
-        oUv = uv0.xy;
+    gl_Position = worldViewProj * posinterp;
+    // oUv = uv0.xy;
 
-        vec3 lightDir = normalize(
-                objSpaceLightPos.xyz - (posinterp.xyz * objSpaceLightPos.w));
+    vec3 lightDir = normalize(
+        objSpaceLightPos.xyz - (posinterp.xyz * objSpaceLightPos.w));
 
-        // Colour it red to make it easy to identify
-        float lit = clamp(dot(lightDir, ninterp), 0.0, 1.0);
-        colour = vec4((ambient.rgb + vec3(lit,lit,lit)) * vec3(1.0,0.0,0.0), 1.0);
+    // Colour it red to make it easy to identify
+    float lit = clamp(dot(lightDir, ninterp), 0.0, 1.0);
+    colour = vec4((ambient.rgb + vec3(lit,lit,lit)) * vec3(1.0,0.0,0.0), 1.0);
 }