Changeset 1260Tweet

Timestamp:

Apr 21, 2012, 6:58:36 PM (11 years ago)

Author:

sam

Message:

orbital: basic lighting in the mesh builder.

Location:

trunk/orbital

Files:

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

trunk/orbital/mesh.h

@@ -33 +33 @@
             "uniform mat4 in_ModelView;"
             "uniform mat4 in_Proj;"
+            "uniform mat3 in_NormalMat;"
             "varying vec4 pass_Color;"
             ""
+            "vec4 Light = vec4(10.0, 1.0, 1.0, 1.0);"
+            "vec3 Kd = vec3(1.0, 0.8, 0.8);"
+            "vec3 Ld = vec3(1.0, 0.8, 0.8);"
+            ""
             "void main(void) {"
-            "    vec4 tmp = in_ModelView * vec4(in_Vertex, 1.0);"
-            "    gl_Position = in_Proj * tmp;"
-            "    pass_Color = in_Color;"
+            "    vec3 tnorm = normalize(in_NormalMat * in_Normal);"
+            "    vec4 Eye = in_ModelView * vec4(in_Vertex, 1.0);"
+            "    vec3 s = normalize((Light - Eye).xyz);"
+            ""
+            "    pass_Color = vec4(Ld * Kd * max(dot(s, tnorm), 0.0), 1.0);"
+            "    gl_Position = in_Proj * Eye;"
             "}",
 
@@ -53 +61 @@
             "          uniform float4x4 in_ModelView,"
             "          uniform float4x4 in_Proj,"
+            "          uniform float3x3 in_NormalMat,"
             "          out float4 out_Position : POSITION,"
             "          out float4 pass_Color : COLOR) {"
-            "    pass_Color = in_Color;"
-            "    float4 tmp = mul(in_ModelView, float4(in_Vertex, 1.0));"
-            "    out_Position = mul(in_Proj, tmp);"
+            "    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);"
+            "    out_Position = mul(in_Proj, Eye);"
             "}",
 
@@ -68 +84 @@
         m_gpu.modelview = m_gpu.shader->GetUniformLocation("in_ModelView");
         m_gpu.proj = m_gpu.shader->GetUniformLocation("in_Proj");
+        m_gpu.normalmat = m_gpu.shader->GetUniformLocation("in_NormalMat");
         m_gpu.coord = m_gpu.shader->GetAttribLocation("in_Vertex",
                                               VertexUsage::Position, 0);
@@ -118 +135 @@
     }
 
-    void Render(mat4 const &modelview, mat4 const &proj)
+    void Render(mat4 const &modelview, mat4 const &proj, mat3 const &normalmat)
     {
         m_gpu.shader->Bind();
         m_gpu.shader->SetUniform(m_gpu.modelview, modelview);
         m_gpu.shader->SetUniform(m_gpu.proj, proj);
+        m_gpu.shader->SetUniform(m_gpu.normalmat, normalmat);
         m_gpu.vdecl->SetStream(m_gpu.vbo, m_gpu.coord, m_gpu.norm, m_gpu.color);
         m_gpu.vdecl->Bind();
@@ -389 +407 @@
         Shader *shader;
         ShaderAttrib coord, norm, color;
-        ShaderUniform modelview, proj;
+        ShaderUniform modelview, proj, normalmat;
         VertexDeclaration *vdecl;
         VertexBuffer *vbo;

trunk/orbital/orbital.cpp

@@ -54 +54 @@
     m_modelview = view * model * anim;
     m_proj = proj;
+    m_normalmat = transpose(inverse(mat3(m_modelview)));
 }
 
@@ -68 +69 @@
     }
 
-    m.Render(m_modelview, m_proj);
+    m.Render(m_modelview, m_proj, m_normalmat);
 }
 

trunk/orbital/orbital.h

@@ -20 +20 @@
     float m_angle;
     mat4 m_modelview, m_proj;
+    mat3 m_normalmat;
 
     bool m_ready;