teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

improved composite map, now adapts to the ambient/diffuse light

Browse source
This commit is contained in:
scrawl 2012-02-28 22:04:44 +01:00
parent f2c3616638
commit be5555956c
3 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/openmw/mwrender/renderingmanager.cpp
View file

@ -232,17 +232,17 @@ void RenderingManager::setAmbientMode()
{ {
case 0: case 0:
mRendering.getScene()->setAmbientLight(mAmbientColor); setAmbientColour(mAmbientColor);
break; break;
case 1: case 1:
mRendering.getScene()->setAmbientLight(0.7f*mAmbientColor + 0.3f*ColourValue(1,1,1)); setAmbientColour(0.7f*mAmbientColor + 0.3f*ColourValue(1,1,1));
break; break;
case 2: case 2:
mRendering.getScene()->setAmbientLight(ColourValue(1,1,1)); setAmbientColour(ColourValue(1,1,1));
break; break;
} }
} }
@ -297,11 +297,13 @@ void RenderingManager::skipAnimation (const MWWorld::Ptr& ptr)
void RenderingManager::setSunColour(const Ogre::ColourValue& colour) void RenderingManager::setSunColour(const Ogre::ColourValue& colour)
{ {
mSun->setDiffuseColour(colour); mSun->setDiffuseColour(colour);
mTerrainManager->setDiffuse(colour);
} }
void RenderingManager::setAmbientColour(const Ogre::ColourValue& colour) void RenderingManager::setAmbientColour(const Ogre::ColourValue& colour)
{ {
mRendering.getScene()->setAmbientLight(colour); mRendering.getScene()->setAmbientLight(colour);
mTerrainManager->setAmbient(colour);
} }
void RenderingManager::sunEnable() void RenderingManager::sunEnable()

14
apps/openmw/mwrender/terrain.cpp
View file

@ -73,6 +73,20 @@ namespace MWRender
OGRE_DELETE mTerrainGroup; OGRE_DELETE mTerrainGroup;
OGRE_DELETE mTerrainGlobals; OGRE_DELETE mTerrainGlobals;
} }
//----------------------------------------------------------------------------------------------
void TerrainManager::setDiffuse(const Ogre::ColourValue& diffuse)
{
mTerrainGlobals->setCompositeMapDiffuse(diffuse);
}
//----------------------------------------------------------------------------------------------
void TerrainManager::setAmbient(const Ogre::ColourValue& ambient)
{
mTerrainGlobals->setCompositeMapAmbient(ambient);
}
//---------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------

3
apps/openmw/mwrender/terrain.hpp
View file

@ -31,6 +31,9 @@ namespace MWRender{
TerrainManager(Ogre::SceneManager*); TerrainManager(Ogre::SceneManager*);
virtual ~TerrainManager(); virtual ~TerrainManager();
void setDiffuse(const Ogre::ColourValue& diffuse);
void setAmbient(const Ogre::ColourValue& ambient);
void cellAdded(MWWorld::Ptr::CellStore* store); void cellAdded(MWWorld::Ptr::CellStore* store);
void cellRemoved(MWWorld::Ptr::CellStore* store); void cellRemoved(MWWorld::Ptr::CellStore* store);
private: private: