Changeset 1755 for code/trunk/src/orxonox/objects/WorldEntity.cc

Timestamp:

Sep 10, 2008, 1:37:36 AM (16 years ago)

Author:

rgrieder

Message:

merged gui back to trunk.
update the media repository!

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/objects/WorldEntity.cc (modified) (5 diffs)

code/trunk/src/orxonox/objects/WorldEntity.cc

@@ -32 +32 @@
 #include <string>
 #include <sstream>
+#include <OgreSceneManager.h>
 
 #include "tinyxml/tinyxml.h"
@@ -49 +50 @@
         RegisterObject(WorldEntity);
 
-        if (GraphicsEngine::getSingleton().getSceneManager())
+        if (GraphicsEngine::getInstance().getLevelSceneManager())
         {
             std::ostringstream name;
             name << (WorldEntity::worldEntityCounter_s++);
             this->setName("WorldEntity" + name.str());
-            this->node_ = GraphicsEngine::getSingleton().getSceneManager()->getRootSceneNode()->createChildSceneNode(this->getName());
+            this->node_ = GraphicsEngine::getInstance().getLevelSceneManager()->getRootSceneNode()->createChildSceneNode(this->getName());
 
             registerAllVariables();
@@ -77 +78 @@
         {
             this->getNode()->removeAndDestroyAllChildren();
-            GraphicsEngine::getSingleton().getSceneManager()->destroySceneNode(this->getName());
+            GraphicsEngine::getInstance().getLevelSceneManager()->destroySceneNode(this->getName());
         }
     }
@@ -177 +178 @@
     void WorldEntity::attachObject(const WorldEntity& obj) const
     {
-        GraphicsEngine::getSingleton().getSceneManager()->getRootSceneNode()->removeChild(obj.getNode());
+        GraphicsEngine::getInstance().getLevelSceneManager()->getRootSceneNode()->removeChild(obj.getNode());
         this->getNode()->addChild(obj.getNode());
     }
@@ -183 +184 @@
     void WorldEntity::attachObject(WorldEntity* obj) const
     {
-        GraphicsEngine::getSingleton().getSceneManager()->getRootSceneNode()->removeChild(obj->getNode());
+        GraphicsEngine::getInstance().getLevelSceneManager()->getRootSceneNode()->removeChild(obj->getNode());
         this->getNode()->addChild(obj->getNode());
     }