Changeset 1653 for code/branches/gui/src/orxonox/objects/WorldEntity.cc

Timestamp:

Aug 5, 2008, 9:50:26 PM (17 years ago)

Author:

rgrieder

Message:

• getInstance is probably more suitable than getSingleton (as x3n has already done so in most of his classes) I changed it in Orxonox and GraphicsEngine. Maybe more to come.
• Removed derivation from BaseObject in InputState (templates work well too, don't need a factory at all)

File:

• code/branches/gui/src/orxonox/objects/WorldEntity.cc (modified) (4 diffs)

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

@@ -49 +49 @@
         RegisterObject(WorldEntity);
 
-        if (GraphicsEngine::getSingleton().getLevelSceneManager())
+        if (GraphicsEngine::getInstance().getLevelSceneManager())
         {
             std::ostringstream name;
             name << (WorldEntity::worldEntityCounter_s++);
             this->setName("WorldEntity" + name.str());
-            this->node_ = GraphicsEngine::getSingleton().getLevelSceneManager()->getRootSceneNode()->createChildSceneNode(this->getName());
+            this->node_ = GraphicsEngine::getInstance().getLevelSceneManager()->getRootSceneNode()->createChildSceneNode(this->getName());
 
             registerAllVariables();
@@ -77 +77 @@
         {
             this->getNode()->removeAndDestroyAllChildren();
-            GraphicsEngine::getSingleton().getLevelSceneManager()->destroySceneNode(this->getName());
+            GraphicsEngine::getInstance().getLevelSceneManager()->destroySceneNode(this->getName());
         }
     }
@@ -178 +178 @@
     void WorldEntity::attachObject(const WorldEntity& obj) const
     {
-        GraphicsEngine::getSingleton().getLevelSceneManager()->getRootSceneNode()->removeChild(obj.getNode());
+        GraphicsEngine::getInstance().getLevelSceneManager()->getRootSceneNode()->removeChild(obj.getNode());
         this->getNode()->addChild(obj.getNode());
     }
@@ -184 +184 @@
     void WorldEntity::attachObject(WorldEntity* obj) const
     {
-        GraphicsEngine::getSingleton().getLevelSceneManager()->getRootSceneNode()->removeChild(obj->getNode());
+        GraphicsEngine::getInstance().getLevelSceneManager()->getRootSceneNode()->removeChild(obj->getNode());
         this->getNode()->addChild(obj->getNode());
     }