Changeset 1654

Timestamp:

Aug 5, 2008, 9:55:00 PM (16 years ago)

Author:

rgrieder

Message:

forgot getSingleton in Orxonox.cc
There are now only three classes uses getSingleton: ConfigFileManager, Server and Client

Location:

code/branches/gui/src/orxonox

Files:

• Orxonox.cc (modified) (3 diffs)
• Orxonox.h (modified) (1 diff)
• objects/Backlight.cc (modified) (1 diff)
• tools/ParticleInterface.cc (modified) (2 diffs)

code/branches/gui/src/orxonox/Orxonox.cc

@@ -192 +192 @@
    * @return singleton reference
    */
-  Orxonox& Orxonox::getSingleton()
+  Orxonox& Orxonox::getInstance()
   {
     assert(singletonRef_s);
@@ -203 +203 @@
   void Orxonox::setTimeFactor(float factor)
   {
-    float change = factor / Orxonox::getSingleton().getTimeFactor();
-    Orxonox::getSingleton().timefactor_ = factor;
+    float change = factor / Orxonox::getInstance().getTimeFactor();
+    Orxonox::getInstance().timefactor_ = factor;
     for (Iterator<ParticleInterface> it = ObjectList<ParticleInterface>::begin(); it; ++it)
         it->setSpeedFactor(it->getSpeedFactor() * change);
 
     for (Iterator<Backlight> it = ObjectList<Backlight>::begin(); it; ++it)
-        it->setTimeFactor(Orxonox::getSingleton().getTimeFactor());
+        it->setTimeFactor(Orxonox::getInstance().getTimeFactor());
   }
 
@@ -335 +335 @@
             return;
 
-        getSingleton().modeRequest_ = mode;
+        getInstance().modeRequest_ = mode;
     }
 

code/branches/gui/src/orxonox/Orxonox.h

@@ -62 +62 @@
       void abortRequest();
 
-      static Orxonox& getSingleton();
+      static Orxonox& getInstance();
 
       static void slomo(float factor) { Orxonox::setTimeFactor(factor); }
-      static float getTimeFactor()    { return Orxonox::getSingleton().timefactor_; }
+      static float getTimeFactor()    { return Orxonox::getInstance().timefactor_; }
       static void loadGame(const std::string& name);
-      static void exit()              { Orxonox::getSingleton().abortRequest(); }
+      static void exit()              { Orxonox::getInstance().abortRequest(); }
       static void setTimeFactor(float factor = 1.0);
 

code/branches/gui/src/orxonox/objects/Backlight.cc

@@ -68 +68 @@
         this->ribbonTrail_->setMaterialName("Trail/backlighttrail");
 
-        this->setTimeFactor(Orxonox::getSingleton().getTimeFactor());
+        this->setTimeFactor(Orxonox::getInstance().getTimeFactor());
     }
 

code/branches/gui/src/orxonox/tools/ParticleInterface.cc

@@ -56 +56 @@
     this->detaillevel_ = (unsigned int)detaillevel;
     this->particleSystem_ = GraphicsEngine::getInstance().getLevelSceneManager()->createParticleSystem("particles" + getConvertedValue<unsigned int, std::string>(ParticleInterface::counter_s++), templateName);
-    this->particleSystem_->setSpeedFactor(Orxonox::getSingleton().getTimeFactor());
+    this->particleSystem_->setSpeedFactor(Orxonox::getInstance().getTimeFactor());
 
     if (GraphicsEngine::getInstance().getDetailLevelParticle() < (unsigned int)this->detaillevel_)
@@ -171 +171 @@
   void ParticleInterface::setSpeedFactor(float factor)
   {
-    this->particleSystem_->setSpeedFactor(Orxonox::getSingleton().getTimeFactor() * factor);
+    this->particleSystem_->setSpeedFactor(Orxonox::getInstance().getTimeFactor() * factor);
   }
   float ParticleInterface::getSpeedFactor() const
   {
-    return (this->particleSystem_->getSpeedFactor() / Orxonox::getSingleton().getTimeFactor());
+    return (this->particleSystem_->getSpeedFactor() / Orxonox::getInstance().getTimeFactor());
   }