Changeset 2289Tweet

Timestamp:

Jan 28, 2013, 2:23:57 PM (10 years ago)

Author:

sam

Message:

easymesh: interface the shiny shader with new Light objects.

Location:

trunk

Files:

• src/Makefile.am (modified) (1 diff)
• src/core.h (modified) (1 diff)
• src/easymesh/easymesh.cpp (modified) (2 diffs)
• src/easymesh/easymesh.h (modified) (1 diff)
• src/easymesh/shiny.lolfx (modified) (5 diffs)
• src/entity.h (modified) (1 diff)
• src/light.cpp (added)
• src/light.h (added)
• src/lolcore.vcxproj (modified) (2 diffs)
• src/lolcore.vcxproj.filters (modified) (2 diffs)
• src/scene.cpp (modified) (9 diffs)
• src/scene.h (modified) (2 diffs)
• tutorial/05_easymesh.cpp (modified) (3 diffs)

trunk/src/Makefile.am

@@ -15 +15 @@
     worldentity.cpp worldentity.h gradient.cpp gradient.h gradient.lolfx \
     platform.cpp platform.h sprite.cpp sprite.h camera.cpp camera.h \
+    light.cpp light.h \
     \
     lol/base/log.h lol/base/array.h lol/base/types.h lol/base/array.h \

trunk/src/core.h

@@ -117 +117 @@
 
 #include "camera.h"
+#include "light.h"
 #include "emitter.h"
 #include "font.h"

trunk/src/easymesh/easymesh.cpp

@@ -80 +80 @@
     m_gpu.normalmat = m_gpu.shader->GetUniformLocation("in_NormalMat");
     m_gpu.damage = m_gpu.shader->GetUniformLocation("in_Damage");
+    m_gpu.lights = m_gpu.shader->GetUniformLocation("u_Lights");
     m_gpu.coord = m_gpu.shader->GetAttribLocation("in_Vertex",
                                           VertexUsage::Position, 0);
@@ -126 +127 @@
 
     m_gpu.shader->Bind();
+
+    /* FIXME: this should be hidden in the shader */
+    /* FIXME: the 4th component of the position can be used for other things */
+    Array<Light *> const lights = Scene::GetDefault()->GetLights();
+    Array<vec4> light_data;
+    for (int i = 0; i < lights.Count(); ++i)
+        light_data << lights[i]->GetPosition() << lights[i]->GetColor();
+    while (light_data.Count() < 8)
+        light_data << vec4(0.f) << vec4(0.f);
+    m_gpu.shader->SetUniform(m_gpu.lights, light_data);
+
     m_gpu.shader->SetUniform(m_gpu.modelview, modelview);
     m_gpu.shader->SetUniform(m_gpu.view, Scene::GetDefault()->GetViewMatrix());

trunk/src/easymesh/easymesh.h

@@ -120 +120 @@
         Shader *shader;
         ShaderAttrib coord, norm, color;
-        ShaderUniform modelview, view, invview, proj, normalmat, damage;
+        ShaderUniform modelview, view, invview, proj, normalmat, damage, lights;
         VertexDeclaration *vdecl;
         VertexBuffer *vbo;

trunk/src/easymesh/shiny.lolfx

@@ -39 +39 @@
 uniform mat4 in_Inv_View;
 
+uniform vec4 u_Lights[8 * 2];
+
 varying vec4 pass_Vertex; /* View space */
 varying vec3 pass_TNormal;
 varying vec4 pass_Color;
 
-// FIXME: all the light parameters should be passed in the code
-//Dir Light
-vec3 in_LightDir = vec3(-0.3, -0.3, -0.7);
-
-//Point Light
-vec4 in_Light2_Pos = vec4(20.0, 10.0, 0.0, 1.0);
-float in_Light2_Radius = 20.0;
-vec3 in_Light2_diffuse = vec3(0.4, 0.4, 1.0);
-
+#if 0
 //Cube Light
 vec4 in_Light3_Pos = vec4(-10.0, 10.0, 5.0, 1.0);
@@ -57 +51 @@
 vec3 in_Light3_Size_Outer = vec3(15.0, 15.0, 15.0);
 vec3 in_Light3_diffuse = vec3(0.4, 1.0, 0.4);
+#endif
 
 void main(void)
@@ -65 +60 @@
 
     /* World properties */
-    float ambient_mul = 0.5;
-    vec3 ambient_color = vec3(0.0, 0.0, 0.0);
-    vec3 diffuse_color = vec3(0.4, 0.4, 0.4);
-    vec3 specular_color = vec3(1.0, 1.0, 0.6);
-
-    vec3 ambient = ambient_color;
+    vec3 ambient = vec3(0.1, 0.1, 0.1);
     vec3 specular = vec3(0.0, 0.0, 0.0);
     vec3 diffuse = vec3(0.0, 0.0, 0.0);
-    vec3 s = vec3(0.0, 0.0, 0.0);
-    vec3 v = vec3(0.0, 0.0, 0.0);
-    vec3 r = vec3(0.0, 0.0, 0.0);
-    float sdotn = 0.0;
-    float light_radius_mod = 0.0;
 
-    //Light calculation for directional light
-    s = normalize(-in_LightDir);
-    v = normalize(-pass_Vertex.xyz);
-    r = reflect(s, pass_TNormal);
+    /* Light precalculations */
+    vec3 v = normalize(-pass_Vertex.xyz);
 
-    sdotn = max(dot(s, pass_TNormal), 0.0);
-    diffuse += diffuse_color * sdotn;
-    if (sdotn > 0.0)
-        specular += specular_color * specular_reflect
-                 * pow(max(dot(r, v), 0.0), specular_power);
-    //----------
+    /* Apply lighting */
+    for (int i = 0; i < 8; i++)
+    {
+        vec4 pos = u_Lights[i * 2];
+        vec4 color = u_Lights[i * 2 + 1];
+        vec3 s, r;
 
-    //Light calculation for point light
-    vec3 tmpLightDir = (in_View * in_Light2_Pos).xyz - pass_Vertex.xyz;
-    light_radius_mod = max(0.0, 1.0 - (length(tmpLightDir) / in_Light2_Radius));
-    s = normalize(tmpLightDir);
-    v = normalize(-pass_Vertex.xyz);
-    r = reflect(-s, pass_TNormal);
+        if (pos.w > 0.0)
+        {
+            /* Point light -- no attenuation yet */
+            s = normalize((in_View * pos).xyz - pass_Vertex.xyz);
+            r = reflect(-s, pass_TNormal);
+        }
+        else
+        {
+            /* Directional light */
+            s = normalize(-pos.xyz);
+            r = reflect(s, pass_TNormal);
+        }
 
-    sdotn = max(dot(s, pass_TNormal), 0.0);
-    diffuse += in_Light2_diffuse * min(sdotn, light_radius_mod);
-    if (sdotn > 0.0 && light_radius_mod > 0.0)
-        specular += specular_color * min(specular_reflect, light_radius_mod)
-                 * pow(max(dot(r, v), 0.0), specular_power);
-    //----------
+        float sdotn = max(dot(s, pass_TNormal), 0.0);
+        diffuse += color.xyz * sdotn;
+        if (sdotn > 0.0)
+            specular += color.xyz * specular_reflect
+                         * pow(max(dot(r, v), 0.0), specular_power);
+    }
 
+#if 0
     //Light calculation for cube light
+    vec3 specular_color = vec3(1.0, 1.0, 0.6);
     vec3 Local_Vertex = (in_Inv_View * pass_Vertex).xyz - (in_Light3_Pos).xyz;
     vec3 Proj_Vertex = clamp(Local_Vertex.xyz, -in_Light3_Size_Inner, in_Light3_Size_Inner);
@@ -111 +102 @@
 
     vec3 light_radius = max(vec3(0.0,0.0,0.0), vec3(1.0,1.0,1.0) - abs(new_LightDir / in_Light3_Size_Outer));
-    light_radius_mod = min(light_radius.x, min(light_radius.y, light_radius.z));
+    float light_radius_mod = min(light_radius.x, min(light_radius.y, light_radius.z));
 
     if (length(new_LightDir) == 0.0)
@@ -126 +117 @@
     diffuse += in_Light3_diffuse * min(sdotn, light_radius_mod);
     //----------
+#endif
 
     vec3 light = ambient + diffuse + specular;
 
-    vec4 real_color = in_Damage * vec4(1.2, 1.2, 1.2, 1.0)
-                    + (1.0 - in_Damage) * pass_Color;
+    vec4 real_color = mix(pass_Color, vec4(1.2, 1.2, 1.2, 1.0), in_Damage);
     gl_FragColor = real_color * vec4(light, 1.0);
 }

trunk/src/entity.h

@@ -60 +60 @@
     {
         DRAWGROUP_BEFORE = GAMEGROUP_END,
+        DRAWGROUP_LIGHT,
         DRAWGROUP_CAMERA,
         DRAWGROUP_DEFAULT,

trunk/src/lolcore.vcxproj

@@ -274 +274 @@
     <ClCompile Include="input\stick.cpp" />
     <ClCompile Include="layer.cpp" />
+    <ClCompile Include="light.cpp" />
     <ClCompile Include="map.cpp" />
     <ClCompile Include="math\geometry.cpp" />
@@ -584 +585 @@
     <ClInclude Include="input\stick.h" />
     <ClInclude Include="layer.h" />
+    <ClInclude Include="light.h" />
     <ClInclude Include="loldebug.h" />
     <ClInclude Include="lolgl.h" />

trunk/src/lolcore.vcxproj.filters

@@ -190 +190 @@
       <Filter>...</Filter>
     </ClCompile>
+    <ClCompile Include="light.cpp">
+      <Filter>...</Filter>
+    </ClCompile>
     <ClCompile Include="ticker.cpp">
       <Filter>...</Filter>
@@ -775 +778 @@
     </ClInclude>
     <ClInclude Include="layer.h">
+      <Filter>...</Filter>
+    </ClInclude>
+    <ClInclude Include="light.h">
       <Filter>...</Filter>
     </ClInclude>

trunk/src/scene.cpp

@@ -62 +62 @@
     mat4 m_proj_matrix;
 
-    Array<Tile> tiles;
+    Array<Tile> m_tiles;
+    Array<Light *> m_lights;
 
     Shader *m_shader;
@@ -114 +115 @@
         delete data->bufs[i];
     data->bufs.Empty();
+    data->m_lights.Empty();
 }
 
@@ -147 +149 @@
     t.scale = scale;
 
-    data->tiles.Push(t);
+    data->m_tiles.Push(t);
+}
+
+void Scene::AddLight(Light *l)
+{
+    data->m_lights.Push(l);
+}
+
+Array<Light *> const &Scene::GetLights() const
+{
+    return data->m_lights;
 }
 
@@ -153 +165 @@
 {
     /* Early exit if nothing needs to be rendered */
-    if (!data->tiles.Count())
+    if (!data->m_tiles.Count())
         return;
 
@@ -161 +173 @@
 #if 0
     // Randomise, then sort.
-    for (int i = 0; i < data->tiles.Count(); i++)
+    for (int i = 0; i < data->m_tiles.Count(); i++)
     {
-        Tile tmp = data->tiles[i];
-        int j = rand() % data->tiles.Count();
-        data->tiles[i] = data->tiles[j];
-        data->tiles[j] = tmp;
+        Tile tmp = data->m_tiles[i];
+        int j = rand() % data->m_tiles.Count();
+        data->m_tiles[i] = data->m_tiles[j];
+        data->m_tiles[j] = tmp;
     }
 #endif
-    qsort(&data->tiles[0], data->tiles.Count(),
+    qsort(&data->m_tiles[0], data->m_tiles.Count(),
           sizeof(Tile), SceneData::Compare);
 
@@ -220 +232 @@
 #endif
 
-    for (int buf = 0, i = 0, n; i < data->tiles.Count(); i = n, buf += 2)
+    for (int buf = 0, i = 0, n; i < data->m_tiles.Count(); i = n, buf += 2)
     {
         /* Count how many quads will be needed */
-        for (n = i + 1; n < data->tiles.Count(); n++)
-            if (data->tiles[i].tileset != data->tiles[n].tileset)
+        for (n = i + 1; n < data->m_tiles.Count(); n++)
+            if (data->m_tiles[i].tileset != data->m_tiles[n].tileset)
                 break;
 
@@ -238 +250 @@
         for (int j = i; j < n; j++)
         {
-            data->tiles[i].tileset->BlitTile(data->tiles[j].id,
-                            data->tiles[j].pos, data->tiles[j].o,
-                            data->tiles[j].scale,
+            data->m_tiles[i].tileset->BlitTile(data->m_tiles[j].id,
+                            data->m_tiles[j].pos, data->m_tiles[j].o,
+                            data->m_tiles[j].scale,
                             vertex + 18 * (j - i), texture + 12 * (j - i));
         }
@@ -248 +260 @@
 
         /* Bind texture */
-        data->tiles[i].tileset->Bind();
+        data->m_tiles[i].tileset->Bind();
 
         /* Bind vertex and texture coordinate buffers */
@@ -258 +270 @@
         data->m_vdecl->DrawElements(MeshPrimitive::Triangles, 0, (n - i) * 6);
         data->m_vdecl->Unbind();
-        data->tiles[i].tileset->Unbind();
+        data->m_tiles[i].tileset->Unbind();
     }
 
-    data->tiles.Empty();
+    data->m_tiles.Empty();
 
     data->m_shader->Unbind();

trunk/src/scene.h

@@ -20 +20 @@
 
 #include "tileset.h"
+#include "light.h"
 
 namespace lol
@@ -46 +47 @@
     void AddTile(TileSet *tileset, int id, vec3 pos, int o, vec2 scale);
 
+    void AddLight(Light *light);
+    Array<Light *> const &GetLights() const;
+
 private:
     SceneData *data;

trunk/tutorial/05_easymesh.cpp

@@ -55 +55 @@
         Ticker::Ref(m_camera);
 
+        /* Add a white directional light */
+        m_light1 = new Light();
+        m_light1->SetPosition(vec4(0.2f, 0.2f, 0.f, 0.f));
+        m_light1->SetColor(vec4(0.5f, 0.5f, 0.5f, 1.f));
+        Ticker::Ref(m_light1);
+
+        /* Add an orangeish point light */
+        m_light2 = new Light();
+        m_light2->SetPosition(vec4(-15.f, 15.f, 15.f, 1.f));
+        m_light2->SetColor(vec4(0.4f, 0.3f, 0.2f, 1.f));
+        Ticker::Ref(m_light2);
+
         m_ready = false;
     }
@@ -61 +73 @@
     {
         Ticker::Unref(m_camera);
+        Ticker::Unref(m_light1);
+        Ticker::Unref(m_light2);
     }
 
@@ -115 +129 @@
     mat4 m_mat;
     Camera *m_camera;
+    Light *m_light1, *m_light2;
 
     bool m_ready;