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

code/branches/objecthierarchy/src/orxonox/tools/Mesh.cc

@@ -32 +32 @@
 #include <sstream>
 #include <OgreSceneManager.h>
+#include <cassert>
 
 #include "core/Core.h"
@@ -50 +51 @@
     Mesh::~Mesh()
     {
-        if (this->entity_ && Core::showsGraphics())
-            GraphicsEngine::getInstance().getLevelSceneManager()->destroyEntity(this->entity_);
+        if (this->entity_ && this->scenemanager_)
+            this->scenemanager_->destroyEntity(this->entity_);
     }
 
-    void Mesh::setMeshSource(const std::string& meshsource)
+    void Mesh::setMeshSource(Ogre::SceneManager* scenemanager, const std::string& meshsource)
     {
-        if (Core::showsGraphics())
+        assert(scenemanager);
+
+        this->scenemanager_ = scenemanager;
+
+        if (this->entity_)
+            this->scenemanager_->destroyEntity(this->entity_);
+
+        try
         {
-            if (this->entity_)
-                GraphicsEngine::getInstance().getLevelSceneManager()->destroyEntity(this->entity_);
-
-            try
-            {
-                this->entity_ = GraphicsEngine::getInstance().getLevelSceneManager()->createEntity("Mesh" + convertToString(Mesh::meshCounter_s++), meshsource);
-                this->entity_->setCastShadows(this->bCastShadows_);
-            }
-            catch (...)
-            {
-                COUT(1) << "Error: Couln't load mesh \"" << meshsource << "\"" << std::endl;
-            }
+            this->entity_ = this->scenemanager_->createEntity("Mesh" + convertToString(Mesh::meshCounter_s++), meshsource);
+            this->entity_->setCastShadows(this->bCastShadows_);
+        }
+        catch (...)
+        {
+            COUT(1) << "Error: Couln't load mesh \"" << meshsource << "\"" << std::endl;
         }
     }
@@ -85 +87 @@
             return this->entity_->getName();
         else
-            return blankString;
+            return BLANKSTRING;
     }