Changeset 1263Tweet

Timestamp:

Apr 21, 2012, 9:45:02 PM (9 years ago)

Author:

sam

Message:

orbital: fix syntax errors in the HLSL shader.

File:

• trunk/orbital/mesh.h (modified) (2 diffs)

trunk/orbital/mesh.h

@@ -19 +19 @@
     {
         m_vert_cursor = m_vert.Count();
+        ComputeQuadNormals(m_quadidx_cursor,
+                           m_quadidx.Count() - m_quadidx_cursor);
         m_quadidx_cursor = m_quadidx.Count();
+        ComputeTriNormals(m_triidx_cursor,
+                          m_triidx.Count() - m_triidx_cursor);
         m_triidx_cursor = m_triidx.Count();
     }
@@ -64 +68 @@
             "          out float4 out_Position : POSITION,"
             "          out float4 pass_Color : COLOR) {"
-            "    float4x4 Light = float4x4(10.0, 1.0, 1.0, 1.0);"
-            "    float3x3 Kd = float3x3(1.0, 0.8, 0.8);"
-            "    float3x3 Ld = float3x3(1.0, 0.8, 0.8);"
-            ""
-            "    float3x3 tnorm = normalize(mul(in_NormalMat, in_Normal));"
-            "    float4x4 Eye = mul(in_ModelView, float4x4(in_Vertex, 1.0));"
-            "    float3x3 s = normalize((Light - Eye).xyz);"
-            ""
-            "    pass_Color = float4x4(Ld * Kd * max(dot(s, tnorm), 0.0), 1.0);"
+            "    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);"
             "}",