Changeset 1338Tweet

Timestamp:

May 4, 2012, 1:00:30 AM (11 years ago)

Author:

sam

Message:

orbital: rewrite the shader once again.

Location:

trunk/orbital

Files:

• mesh.h (modified) (2 diffs)
• orbital.cpp (modified) (3 diffs)
• particlesystem.h (modified) (1 diff)

trunk/orbital/mesh.h

@@ -91 +91 @@
             "void main(void)"
             "{"
-                 /* Global shit */
-            "    float alpha_mul = 1.0f;"
-
-                 /* Ambient: global constant */
+                 /* Material properties */
+            "    vec3 specular_reflect = vec3(0.8, 0.75, 0.4);"
+            "    float specular_power = 60.f;"
+
+                 /* World properties */
             "    float ambient_mul = 0.5f;"
-
-                 /* Diffuse: the level should decide of these values */
-            "    vec3 diffuse_dir = normalize(vec3(-0.7, -0.7, -0.4));"
-            "    vec4 frontColor = vec4(1.0, 1.0, 1.0, 1.0);"
-            "    vec4 backColor = vec4(0.3, 0.2, 0.0, 1.0);"
-
-            "    vec3 world_normal = normalize(in_NormalMat * in_Normal);"
-            "    float d = dot(world_normal, diffuse_dir);"
-            "    vec2 diffuse_mul = max(vec2(-d, d), 0.0);"
-            "    diffuse_mul[0] = min(diffuse_mul[0] + ambient_mul, 1.0);"
-
-                 /* Specular: global settings */
-            "    vec4 spec_col = vec4(0.8, 0.75, 0.4, 1.0);"
-            "    vec3 spec_dir = normalize(vec3(-0.3, -0.3, -1.8));"
-            "    float spec_exp = 60.f;"
-
-            "    float spec_mul = max(-dot(world_normal, spec_dir), 0.0);"
-            "    spec_mul = clamp(pow(spec_mul, spec_exp), 0.0, 1.0);"
-
-
-            "    vec4 tmpColor = frontColor * in_Color;"
-            "    pass_Color = clamp(diffuse_mul[0] * tmpColor"
-            "                        + diffuse_mul[1] * backColor"
-            "                        + spec_mul * spec_col, 0.0, 1.0);"
-            "    pass_Color.a *= alpha_mul;"
-
-            "    vec4 viewPosition = in_ModelView * vec4(in_Vertex, 1.0);"
-            "    gl_Position = in_Proj * viewPosition;"
+            "    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);"
+            "    vec3 specular_color = vec3(1.0, 1.0, 0.6);"
+
+            "    vec3 tnorm = normalize(in_NormalMat * in_Normal);"
+            "    vec4 eye = in_ModelView * vec4(in_Vertex, 1.0);"
+
+            "    vec3 s = light_dir;" /* normalize(eye - lightpos); */
+            "    vec3 v = normalize(-eye.xyz);"
+            "    vec3 r = reflect(-s, tnorm);"
+
+            "    vec3 ambient = ambient_color;"
+            "    float sdotn = max(dot(s, tnorm), 0.0);"
+            "    vec3 diffuse = diffuse_color * sdotn;"
+            "    vec3 specular = vec3(0.0);"
+            "    if (sdotn > 0.0)"
+            "        specular = specular_color * specular_reflect"
+            "                 * pow(max(dot(r, v), 0.0), specular_power);"
+            "    vec3 light = ambient + diffuse + specular;"
+
+            "    pass_Color = in_Color * vec4(light, 1.0);"
+            "    gl_Position = in_Proj * eye;"
             "}",
 
@@ -142 +138 @@
             "          out float4 pass_Color : COLOR)"
             "{"
-            "    float alpha_mul = 1.0f;"
+            "    float3 specular_reflect = float3(0.8, 0.75, 0.4);"
+            "    float specular_power = 60.f;"
             "    float ambient_mul = 0.5f;"
-            "    float3 diffuse_dir = normalize(float3(-0.7, -0.7, -0.4));"
-            "    float4 frontColor = float4(1.0, 1.0, 1.0, 1.0);"
-            "    float4 backColor = float4(0.3, 0.2, 0.0, 1.0);"
-            "    float3 world_normal = normalize(mul(in_NormalMat, in_Normal));"
-            "    float d = dot(world_normal, diffuse_dir);"
-            "    float2 diffuse_mul = max(float2(-d, d), 0.0);"
-            "    diffuse_mul[0] = min(diffuse_mul[0] + ambient_mul, 1.0);"
-            "    float4 spec_col = float4(0.8, 0.85, 0.4, 1.0);"
-            "    float3 spec_dir = normalize(float3(-0.7, -0.7, 0.4));"
-            "    float spec_exp = 60.0f;"
-            "    float spec_mul = max(-dot(world_normal, spec_dir), 0.0);"
-            "    spec_mul = saturate(pow(spec_mul, spec_exp));"
-            "    float4 tmpColor = frontColor * in_Color;"
-            "    pass_Color = saturate(diffuse_mul[0] * tmpColor"
-            "                           + diffuse_mul[1] * backColor"
-            "                           + spec_mul * spec_col);"
-            "    pass_Color.a *= alpha_mul;"
-            "    float4 viewPosition = mul(in_ModelView, float4(in_Vertex, 1.0));"
-            "    out_Position = mul(in_Proj, viewPosition);"
+            "    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);"
+            "    float3 specular_color = float3(1.0, 1.0, 0.6);"
+            "    float3 tnorm = normalize(mul(in_NormalMat, in_Normal));"
+            "    float4 eye = mul(in_ModelView, float4(in_Vertex, 1.0));"
+            "    float3 s = light_dir;"
+            "    float3 v = normalize(-eye.xyz);"
+            "    float3 r = reflect(-s, tnorm);"
+            "    float3 ambient = ambient_color;"
+            "    float sdotn = max(dot(s, tnorm), 0.0);"
+            "    float3 diffuse = diffuse_color * sdotn;"
+            "    float3 specular = float3(0.0);"
+            "    if (sdotn > 0.0)"
+            "        specular = specular_color * specular_reflect"
+            "                 * pow(max(dot(r, v), 0.0), specular_power);"
+            "    float3 light = ambient + diffuse + specular;"
+            "    pass_Color = in_Color * float4(light, 1.0);"
+            "    out_Position = mul(in_Proj, eye);"
             "}",
 

trunk/orbital/orbital.cpp

@@ -42 +42 @@
     /* Yellow sphere */
     m.SendCommand("sc1,1,0,1,asph10,30,20,24");
-    m.SendCommand("t0,0,-60,fl");
+    m.SendCommand("t0,0,60,fl");
 
     /* Pink box */
     m.SendCommand("sc1,0,1,1,afcb10,10,10,1,rx45,rz45");
-    m.SendCommand("t-20,-20,0,fl");
+    m.SendCommand("t-20,20,0,fl");
 
     /* Large meteor */
@@ -71 +71 @@
     /* Orange fire */
     m.SendCommand("sc1,1,0,1,scb1,0,0,0,at4,1,s1.5,1,4,tz-13,ad6,5.8,1");
-    m.SendCommand("t-40,-40,0,fl");
+    m.SendCommand("t-40,40,0,fl");
 
     /* Lasers */
@@ -83 +83 @@
     Ticker::Ref(m_particlesystem);
 
-    m_camera = new Camera(vec3(0, 200, 300),
+    m_camera = new Camera(vec3(0, 200, 200),
                           vec3(0, 0, 0),
                           vec3(0, 1, 0));

trunk/orbital/particlesystem.h

@@ -17 +17 @@
         m_ready(false)
     {
-        m_mesh.SendCommand("sc.8,.8,.8,1,acg8,2,5,5,1.5,1.5,.1,0,rx15");
+        m_mesh.SendCommand("sc.8,.8,.8,1,acg4,2,5,5,1.5,1.5,.1,0,rx15");
         m_mesh.SendCommand("t0,-100,-30,fl");