Changeset 1589Tweet

Timestamp:

Jul 8, 2012, 12:25:49 AM (11 years ago)

Author:

sam

Message:

easymesh: the light direction is now a uniform variable.

File:

• trunk/src/easymesh/shiny.lolfx (modified) (6 diffs)

trunk/src/easymesh/shiny.lolfx

@@ -6 +6 @@
 attribute vec3 in_Normal;
 attribute vec4 in_Color;
+
 uniform mat4 in_ModelView;
 uniform mat4 in_Proj;
 uniform mat3 in_NormalMat;
+uniform vec3 in_LightDir = vec3(0.3, 0.3, 0.7);
 uniform float in_Damage;
+
 varying vec4 pass_Color;
 
@@ -20 +23 @@
     /* World properties */
     float ambient_mul = 0.5;
-    vec3 light_dir = normalize(vec3(0.3, 0.3, 0.7));
     vec3 ambient_color = vec3(0.25, 0.2, 0.35);
     vec3 diffuse_color = vec3(1.0, 1.0, 0.6);
@@ -28 +30 @@
     vec4 eye = in_ModelView * vec4(in_Vertex, 1.0);
 
-    vec3 s = light_dir; /* normalize(eye - lightpos); */
+    vec3 s = in_LightDir; /* normalize(eye - lightpos); */
     vec3 v = normalize(-eye.xyz);
     vec3 r = reflect(-s, tnorm);
@@ -65 +67 @@
           uniform float4x4 in_Proj,
           uniform float3x3 in_NormalMat,
+          uniform vec3 in_LightDir = normalize(float3(0.3, 0.3, 0.7))
           uniform float in_Damage,
           out float4 out_Position : POSITION,
@@ -72 +75 @@
     float specular_power = 60.0;
     float ambient_mul = 0.5;
-    float3 light_dir = normalize(float3(0.3, 0.3, 0.7));
     float3 ambient_color = float3(0.25, 0.2, 0.35);
     float3 diffuse_color = float3(1.0, 1.0, 0.6);
@@ -78 +80 @@
     float3 tnorm = normalize(mul(in_NormalMat, in_Normal));
     float4 eye = mul(in_ModelView, float4(in_Vertex, 1.0));
-    float3 s = light_dir;
+    float3 s = in_LightDir;
     float3 v = normalize(-eye.xyz);
     float3 r = reflect(-s, tnorm);