Model Renderer|GL: Ambient light in the model shader

skyjake · Aug 13, 2014 · 3b745b6 · 3b745b6
1 parent 92affc1
commit 3b745b6
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/doomsday/client/include/render/modelrenderer.h b/doomsday/client/include/render/modelrenderer.h
@@ -84,6 +84,8 @@ class ModelRenderer
                            de::Matrix4f const &modelToLocal,
                            de::Matrix4f const &localToView);
 
+    void setAmbientLight(de::Vector3f const &ambientIntensity);
+
     void clearLights();
 
     void addLight(de::Vector3f const &direction, de::Vector3f const &intensity);

diff --git a/doomsday/client/net.dengine.client.pack/renderer.pack/shaders/model.dei b/doomsday/client/net.dengine.client.pack/renderer.pack/shaders/model.dei
@@ -59,6 +59,7 @@ group model {
             }"
         fragment = "
             uniform sampler2D uTex;
+            uniform highp vec4 uAmbientLight;
             uniform highp vec4 uLightIntensities[4];
 
             varying highp vec2 vUV;
@@ -92,7 +93,8 @@ group model {
                 highp vec4 diffuse = texture2D(uTex, vUV);
 
                 gl_FragColor = diffuse *
-                    (diffuseLight(0, normal) + 
+                    (uAmbientLight + 
+                     diffuseLight(0, normal) + 
                      diffuseLight(1, normal) + 
                      diffuseLight(2, normal) + 
                      diffuseLight(3, normal));

diff --git a/doomsday/client/src/render/modelrenderer.cpp b/doomsday/client/src/render/modelrenderer.cpp
@@ -47,6 +47,7 @@ DENG2_PIMPL(ModelRenderer)
     GLUniform uMvpMatrix        { "uMvpMatrix",        GLUniform::Mat4 };
     GLUniform uTex              { "uTex",              GLUniform::Sampler2D };
     GLUniform uEyeDir           { "uEyeDir",           GLUniform::Vec3 };
+    GLUniform uAmbientLight     { "uAmbientLight",     GLUniform::Vec4 };
     GLUniform uLightDirs        { "uLightDirs",        GLUniform::Vec3Array, MAX_LIGHTS };
     GLUniform uLightIntensities { "uLightIntensities", GLUniform::Vec4Array, MAX_LIGHTS };
     Matrix4f inverseLocal;
@@ -65,6 +66,7 @@ DENG2_PIMPL(ModelRenderer)
                 << uMvpMatrix
                 << uTex
                 << uEyeDir
+                << uAmbientLight
                 << uLightDirs
                 << uLightIntensities;
 
@@ -247,6 +249,11 @@ void ModelRenderer::setTransformation(Vector3f const &eyeDir, Matrix4f const &mo
     d->uEyeDir      = (d->inverseLocal * eyeDir).normalize();
 }
 
+void ModelRenderer::setAmbientLight(Vector3f const &ambientIntensity)
+{
+    d->uAmbientLight = Vector4f(ambientIntensity, 1.f);
+}
+
 void ModelRenderer::clearLights()
 {
     d->lightCount = 0;

diff --git a/doomsday/client/src/render/rend_model.cpp b/doomsday/client/src/render/rend_model.cpp
@@ -1164,7 +1164,8 @@ void Rend_DrawModel2(vissprite_t const &spr)
     // Set up a suitable matrix for the pose.
     rend.setTransformation(vOrigin - spr.pose.mid().xzy(), localMat, viewMat);
 
-    // Lighting vectors and ambient color.
+    // Ambient color and lighting vectors.
+    rend.setAmbientLight(spr.light.ambientColor * .8f);
     rend.clearLights();
     VL_ListIterator(spr.light.vLightListIdx, [&rend] (VectorLight const *light, void *) -> int {
         // Use this when drawing the model.