Changeset 1032 for code/trunk/src/orxonox/tools

Timestamp:

Apr 12, 2008, 4:08:29 PM (16 years ago)

Author:

rgrieder

Message:

• singletonized GraphicsEngine —> Orxonox.h has to included only twice —> better compile performance —> Everything graphic related can now be accessed with GraphicsEngine::getSingleton()
• asylumized Fighter (SpaceShip with weapon system integrated)
• removed weapon system from build

Location:

code/trunk/src/orxonox/tools

Files:

• BillboardSet.cc (modified) (3 diffs)
• Light.cc (modified) (3 diffs)
• Mesh.cc (modified) (3 diffs)

code/trunk/src/orxonox/tools/BillboardSet.cc

@@ -32 +32 @@
 #include <OgreSceneManager.h>
 
-#include "../Orxonox.h"
+#include "GraphicsEngine.h"
 #include "util/Math.h"
 
@@ -50 +50 @@
         std::ostringstream name;
         name << (BillboardSet::billboardSetCounter_s++);
-        this->billboardSet_ = Orxonox::getSingleton()->getSceneManager()->createBillboardSet("Billboard" + name.str(), count);
+        this->billboardSet_ = GraphicsEngine::getSingleton().getSceneManager()->createBillboardSet("Billboard" + name.str(), count);
         this->billboardSet_->createBillboard(position, colour);
         this->billboardSet_->setMaterialName(file);
@@ -58 +58 @@
     {
         if (this->billboardSet_)
-            Orxonox::getSingleton()->getSceneManager()->destroyBillboardSet(this->billboardSet_);
+            GraphicsEngine::getSingleton().getSceneManager()->destroyBillboardSet(this->billboardSet_);
     }
 }

code/trunk/src/orxonox/tools/Light.cc

@@ -5 +5 @@
 #include <OgreSceneManager.h>
 
-#include "../Orxonox.h"
+#include "GraphicsEngine.h"
 
 #include "Light.h"
@@ -22 +22 @@
         std::ostringstream name;
         name << (Light::lightCounter_s++);
-        this->light_ = Orxonox::getSingleton()->getSceneManager()->createLight("Light" + name.str());
+        this->light_ = GraphicsEngine::getSingleton().getSceneManager()->createLight("Light" + name.str());
         this->light_->setType(type);
         this->light_->setDiffuseColour(diffuse);
@@ -31 +31 @@
     {
         if (this->light_)
-            Orxonox::getSingleton()->getSceneManager()->destroyLight(this->light_);
+            GraphicsEngine::getSingleton().getSceneManager()->destroyLight(this->light_);
     }
 }

code/trunk/src/orxonox/tools/Mesh.cc

@@ -32 +32 @@
 #include <OgreSceneManager.h>
 
-#include "../Orxonox.h"
+#include "GraphicsEngine.h"
 
 #include "Mesh.h"
@@ -49 +49 @@
         std::ostringstream name;
         name << (Mesh::meshCounter_s++);
-        this->entity_ = Orxonox::getSingleton()->getSceneManager()->createEntity("Mesh" + name.str(), file);
+        this->entity_ = GraphicsEngine::getSingleton().getSceneManager()->createEntity("Mesh" + name.str(), file);
     }
 
@@ -55 +55 @@
     {
         if (this->entity_)
-            Orxonox::getSingleton()->getSceneManager()->destroyEntity(this->entity_);
+            GraphicsEngine::getSingleton().getSceneManager()->destroyEntity(this->entity_);
     }
 }