Changeset 2848 for code/branches/gui/src/orxonox/tools

Timestamp:

Mar 25, 2009, 7:37:00 PM (16 years ago)

Author:

rgrieder

Message:

Exported showsGraphics, etc. to a new class named GameMode in the core.

Location:

code/branches/gui/src/orxonox/tools

Files:

• BillboardSet.cc (modified) (3 diffs)
• Mesh.cc (modified) (2 diffs)
• ParticleInterface.cc (modified) (3 diffs)
• Shader.cc (modified) (3 diffs)

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

@@ -37 +37 @@
 #include <OgreBillboard.h>
 
-#include "core/Core.h"
+#include "core/GameMode.h"
 #include "util/Convert.h"
 #include "util/String.h"
@@ -72 +72 @@
         try
         {
-            if (Core::showsGraphics())
+            if (GameMode::showsGraphics())
             {
                 this->billboardSet_ = scenemanager->createBillboardSet("Billboard" + convertToString(BillboardSet::billboardSetCounter_s++), count);
@@ -95 +95 @@
         try
         {
-            if (Core::showsGraphics())
+            if (GameMode::showsGraphics())
             {
                 this->billboardSet_ = scenemanager->createBillboardSet("Billboard" + convertToString(BillboardSet::billboardSetCounter_s++), count);

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

@@ -35 +35 @@
 #include <cassert>
 
-#include "core/Core.h"
+#include "core/GameMode.h"
 #include "util/Convert.h"
 #include "util/String.h"
@@ -64 +64 @@
             this->scenemanager_->destroyEntity(this->entity_);
 
-        if (Core::showsGraphics())
+        if (GameMode::showsGraphics())
         {
             try

code/branches/gui/src/orxonox/tools/ParticleInterface.cc

@@ -41 +41 @@
 
 #include "GraphicsManager.h"
-#include "core/Core.h"
+#include "core/GameMode.h"
 #include "core/CoreIncludes.h"
 #include "util/Convert.h"
@@ -64 +64 @@
         this->speedFactor_ = 1.0f;
 
-        if (Core::showsGraphics())
+        if (GameMode::showsGraphics())
         {
             try
@@ -178 +178 @@
     {
         this->detaillevel_ = level;
-        if (Core::showsGraphics())
+        if (GameMode::showsGraphics())
             this->detailLevelChanged(GraphicsManager::getInstance().getDetailLevelParticle());
     }

code/branches/gui/src/orxonox/tools/Shader.cc

@@ -36 +36 @@
 #include <OgrePlugin.h>
 
-#include "core/Core.h"
+#include "core/GameMode.h"
 #include "core/CoreIncludes.h"
 #include "core/Executor.h"
@@ -59 +59 @@
         this->compositorInstance_ = 0;
         this->bVisible_ = true;
-        this->bLoadCompositor_ = Core::showsGraphics();
+        this->bLoadCompositor_ = GameMode::showsGraphics();
         this->bViewportInitialized_ = false;
         this->compositor_ = "";
@@ -246 +246 @@
     Shader::ParameterPointer* Shader::getParameterPointer(const std::string& material, size_t technique, size_t pass, const std::string& parameter)
     {
-        if (!Core::showsGraphics() || !Shader::bLoadedCgPlugin_s)
+        if (!GameMode::showsGraphics() || !Shader::bLoadedCgPlugin_s)
             return 0;