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

some ambient light cleanup

Browse source
This commit is contained in:
Marc Zinnschlag 2014-03-23 13:40:56 +01:00
parent 1b6b4e3442
commit 205354ba30
3 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/opencs/view/render/scenewidget.cpp
View file

@ -32,11 +32,7 @@ namespace CSVRender
mSceneMgr = Ogre::Root::getSingleton().createSceneManager(Ogre::ST_GENERIC); mSceneMgr = Ogre::Root::getSingleton().createSceneManager(Ogre::ST_GENERIC);
// Throw in a random color just to make sure multiple scenes work mSceneMgr->setAmbientLight (Ogre::ColourValue (0,0,0,1));
Ogre::Real r = Ogre::Math::RangeRandom(0, 1);
Ogre::Real g = Ogre::Math::RangeRandom(0, 1);
Ogre::Real b = Ogre::Math::RangeRandom(0, 1);
mSceneMgr->setAmbientLight(Ogre::ColourValue(r,g,b,1));
Ogre::Light* l = mSceneMgr->createLight(); Ogre::Light* l = mSceneMgr->createLight();
l->setType (Ogre::Light::LT_DIRECTIONAL); l->setType (Ogre::Light::LT_DIRECTIONAL);
@ -57,7 +53,7 @@ namespace CSVRender
timer->start (20); /// \todo make this configurable timer->start (20); /// \todo make this configurable
} }
void SceneWidget::setAmbient (const Ogre::ColourValue& colour) void SceneWidget::setDefaultAmbient (const Ogre::ColourValue& colour)
{ {
mSceneMgr->setAmbientLight (colour); mSceneMgr->setAmbientLight (colour);
} }

6
apps/opencs/view/render/scenewidget.hpp
View file

@ -26,9 +26,6 @@ namespace CSVRender
QPaintEngine* paintEngine() const; QPaintEngine* paintEngine() const;
void setAmbient (const Ogre::ColourValue& colour);
///< \note The actual ambient colour may differ based on lighting settings.
protected: protected:
void setNavigation (Navigation *navigation); void setNavigation (Navigation *navigation);
@ -38,6 +35,9 @@ namespace CSVRender
void flagAsModified(); void flagAsModified();
void setDefaultAmbient (const Ogre::ColourValue& colour);
///< \note The actual ambient colour may differ based on lighting settings.
private: private:
void paintEvent(QPaintEvent* e); void paintEvent(QPaintEvent* e);
void resizeEvent(QResizeEvent* e); void resizeEvent(QResizeEvent* e);

2
apps/opencs/view/render/unpagedworldspacewidget.cpp
View file

@ -15,7 +15,7 @@ void CSVRender::UnpagedWorldspaceWidget::update()
Ogre::ColourValue colour; Ogre::ColourValue colour;
colour.setAsABGR (record.get().mAmbi.mAmbient); colour.setAsABGR (record.get().mAmbi.mAmbient);
setAmbient (colour); setDefaultAmbient (colour);
/// \todo deal with mSunlight and mFog/mForDensity /// \todo deal with mSunlight and mFog/mForDensity
} }