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

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

@@ -6 +6 @@
 in vec4 uv1; // pos2
 
-out vec2 oUv;
+// out vec2 oUv;
 out vec4 colour;
 
@@ -16 +16 @@
 {
         // interpolate
-        vec4 interp = vec4(vertex.xyz + anim_t.x*(uv1.xyz - vertex.xyz), 1.0);
+        vec4 interp = vec4(vertex.xyz + anim_t.x * (uv1.xyz - vertex.xyz), 1.0);
         
         gl_Position = worldViewProj * interp;
-        oUv = uv0.xy;
-        colour = vec4(1.0,0.0,0.0,1.0);
+        // oUv = uv0.xy;
+        colour = vec4(1.0, 0.0, 0.0, 1.0);
 }