Changeset 2019 for code/branches/objecthierarchy/src/orxonox/objects/worldentities/Model.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/Model.cc (modified) (3 diffs)

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

@@ -32 +32 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
+#include "objects/Scene.h"
 
 namespace orxonox
@@ -37 +38 @@
     CreateFactory(Model);
 
-    Model::Model()
+    Model::Model(BaseObject* creator) : PositionableEntity(creator)
     {
         RegisterObject(Model);
@@ -69 +70 @@
             this->getNode()->detachObject(this->mesh_.getEntity());
 
-        this->mesh_.setMeshSource(this->meshSrc_);
+        this->mesh_.setMeshSource(this->getScene()->getSceneManager(), this->meshSrc_);
 
         if (this->mesh_.getEntity())