Changeset 1032 for code/trunk/src/asylum

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/asylum/orxonox/objects

Files:

• Fighter.cc (moved) (moved from code/trunk/src/orxonox/objects/Fighter.cc) (6 diffs)
• Fighter.h (moved) (moved from code/trunk/src/orxonox/objects/Fighter.h)

code/trunk/src/asylum/orxonox/objects/Fighter.cc

@@ -38 +38 @@
 #include "util/String2Number.h"
 #include "core/CoreIncludes.h"
-#include "Orxonox.h"
+#include "GraphicsEngine.h"
 #include "core/InputManager.h"
 #include "particle/ParticleInterface.h"
@@ -129 +129 @@
 
 #if 0
-        w = new particle::ParticleInterface(Orxonox::getSingleton()->getSceneManager(),"schuss" + this->getName(),"Orxonox/schuss");
+        w = new particle::ParticleInterface(GraphicsEngine::getSingleton().getSceneManager(),"schuss" + this->getName(),"Orxonox/schuss");
         w->getParticleSystem()->setParameter("local_space","true");
         w->newEmitter();
@@ -148 +148 @@
 #endif
 
-        tt = new ParticleInterface(Orxonox::getSingleton()->getSceneManager(),"twinthruster" + this->getName(),"Orxonox/engineglow");
+        tt = new ParticleInterface(GraphicsEngine::getSingleton().getSceneManager(),"twinthruster" + this->getName(),"Orxonox/engineglow");
         tt->getParticleSystem()->setParameter("local_space","true");
         tt->newEmitter();
@@ -173 +173 @@
         mainWeapon_ = new BarrelGun();
         mainWeapon_->setAmmoDump(ammoDump_);
-        Orxonox::getSingleton()->getSceneManager()->getRootSceneNode()->removeChild(mainWeapon_->getNode());
+        GraphicsEngine::getSingleton().getSceneManager()->getRootSceneNode()->removeChild(mainWeapon_->getNode());
         getNode()->addChild(mainWeapon_->getNode());
 
@@ -193 +193 @@
         if (xmlElem->Attribute("camera"))
         {
-            Ogre::Camera *cam = Orxonox::getSingleton()->getSceneManager()->createCamera("ShipCam");
+            Ogre::Camera *cam = GraphicsEngine::getSingleton().getSceneManager()->createCamera("ShipCam");
             Ogre::SceneNode *node = this->getNode()->createChildSceneNode("CamNode");
 /*
@@ -208 +208 @@
 
             node->attachObject(cam);
-            Orxonox::getSingleton()->getOgrePointer()->getRenderWindow()->addViewport(cam);
+            GraphicsEngine::getSingleton().getRenderWindow()->addViewport(cam);
         }
     }