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

Timestamp:

Apr 12, 2008, 4:08:29 PM (17 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/objects

Files:

• Ambient.cc (modified) (2 diffs)
• Camera.cc (modified) (3 diffs)
• Explosion.cc (modified) (2 diffs)
• Model.cc (modified) (1 diff)
• Skybox.cc (modified) (2 diffs)
• SpaceShip.cc (modified) (4 diffs)
• WorldEntity.cc (modified) (2 diffs)
• weapon/BaseWeapon.cc (modified) (2 diffs)

code/trunk/src/orxonox/objects/Ambient.cc

@@ -37 +37 @@
 #include "util/String2Number.h"
 #include "util/Math.h"
-#include "../core/Debug.h"
-#include "../core/CoreIncludes.h"
-#include "../Orxonox.h"
+#include "core/Debug.h"
+#include "core/CoreIncludes.h"
+#include "GraphicsEngine.h"
 #include "core/XMLPort.h"
 
@@ -76 +76 @@
    void Ambient::setAmbientLight(const ColourValue& colour)
    {
-        Orxonox::getSingleton()->getSceneManager()->setAmbientLight(colour);
+        GraphicsEngine::getSingleton().getSceneManager()->setAmbientLight(colour);
    }
 

code/trunk/src/orxonox/objects/Camera.cc

@@ -13 +13 @@
 #include "util/String2Number.h"
 #include "util/Math.h"
-#include "../core/Debug.h"
-#include "../core/CoreIncludes.h"
-#include "../Orxonox.h"
-#include "../GraphicsEngine.h"
+#include "core/Debug.h"
+#include "core/CoreIncludes.h"
+#include "GraphicsEngine.h"
 
 #include "Camera.h"
@@ -35 +34 @@
     void Camera::loadParams(TiXmlElement* xmlElem)
     {
-      Ogre::SceneManager* mgr = orxonox::Orxonox::getSingleton()->getSceneManager();
+      Ogre::SceneManager* mgr = GraphicsEngine::getSingleton().getSceneManager();
 
       if (xmlElem->Attribute("name") && xmlElem->Attribute("pos") && xmlElem->Attribute("lookat") && xmlElem->Attribute("node"))
@@ -68 +67 @@
 
         // FIXME: unused var
-        Ogre::Viewport* vp = orxonox::Orxonox::getSingleton()->getOgrePointer()->getRenderWindow()->addViewport(cam);
+        Ogre::Viewport* vp = GraphicsEngine::getSingleton().getRenderWindow()->addViewport(cam);
 
 

code/trunk/src/orxonox/objects/Explosion.cc

@@ -32 +32 @@
 #include <OgreSceneNode.h>
 
-#include "../core/CoreIncludes.h"
+#include "core/CoreIncludes.h"
 #include "util/Math.h"
-#include "../Orxonox.h"
-#include "../particle/ParticleInterface.h"
+#include "GraphicsEngine.h"
+#include "particle/ParticleInterface.h"
 
 #include "Explosion.h"
@@ -56 +56 @@
             Vector3 position = owner->getNode()->getWorldPosition();
 
-            this->particle_ = new ParticleInterface(Orxonox::getSingleton()->getSceneManager(), "explosion" + this->getName(), "Orxonox/treibwerk");
+            this->particle_ = new ParticleInterface(GraphicsEngine::getSingleton().getSceneManager(), "explosion" + this->getName(), "Orxonox/treibwerk");
             this->particle_->getParticleSystem()->setParameter("local_space", "true");
             this->particle_->newEmitter();

code/trunk/src/orxonox/objects/Model.cc

@@ -31 +31 @@
 #include "util/Tokenizer.h"
 #include "util/String2Number.h"
-#include "../core/CoreIncludes.h"
-#include "../Orxonox.h"
+#include "core/CoreIncludes.h"
+#include "GraphicsEngine.h"
 #include "core/XMLPort.h"
 

code/trunk/src/orxonox/objects/Skybox.cc

@@ -35 +35 @@
 //#include "util/Tokenizer.h"
 //#include "util/String2Number.h"
-#include "../Orxonox.h"
-#include "../core/CoreIncludes.h"
-#include "../core/Debug.h"
+#include "GraphicsEngine.h"
+#include "core/CoreIncludes.h"
+#include "core/Debug.h"
 #include "core/XMLPort.h"
 
@@ -68 +68 @@
    void Skybox::setSkybox(const std::string& skyboxname)
    {
-        Orxonox::getSingleton()->getSceneManager()->setSkyBox(true, skyboxname);
+        GraphicsEngine::getSingleton().getSceneManager()->setSkyBox(true, skyboxname);
    }
 

code/trunk/src/orxonox/objects/SpaceShip.cc

@@ -41 +41 @@
 #include "core/CoreIncludes.h"
 #include "core/Debug.h"
-#include "Orxonox.h"
+#include "GraphicsEngine.h"
 #include "core/InputManager.h"
 #include "particle/ParticleInterface.h"
@@ -156 +156 @@
     {
         // START CREATING THRUSTER
-        this->tt_ = new ParticleInterface(Orxonox::getSingleton()->getSceneManager(),"twinthruster" + this->getName(),"Orxonox/engineglow");
+        this->tt_ = new ParticleInterface(GraphicsEngine::getSingleton().getSceneManager(),"twinthruster" + this->getName(),"Orxonox/engineglow");
         this->tt_->getParticleSystem()->setParameter("local_space","true");
         this->tt_->newEmitter();
@@ -271 +271 @@
     void SpaceShip::setCamera(const std::string& camera)
     {
-        Ogre::Camera *cam = Orxonox::getSingleton()->getSceneManager()->createCamera("ShipCam");
+        Ogre::Camera *cam = GraphicsEngine::getSingleton().getSceneManager()->createCamera("ShipCam");
         this->camNode_ = this->getNode()->createChildSceneNode("CamNode");
 /*
@@ -286 +286 @@
 
         this->camNode_->attachObject(cam);
-        Orxonox::getSingleton()->getOgrePointer()->getRenderWindow()->addViewport(cam);
+        GraphicsEngine::getSingleton().getRenderWindow()->addViewport(cam);
     }
 

code/trunk/src/orxonox/objects/WorldEntity.cc

@@ -34 +34 @@
 #include "util/Tokenizer.h"
 #include "util/String2Number.h"
-#include "../core/CoreIncludes.h"
-#include "../Orxonox.h"
+#include "core/CoreIncludes.h"
+#include "GraphicsEngine.h"
 #include "WorldEntity.h"
 #include "core/XMLPort.h"
@@ -58 +58 @@
         this->momentum_ = 0;
         
-        if (Orxonox::getSingleton()->getSceneManager())
+        if (GraphicsEngine::getSingleton().getSceneManager())
         {
           std::ostringstream name;
           name << (WorldEntity::worldEntityCounter_s++);
           this->setName("WorldEntity" + name.str());
-          this->node_ = Orxonox::getSingleton()->getSceneManager()->getRootSceneNode()->createChildSceneNode(this->getName());
+          this->node_ = GraphicsEngine::getSingleton().getSceneManager()->getRootSceneNode()->createChildSceneNode(this->getName());
         
           registerAllVariables();

code/trunk/src/orxonox/objects/weapon/BaseWeapon.cc

@@ -34 +34 @@
 
 #include "util/Math.h"
-#include "../../Orxonox.h"
+#include "Orxonox.h"
 #include "Bullet.h"
 #include "BulletManager.h"
@@ -47 +47 @@
 
   BaseWeapon::BaseWeapon()
-    : sceneMgr_(Orxonox::getSingleton()->getSceneManager()),
+    : sceneMgr_(GraphicsEngine::getSingleton().getSceneManager()),
       bulletCounter_(0),
       bulletManager_(Orxonox::getSingleton()->getBulletMgr()),