Changeset 2019 for code/branches/objecthierarchy/src/orxonox/objects/worldentities/WorldEntity.cc

Timestamp:

Oct 27, 2008, 4:08:51 AM (16 years ago)

Author:

landauf

Message:

many changes, most important: BaseObject takes now a pointer to it's creator which is needed to build a level hierarchy (with different scenes)

File:

• code/branches/objecthierarchy/src/orxonox/objects/worldentities/WorldEntity.cc (modified) (5 diffs)

code/branches/objecthierarchy/src/orxonox/objects/worldentities/WorldEntity.cc

@@ -30 +30 @@
 #include "WorldEntity.h"
 
+#include <cassert>
 #include <OgreSceneManager.h>
 
@@ -37 +38 @@
 
 #include "GraphicsEngine.h"
+#include "objects/Scene.h"
 
 namespace orxonox
@@ -47 +49 @@
     const Vector3 WorldEntity::UP    = Vector3::UNIT_Y;
 
-    WorldEntity::WorldEntity()
+    WorldEntity::WorldEntity(BaseObject* creator) : BaseObject(creator)
     {
         RegisterObject(WorldEntity);
 
-        this->node_ = GraphicsEngine::getInstance().getLevelSceneManager()->getRootSceneNode()->createChildSceneNode();
+        assert(this->getScene());
+        assert(this->getScene()->getRootSceneNode());
+
+        this->node_ = this->getScene()->getRootSceneNode()->createChildSceneNode();
+
         this->parent_ = 0;
         this->parentID_ = (unsigned int)-1;
@@ -66 +72 @@
         {
             this->node_->detachAllObjects();
-            GraphicsEngine::getInstance().getLevelSceneManager()->destroySceneNode(this->node_->getName());
+            if (this->getScene()->getSceneManager())
+                this->getScene()->getSceneManager()->destroySceneNode(this->node_->getName());
         }
     }
-
 
     void WorldEntity::XMLPort(Element& xmlelement, XMLPort::Mode mode)
@@ -131 +137 @@
         object->parentID_ = (unsigned int)-1;
 
-        GraphicsEngine::getInstance().getLevelSceneManager()->getRootSceneNode()->addChild(object->node_);
+        this->getScene()->getRootSceneNode()->addChild(object->node_);
     }