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

Timestamp:

Nov 3, 2007, 11:06:43 PM (17 years ago)

Author:

rgrieder

Message:

 

File:

• code/branches/main_reto_vs05/include/orxonox_ship.h (modified) (2 diffs)

code/branches/main_reto_vs05/include/orxonox_ship.h

@@ -44 +44 @@
         virtual bool initialise();
 
-        void setThrust(const Real);
+        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();
@@ -55 +59 @@
 protected:
 
+protected:
+        SceneManager *sceneMgr_;
+        SceneNode *rootNode_;
+        Entity *shipEntity_;
 
-public:
-
-
-protected:
-        SceneManager *SceneMgr_;
-        SceneNode *RootNode_;
-        Entity *ShipEntity_;
-
-        Vector3 currentSpeed_;
-        float CurrentThrust_;
-  float CurrentSideThrust_;
-  float baseThrust_;
+        Vector3 currentSpeed_;  // relative to space
+        Vector3 currentThrust_; // relative to the ship
+  Real baseThrust_;
         int objectCounter_;
         Vector3 bulletSpeed_;