Changeset 2023 for code/branches/objecthierarchy/src/orxonox/tools

Timestamp:

Oct 27, 2008, 10:56:51 PM (16 years ago)

Author:

rgrieder

Message:

• Added support for dedicated server. Could not network test it yet, client still segfaults me.
• Also kicked GraphicsEngine::levelSceneManager_, there are only the statistic methods left.
• GSDedicated also derives from GSLevel, but GSLevel is not anymore a real GameState.
• CameraHandler and LevelManager get created in GSLevel now.

Location:

code/branches/objecthierarchy/src/orxonox/tools

Files:

• BillboardSet.cc (modified) (1 diff)
• Light.cc (modified) (1 diff)
• Mesh.cc (modified) (2 diffs)

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

@@ -34 +34 @@
 #include <OgreSceneManager.h>
 
-#include "GraphicsEngine.h"
 #include "util/Math.h"
 

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

@@ -35 +35 @@
 #include <OgreSceneManager.h>
 
-#include "GraphicsEngine.h"
-
 namespace orxonox
 {

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

@@ -35 +35 @@
 
 #include "core/Core.h"
-#include "GraphicsEngine.h"
 #include "util/Convert.h"
 #include "util/String.h"
@@ -64 +63 @@
             this->scenemanager_->destroyEntity(this->entity_);
 
-        try
+        if (Core::showsGraphics())
         {
-            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;
+            try
+            {
+                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;
+            }
         }
     }