Changeset 1638 for code/branches/gui/src/orxonox/tools/ParticleInterface.cc
- Timestamp:
- Jul 20, 2008, 7:49:26 PM (16 years ago)
- Location:
- code/branches/gui
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/gui
-
Property
svn:mergeinfo
set to
/code/branches/input merged eligible
-
Property
svn:mergeinfo
set to
-
code/branches/gui/src/orxonox/tools/ParticleInterface.cc
r1563 r1638 55 55 this->bEnabled_ = true; 56 56 this->detaillevel_ = (unsigned int)detaillevel; 57 this->particleSystem_ = GraphicsEngine::getSingleton().get SceneManager()->createParticleSystem("particles" + getConvertedValue<unsigned int, std::string>(ParticleInterface::counter_s++), templateName);58 this->particleSystem_->setSpeedFactor(Orxonox::getSingleton() ->getTimeFactor());57 this->particleSystem_ = GraphicsEngine::getSingleton().getLevelSceneManager()->createParticleSystem("particles" + getConvertedValue<unsigned int, std::string>(ParticleInterface::counter_s++), templateName); 58 this->particleSystem_->setSpeedFactor(Orxonox::getSingleton().getTimeFactor()); 59 59 60 60 if (GraphicsEngine::getSingleton().getDetailLevelParticle() < (unsigned int)this->detaillevel_) … … 72 72 { 73 73 this->particleSystem_->removeAllEmitters(); 74 GraphicsEngine::getSingleton().get SceneManager()->destroyParticleSystem(particleSystem_);74 GraphicsEngine::getSingleton().getLevelSceneManager()->destroyParticleSystem(particleSystem_); 75 75 } 76 76 … … 171 171 void ParticleInterface::setSpeedFactor(float factor) 172 172 { 173 this->particleSystem_->setSpeedFactor(Orxonox::getSingleton() ->getTimeFactor() * factor);173 this->particleSystem_->setSpeedFactor(Orxonox::getSingleton().getTimeFactor() * factor); 174 174 } 175 175 float ParticleInterface::getSpeedFactor() const 176 176 { 177 return (this->particleSystem_->getSpeedFactor() / Orxonox::getSingleton() ->getTimeFactor());177 return (this->particleSystem_->getSpeedFactor() / Orxonox::getSingleton().getTimeFactor()); 178 178 } 179 179
Note: See TracChangeset
for help on using the changeset viewer.