Changeset 2144Tweet

Timestamp:

Dec 18, 2012, 3:29:18 PM (7 years ago)

Author:

touky

Message:

"Point light" Tweak

Location:

trunk/src/easymesh

Files:

• easymesh.cpp (modified) (1 diff)
• shiny.lolfx (modified) (3 diffs)

trunk/src/easymesh/easymesh.cpp

@@ -119 +119 @@
     m_gpu.shader->Bind();
     m_gpu.shader->SetUniform(m_gpu.modelview, modelview);
-    m_gpu.shader->SetUniform(m_gpu.model, model);
+    m_gpu.shader->SetUniform(m_gpu.model, Scene::GetDefault()->GetViewMatrix());
     m_gpu.shader->SetUniform(m_gpu.proj, Scene::GetDefault()->GetProjMatrix());
     m_gpu.shader->SetUniform(m_gpu.normalmat, normalmat);

trunk/src/easymesh/shiny.lolfx

@@ -38 +38 @@
 
 uniform float in_Damage;
+uniform mat4 in_Model;
 
 varying vec4 pass_Eye;
@@ -46 +47 @@
 // FIXME: the light direction should be passed in the code
 vec3 in_LightDir = vec3(0.3, 0.3, 0.7);
-vec3 in_Light2_Pos = vec3(0.0, 100.0, 0.0);
+vec4 in_Light2_Pos = in_Model * vec4(0.0, 0.0, 0.0, 1.0);
 
 void main(void)
@@ -82 +83 @@
 
         //Light calculation for point light
-    s = normalize(pass_TPos.xyz - in_Light2_Pos);
+    s = normalize(pass_Eye.xyz - in_Light2_Pos.xyz); //(pass_TPos.xyz - in_Light2_Pos);
     v = normalize(-pass_Eye.xyz);
     r = reflect(-s, pass_TNormal);