Changeset 1755 for code/trunk/src/orxonox/objects/Ambient.cc
- Timestamp:
- Sep 10, 2008, 1:37:36 AM (17 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/gui (added) merged: 1636,1638,1640-1647,1649-1654,1656,1659-1665,1670,1672-1674,1686,1688-1692,1694-1697,1704 /code/branches/input (added) merged: 1629-1630
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/objects/Ambient.cc
r1747 r1755 43 43 #include "core/XMLPort.h" 44 44 #include "core/ConsoleCommand.h" 45 #include "Settings.h" 45 46 #include "GraphicsEngine.h" 46 47 … … 66 67 bool Ambient::create() 67 68 { 68 GraphicsEngine::getSingleton().getSceneManager()->setAmbientLight(ambientLight_); 69 if (Settings::showsGraphics()) 70 GraphicsEngine::getInstance().getLevelSceneManager()->setAmbientLight(ambientLight_); 69 71 return Synchronisable::create(); 70 72 } … … 77 79 void Ambient::setAmbientLight(const ColourValue& colour) 78 80 { 79 GraphicsEngine::getSingleton().getSceneManager()->setAmbientLight(colour); 80 ambientLight_=colour; 81 if (Settings::showsGraphics()) 82 GraphicsEngine::getInstance().getLevelSceneManager()->setAmbientLight(colour); 83 ambientLight_ = colour; 81 84 } 82 85 83 86 /** 84 @brief XML loading and saving. 85 @param xmlelement The XML-element 86 @param loading Loading (true) or saving (false) 87 @return The XML-element 87 @brief 88 XML loading and saving. 89 @param 90 xmlelement The XML-element 91 @param 92 loading Loading (true) or saving (false) 93 @return 94 The XML-element 88 95 */ 89 96 void Ambient::XMLPort(Element& xmlelement, XMLPort::Mode mode)
Note: See TracChangeset
for help on using the changeset viewer.