Changeset 1032 for code/trunk/src/orxonox/objects/SpaceShip.cc

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

File:

• code/trunk/src/orxonox/objects/SpaceShip.cc (modified) (4 diffs)

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);
     }