Changeset 190 for code/branches/main_reto/src/orxonox_ship.h

Timestamp:

Nov 7, 2007, 10:03:26 PM (16 years ago)

Author:

rgrieder

Message:

added files from rev 189

File:

• code/branches/main_reto/src/orxonox_ship.h (modified) (3 diffs)

code/branches/main_reto/src/orxonox_ship.h

@@ -40 +40 @@
   {
   public:
-          OrxonoxShip(Ogre::SceneManager*, Ogre::SceneNode*);
+    OrxonoxShip(Ogre::SceneManager*, Ogre::SceneNode*, weapon::BulletManager*);
           virtual ~OrxonoxShip();
 
@@ -51 +51 @@
           void turnLeftAndRight(const Ogre::Radian&);
 
-    Ogre::SceneNode* getRootNode();
+    InertialNode* getRootNode();
     Ogre::Vector3 getSpeed();
 
-          Bullet* fire();
+          void fire();
 
           bool tick(unsigned long, Ogre::Real);
@@ -62 +62 @@
   protected:
           Ogre::SceneManager *sceneMgr_;
-          Ogre::SceneNode *rootNode_;
+          //Ogre::SceneNode *rootNode_;
+    InertialNode *rootNode_;
           Ogre::Entity *shipEntity_;
 
-          Ogre::Vector3 currentSpeed_;  // relative to space
+          //Ogre::Vector3 currentSpeed_;  // relative to space
           Ogre::Vector3 currentThrust_; // relative to the ship
     Ogre::Real baseThrust_;
           int objectCounter_;
-          Ogre::Vector3 bulletSpeed_;
 
-    WeaponManager *mainWeapon_;
+    weapon::BulletManager *bulletManager_;
+          //Ogre::Vector3 bulletSpeed_;
+
+    weapon::WeaponManager *mainWeapon_;
   };