Changeset 708 for code/branches/FICN/src/orxonox/objects/SpaceShip.cc

Timestamp:

Dec 28, 2007, 10:30:29 PM (16 years ago)

Author:

rgrieder

Message:

• added Vector2, Vector3, Matrix3, ColourValue, Quaternion and String to the misc folder as header files (each of them contains #include <string> … typedef std::string String , etc.)
• please use String from now on by including <misc/String.h"
• removed #include <OgreVector3.h", etc. from "CoreIncludes.h" (adjusted all source files)
• adjusted all the source files (except network, that keeps <string> for the moment) (what a mess..)
• moved usleep hack to misc/Sleep.h
• relative include paths for files from other root directories (like misc, network, etc.) (but it stills writes "../Orxonox.h" when in folder orxonox/objects)
• "OgreSceneManager.h" —> <OgreSceneManager.h>
• included OrxonoxPrereqs in every file in folder orxonox
• moved HUD and ParticleInterface to namespace orxonox
• removed some using namespace Ogre/std when appropriate
• I hope I haven't forgotten important points..

File:

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

code/branches/FICN/src/orxonox/objects/SpaceShip.cc

@@ -26 +26 @@
  */
 
+#include <OIS/OIS.h>
+#include <OgreCamera.h>
+#include <OgreRenderWindow.h>
+#include <OgreParticleSystem.h>
+#include <OgreSceneNode.h>
+
+#include "tinyxml/tinyxml.h"
+#include "misc/String2Number.h"
+#include "misc/String.h"
+#include "../core/CoreIncludes.h"
+#include "../core/Debug.h"
+#include "../Orxonox.h"
+#include "../particle/ParticleInterface.h"
+#include "Projectile.h"
+
 #include "SpaceShip.h"
-#include "Projectile.h"
-
-#include "../../tinyxml/tinyxml.h"
-#include "../../misc/String2Number.h"
-#include "../core/CoreIncludes.h"
-#include "../Orxonox.h"
-
-#include "OgreCamera.h"
-#include <OgreRenderWindow.h>
 
 namespace orxonox
@@ -134 +140 @@
 
         // START CREATING THRUSTER
-        this->tt_ = new particle::ParticleInterface(Orxonox::getSingleton()->getSceneManager(),"twinthruster" + this->getName(),"Orxonox/engineglow");
+        this->tt_ = new ParticleInterface(Orxonox::getSingleton()->getSceneManager(),"twinthruster" + this->getName(),"Orxonox/engineglow");
         this->tt_->getParticleSystem()->setParameter("local_space","true");
         this->tt_->newEmitter();
@@ -190 +196 @@
         if (xmlElem->Attribute("forward") && xmlElem->Attribute("rotateupdown") && xmlElem->Attribute("rotaterightleft") && xmlElem->Attribute("looprightleft"))
         {
-            std::string forwardStr = xmlElem->Attribute("forward");
-            std::string rotateupdownStr = xmlElem->Attribute("rotateupdown");
-            std::string rotaterightleftStr = xmlElem->Attribute("rotaterightleft");
-            std::string looprightleftStr = xmlElem->Attribute("looprightleft");
+            String forwardStr = xmlElem->Attribute("forward");
+            String rotateupdownStr = xmlElem->Attribute("rotateupdown");
+            String rotaterightleftStr = xmlElem->Attribute("rotaterightleft");
+            String looprightleftStr = xmlElem->Attribute("looprightleft");
 
             String2Number<float>(this->maxSpeedForward_, forwardStr);
@@ -206 +212 @@
         {
 
-            std::string msStr = xmlElem->Attribute("maxSpeed");
-            std::string msabsStr = xmlElem->Attribute("maxSideAndBackSpeed");
-            std::string mrStr = xmlElem->Attribute("maxRotation");
-            std::string taStr = xmlElem->Attribute("transAcc");
-            std::string raStr = xmlElem->Attribute("rotAcc");
-            std::string tdStr = xmlElem->Attribute("transDamp");
-            std::string rdStr = xmlElem->Attribute("rotDamp");
+            String msStr = xmlElem->Attribute("maxSpeed");
+            String msabsStr = xmlElem->Attribute("maxSideAndBackSpeed");
+            String mrStr = xmlElem->Attribute("maxRotation");
+            String taStr = xmlElem->Attribute("transAcc");
+            String raStr = xmlElem->Attribute("rotAcc");
+            String tdStr = xmlElem->Attribute("transDamp");
+            String rdStr = xmlElem->Attribute("rotDamp");
 
             String2Number<float>(this->maxSpeed_, msStr);