diff options
| author | Thomas Szepe <HG1_public@gmx.net> | 2015-03-23 23:36:08 +0300 |
|---|---|---|
| committer | Thomas Szepe <HG1_public@gmx.net> | 2015-03-23 23:36:08 +0300 |
| commit | 2affbb437bd3cbf3e1a502bd65a5eefb64a92b9b (patch) | |
| tree | 2403ce2b95eb97249251d24ca035d389864c307f /source/gameengine/Ketsji/KX_KetsjiEngine.cpp | |
| parent | 38321faa8d111ec51ebdeb7f2e939062d5e080a1 (diff) | |
BGE: Multitexture world (mist, ambient) fix
This patch fix the existing word API for mist and global ambient lighting.
Add deprecated message to disableMist()
Add setUseMist(enable).
Reviewers: dfelinto, campbellbarton, moguri
Reviewed By: moguri
Subscribers: solarlune, jta, brecht
Projects: #bf_blender:_next
Differential Revision: https://developer.blender.org/D148
Diffstat (limited to 'source/gameengine/Ketsji/KX_KetsjiEngine.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/KX_KetsjiEngine.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp index e453b757b7e..44b667e15e0 100644 --- a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp +++ b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp @@ -985,15 +985,14 @@ void KX_KetsjiEngine::SetWorldSettings(KX_WorldInfo* wi) { if (wi->hasWorld()) { - // ... - m_rasterizer->SetAmbientColor( - wi->getAmbientColorRed(), - wi->getAmbientColorGreen(), - wi->getAmbientColorBlue() - ); - if (m_rasterizer->GetDrawingMode() >= RAS_IRasterizer::KX_SOLID) { + m_rasterizer->SetAmbientColor( + wi->getAmbientColorRed(), + wi->getAmbientColorGreen(), + wi->getAmbientColorBlue() + ); + if (wi->hasMist()) { m_rasterizer->SetFog( @@ -1003,6 +1002,10 @@ void KX_KetsjiEngine::SetWorldSettings(KX_WorldInfo* wi) wi->getMistColorGreen(), wi->getMistColorBlue() ); + m_rasterizer->EnableFog(true); + } + else { + m_rasterizer->EnableFog(false); } } } |