Changeset 161 for code/branches/main_reto_vs05/include/orxonox_ship.h

Timestamp:

Nov 4, 2007, 5:00:41 PM (16 years ago)

Author:

rgrieder

Message:

• added namespace Orxonox to every file
  • removed all the "using namespace Ogre" in the header files
• cleaned up with the includes: attempt to include as little as possible to reduce compile time.
  • created a header file: orxonox_prerequisites.h
  • used OgrePrerequisites in the header files
  • avoided including "Ogre.h", using separate files instead
• created empty class: AmmunitionDump

File:

• code/branches/main_reto_vs05/include/orxonox_ship.h (modified) (1 diff)

code/branches/main_reto_vs05/include/orxonox_ship.h

@@ -30 +30 @@
 #define ORXONOX_SHIP_H
 
-#include "Ogre.h"
+#include "OgrePrerequisites.h"
 
-#include "bullet.h"
-
-using namespace Ogre;
-
-class OrxonoxShip
-{
-public:
-        OrxonoxShip(SceneManager*, SceneNode*);
-        virtual ~OrxonoxShip();
-
-        virtual bool initialise();
-
-        void setMainThrust(const Real);
-        void setSideThrust(const Real);
-  void setYThrust(const Real);
-        void turnUpAndDown(const Radian&);
-        void turnLeftAndRight(const Radian&);
-
-  SceneNode* getRootNode();
-  Vector3 getSpeed();
-
-        Bullet* fire();
-
-        bool tick(unsigned long, Real);
-
-protected:
-
-protected:
-        SceneManager *sceneMgr_;
-        SceneNode *rootNode_;
-        Entity *shipEntity_;
-
-        Vector3 currentSpeed_;  // relative to space
-        Vector3 currentThrust_; // relative to the ship
-  Real baseThrust_;
-        int objectCounter_;
-        Vector3 bulletSpeed_;
-
-};
+#include "Orxonox_prerequisites.h"
 
 
+namespace Orxonox {
+
+  class OrxonoxShip
+  {
+  public:
+          OrxonoxShip(Ogre::SceneManager*, Ogre::SceneNode*);
+          virtual ~OrxonoxShip();
+
+          virtual bool initialise();
+
+          void setMainThrust(const Ogre::Real);
+          void setSideThrust(const Ogre::Real);
+    void setYThrust(const Ogre::Real);
+          void turnUpAndDown(const Ogre::Radian&);
+          void turnLeftAndRight(const Ogre::Radian&);
+
+    Ogre::SceneNode* getRootNode();
+    Ogre::Vector3 getSpeed();
+
+          Bullet* fire();
+
+          bool tick(unsigned long, Ogre::Real);
+
+  protected:
+
+  protected:
+          Ogre::SceneManager *sceneMgr_;
+          Ogre::SceneNode *rootNode_;
+          Ogre::Entity *shipEntity_;
+
+          Ogre::Vector3 currentSpeed_;  // relative to space
+          Ogre::Vector3 currentThrust_; // relative to the ship
+    Ogre::Real baseThrust_;
+          int objectCounter_;
+          Ogre::Vector3 bulletSpeed_;
+
+  };
+
+}
+
 #endif /* ORXONOX_SHIP_H */