Changeset 1275Tweet

Timestamp:

Apr 22, 2012, 5:22:26 PM (11 years ago)

Author:

sam

Message:

orbital: port the current shader to HLSL (together with its bugs for now).

Location:

trunk/orbital

Files:

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

trunk/orbital/mesh.h

@@ -56 +56 @@
             else CASE("ascb") { p = GetArg(p, v3, f1); AppendSmoothChamfBox(v3, f1); }
             else CASE("afcb") { p = GetArg(p, v3, f1); AppendFlatChamfBox(v3, f1); }
-            else CASE("asph") { p = GetArg(p, v3, f1); AppendSphere(v3, f1); }
+            else CASE("asph") { p = GetArg(p, v3, f1); AppendSphere(v3, (int)f1); }
             else CASE("as")  { p = GetArg(p, f1, f2, f3, f4, f5); AppendStar((int)f1, f2, f4, (int)f5, (int)f5); }
             else CASE("aes") { /* TODO */ }
             else CASE("ad")  { p = GetArg(p, f1, f2, f3); AppendDisc((int)f1, f2, (int)f3); }
-            else CASE("at")  { p = GetArg(p, f1, f2); AppendSimpleTriangle(f1, f2); }
-            else CASE("aq")  { p = GetArg(p, f1, f2); AppendSimpleQuad(f1, f2); }
+            else CASE("at")  { p = GetArg(p, f1, f2); AppendSimpleTriangle(f1, (int)f2); }
+            else CASE("aq")  { p = GetArg(p, f1, f2); AppendSimpleQuad(f1, (int)f2); }
             else CASE("acg") { /* TODO */ }
             else CASE("irb") { MeshConvert(); }
@@ -208 +208 @@
             "          uniform float3x3 in_NormalMat,"
             "          out float4 out_Position : POSITION,"
-            "          out float4 pass_Color : COLOR) {"
-            "    float4 Light = float4(10.0, 1.0, 1.0, 1.0);"
-            "    float3 Kd = float3(1.0, 0.8, 0.8);"
-            "    float3 Ld = float3(1.0, 0.8, 0.8);"
-            ""
-            "    float3 tnorm = normalize(mul(in_NormalMat, in_Normal));"
-            "    float4 Eye = mul(in_ModelView, float4(in_Vertex, 1.0));"
-            "    float3 s = normalize((Light - Eye).xyz);"
-            ""
-            "    pass_Color = float4(Ld * Kd * max(dot(s, tnorm), 0.0), 1.0);"
-            "    out_Position = mul(in_Proj, Eye);"
+            "          out float4 pass_Color : COLOR)"
+            "{"
+            "    float alpha_mul = 1.0f;"
+            "    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);"
             "}",
 

trunk/orbital/orbital.cpp

@@ -51 +51 @@
 
     mat4 anim = mat4::rotate(m_angle, vec3(0, 1, 0))
-              * mat4::rotate(m_angle * 0.25, vec3(0, 0, 1));
+              * mat4::rotate(m_angle * 0.25f, vec3(0, 0, 1));
     mat4 model = mat4::translate(vec3(0, 0, -4.5))
                * mat4::scale(vec3(0.025));