Changeset 1693Tweet

Timestamp:

Aug 4, 2012, 2:54:11 PM (11 years ago)

Author:

sam

Message:

easymesh: fix the specular highlight in the OpenGL shader.

Location:

trunk

Files:

• src/easymesh/shiny.lolfx (modified) (1 diff)
• tutorial/05_easymesh.cpp (modified) (2 diffs)

trunk/src/easymesh/shiny.lolfx

@@ -31 +31 @@
     vec4 eye = in_ModelView * vec4(in_Vertex, 1.0);
 
-    vec3 s = in_LightDir; /* normalize(eye - lightpos); */
+    vec3 s = normalize(in_LightDir); /* normalize(eye - lightpos); */
     vec3 v = normalize(-eye.xyz);
     vec3 r = reflect(-s, tnorm);

trunk/tutorial/05_easymesh.cpp

@@ -24 +24 @@
     {
         m_angle = 0;
-        m_mesh.Compile("sc#e94 scb#964 [acap11 6 6 tx8]");
-        m_mesh.Compile("sc#94e scb#649 [acap3 6 6 tx-5 tz-6]");
-        m_mesh.Compile("sc#49e scb#469 [acap31 6 6 tx-5 tz6]");
+        m_mesh.Compile("sc#e94 scb#964 [asph11 7 7 7 tx10]");
+        m_mesh.Compile("sc#94e scb#649 [asph3 7 7 7 tx-6 tz-9]");
+        m_mesh.Compile("sc#49e scb#469 [asph31 7 7 7 tx-6 tz9]");
 
         m_camera = new Camera(vec3(0.f, 600.f, 0.f),
@@ -32 +32 @@
                               vec3(0, 1, 0));
         m_camera->SetPerspective(70.f, 640.f, 480.f, .1f, 1000.f);
-        m_camera->SetTarget(vec3(0.f));
+        m_camera->SetTarget(vec3(0.f, -5.f, 0.f));
         m_camera->SetPosition(vec3(-20.f, 20.f, 0.f));
         Ticker::Ref(m_camera);