Changeset 1949 for code/branches/objecthierarchy/src/orxonox/tools/Mesh.cc

Timestamp:

Oct 19, 2008, 2:24:33 PM (16 years ago)

Author:

rgrieder

Message:

Moved all showsGraphics, hasServer, etc. functions from Settings class to Core class.
This was necessary to avoid circular dependencies.

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 "core/Core.h"
 #include "GraphicsEngine.h"
-#include "Settings.h"
 
 namespace orxonox
@@ -48 +48 @@
         std::ostringstream name;
         name << (Mesh::meshCounter_s++);
-        if (Settings::showsGraphics())
+        if (Core::showsGraphics())
             this->entity_ = GraphicsEngine::getInstance().getLevelSceneManager()->createEntity("Mesh" + name.str(), file);
     }
@@ -54 +54 @@
     Mesh::~Mesh()
     {
-        if (this->entity_ && Settings::showsGraphics())
+        if (this->entity_ && Core::showsGraphics())
             GraphicsEngine::getInstance().getLevelSceneManager()->destroyEntity(this->entity_);
     }