Added ShadowRange option

src/graphics/engine/engine.cpp

@@ -119,6 +119,7 @@ CEngine::CEngine(CApplication *app)
     m_shadowMapping = false;
     m_offscreenShadowRendering = false;
     m_qualityShadows = false;
+    m_shadowRange = 0.0f;
     m_totoMode = true;
     m_lensMode = true;
     m_waterMode = true;
@@ -174,16 +175,6 @@ CEngine::CEngine(CApplication *app)
         else if (value == 3) filter = TEX_FILTER_TRILINEAR, mipmaps = true;
     }
 
-    if (CProfile::GetInstance().GetIntProperty("Setup", "MipmapLevel", value))
-    {
-        SetTextureMipmapLevel(value);
-    }
-
-    if (CProfile::GetInstance().GetIntProperty("Setup", "Anisotropy", value))
-    {
-        SetTextureAnisotropyLevel(value);
-    }
-
     if (CProfile::GetInstance().GetIntProperty("Setup", "ShadowMapping", value))
     {
         m_shadowMapping = (value > 0);
@@ -191,12 +182,6 @@ CEngine::CEngine(CApplication *app)
         m_qualityShadows = (value > 2);
     }
 
-    float shadowColor;
-    if (CProfile::GetInstance().GetFloatProperty("Setup", "ShadowColor", shadowColor))
-    {
-        SetShadowColor(shadowColor);
-    }
-
     m_defaultTexParams.format = TEX_IMG_AUTO;
     m_defaultTexParams.mipmap = mipmaps;
     m_defaultTexParams.filter = filter;
@@ -2714,6 +2699,16 @@ bool CEngine::GetShadowColor()
     return m_shadowColor;
 }
 
+void CEngine::SetShadowRange(float value)
+{
+    m_shadowRange = value;
+}
+
+bool CEngine::GetShadowRange()
+{
+    return m_shadowRange;
+}
+
 void CEngine::SetDirty(bool mode)
 {
     m_dirty = mode;
@@ -3566,7 +3561,7 @@ void CEngine::RenderShadowMap()
     m_device->SetRenderState(RENDER_STATE_DEPTH_BIAS, false);
     m_device->SetAlphaTestFunc(COMP_FUNC_GREATER, 0.5f);
     m_device->SetRenderState(RENDER_STATE_DEPTH_BIAS, true);
-    m_device->SetDepthBias(2.0f, 4.0f);
+    m_device->SetDepthBias(1.5f, 16.0f);
 
     m_device->SetViewport(0, 0, m_shadowMap.size.x, m_shadowMap.size.y);
 
@@ -3577,25 +3572,25 @@ void CEngine::RenderShadowMap()
     dir.y = 0.0f;
     dir.Normalize();
 
-    Math::Vector lightOffset = Math::Vector(1.0f, 0.0f, -1.0f);
+    float dist = m_shadowRange;
-    lightOffset.Normalize();
+    float depth = 400.0f;
 
-    float scale = log(m_shadowMap.size.x) / log(2.0f) - 6.5f;
+    if (dist < 0.5f)
-    float dist = 75.0f * scale;
+    {
-    float depth = 2000.0f;
+        float scale = log(m_shadowMap.size.x) / log(2.0f) - 6.5f;
+        dist = 75.0f * scale;
+    }
 
-    Math::Vector pos = m_lookatPt;// +0.25f * dist * dir;// +0.25f * dist * lightOffset;
+    Math::Vector pos = m_lookatPt + 0.25f * dist * dir;
 
     pos.x = round(pos.x);
     pos.y = round(pos.y);
     pos.z = round(pos.z);
 
-    Math::Vector lightPos = pos + Math::Vector(0.0f, -200.0f, 0.0f);
+    Math::Vector lookAt = pos - lightDir;
-
-    Math::Vector lookAt = lightPos - lightDir;
 
     Math::LoadOrthoProjectionMatrix(m_shadowProjMat, -dist, dist, -dist, dist, -depth, depth);
-    Math::LoadViewMatrix(m_shadowViewMat, lightPos, lookAt, worldUp);
+    Math::LoadViewMatrix(m_shadowViewMat, pos, lookAt, worldUp);
 
     Math::Matrix scaleMat;
     Math::LoadScaleMatrix(scaleMat, Math::Vector(1.0f, 1.0f, -1.0f));

src/graphics/engine/engine.h

@@ -1141,11 +1141,17 @@ public:
     //@}
 
     //@{
-    //! Management of shadow mapping
+    //! Management of shadow color
     void            SetShadowColor(float value);
     bool            GetShadowColor();
     //@}
 
+    //@{
+    //! Management of shadow range
+    void            SetShadowRange(float value);
+    bool            GetShadowRange();
+    //@}
+
     //@{
     //! Management mode of toto
     void            SetTotoMode(bool present);
@@ -1471,6 +1477,8 @@ protected:
     bool m_qualityShadows;
     //! Shadow color
     float m_shadowColor;
+    //! Shadow range
+    float m_shadowRange;
 
     //! Map of loaded textures (by name)
     std::map<std::string, Texture> m_texNameMap;

src/ui/maindialog.cpp

@@ -4988,11 +4988,13 @@ void CMainDialog::SetupMemorize()
     GetProfile().SetIntProperty("Setup", "EditIndentMode", m_engine->GetEditIndentMode());
     GetProfile().SetIntProperty("Setup", "EditIndentValue", m_engine->GetEditIndentValue());
 
+    GetProfile().SetIntProperty("Setup", "MipmapLevel", m_engine->GetTextureMipmapLevel());
+    GetProfile().SetIntProperty("Setup", "Anisotropy", m_engine->GetTextureAnisotropyLevel());
+    GetProfile().SetFloatProperty("Setup", "ShadowColor", m_engine->GetShadowColor());
+    GetProfile().SetFloatProperty("Setup", "ShadowRange", m_engine->GetShadowRange());
+
     /* screen setup */
-    if (m_setupFull)
+    GetProfile().SetIntProperty("Setup", "Fullscreen", m_setupFull ? 1 : 0);
-        GetProfile().SetIntProperty("Setup", "Fullscreen", 1);
-    else
-        GetProfile().SetIntProperty("Setup", "Fullscreen", 0);
 
     CList *pl;
     CWindow *pw;
@@ -5249,6 +5251,26 @@ void CMainDialog::SetupRecall()
     {
         m_setupFull = (iValue == 1);
     }
+
+    if ( GetProfile().GetIntProperty("Setup", "MipmapLevel", iValue))
+    {
+        m_engine->SetTextureMipmapLevel(iValue);
+    }
+
+    if (GetProfile().GetIntProperty("Setup", "Anisotropy", iValue))
+    {
+        m_engine->SetTextureAnisotropyLevel(iValue);
+    }
+
+    if (GetProfile().GetFloatProperty("Setup", "ShadowColor", fValue))
+    {
+        m_engine->SetShadowColor(fValue);
+    }
+
+    if (GetProfile().GetFloatProperty("Setup", "ShadowRange", fValue))
+    {
+        m_engine->SetShadowRange(fValue);
+    }
 }