Changeset 177 for code/branches/main_reto_vs05/src/orxonox_ship.cc

Timestamp:

Nov 7, 2007, 12:39:30 AM (18 years ago)

Author:

rgrieder

Message:

 

File:

• code/branches/main_reto_vs05/src/orxonox_ship.cc (modified) (10 diffs)

code/branches/main_reto_vs05/src/orxonox_ship.cc

@@ -33 +33 @@
 
 #include "bullet.h"
+#include "bullet_manager.h"
 
 #include "orxonox_ship.h"
@@ -62 +63 @@
   * @param mNode The scene node which the ship will be attached to later.
   */
-  OrxonoxShip::OrxonoxShip(SceneManager *sceneMgr, SceneNode *node)
+  OrxonoxShip::OrxonoxShip(SceneManager *sceneMgr, SceneNode *node,
+        BulletManager *bulletManager)
               : sceneMgr_(sceneMgr), rootNode_(node), currentSpeed_(Vector3(0, 0, 0)),
         baseThrust_(1000), currentThrust_(Vector3::ZERO),
-        objectCounter_(0), bulletSpeed_(400)
+        objectCounter_(0), bulletManager_(bulletManager)//, bulletSpeed_(400)
   {
   }
@@ -76 +78 @@
   OrxonoxShip::~OrxonoxShip()
   {
+    if (mainWeapon_)
+      delete mainWeapon_;
   }
 
@@ -101 +105 @@
 
     // initialise weapon(s)
-    SceneNode *mainWeaponNode = rootNode_->createChildSceneNode("mainWeaponNode");
-    mainWeapon_ = new WeaponManager(sceneMgr_, mainWeaponNode, 1);
+    SceneNode *mainWeaponNode = rootNode_
+          ->createChildSceneNode("mainWeaponNode");
+    mainWeapon_ = new WeaponManager(sceneMgr_, mainWeaponNode,
+          bulletManager_, 1);
+    mainWeapon_->addWeapon("Barrel Gun");
 
           return true;
@@ -110 +117 @@
   /**
   * Gets the ship to accelerate in the current direction.
-  * The value should be between 0 and 1, with one beeing full thrust and 0 none.
+  * The value should be between 0 and 1, with one beeing full thrust and 0 none
   * @param value Acceleration between 0 and 1
   */
   void OrxonoxShip::setMainThrust(const Real value)
   {
-          //currentThrust_ = value * baseThrust_;
     currentThrust_.z = value * baseThrust_;
   }
@@ -122 +128 @@
   /**
   * Gets the ship to accelerate sideways regarding the current direction.
-  * The value should be between 0 and 1, with one beeing full thrust and 0 none.
+  * The value should be between 0 and 1, with one beeing full thrust and 0 none
   * @param value Acceleration between 0 and 1
   */
   void OrxonoxShip::setSideThrust(const Real value)
   {
-          //currentSideThrust_ = value * baseThrust_;
     currentThrust_.x = value * baseThrust_;
   }
@@ -134 +139 @@
   /**
   * Gets the ship to accelerate up and down.
-  * The value should be between 0 and 1, with one beeing full thrust and 0 none.
+  * The value should be between 0 and 1, with one beeing full thrust and 0 none
   * @param value Acceleration between 0 and 1
   */
   void OrxonoxShip::setYThrust(const Real value)
   {
-    //currentYThrust_ = value * baseThrust_;
     currentThrust_.y = value * baseThrust_;
   }
@@ -189 +193 @@
   * @return Bullet containing speed and entity.
   */
-  Bullet* OrxonoxShip::fire()
+  void OrxonoxShip::fire()
   {
           // TODO: Names must be unique!
-          SceneNode *temp = rootNode_->getParentSceneNode()->createChildSceneNode(
+          /*SceneNode *temp = rootNode_->getParentSceneNode()->createChildSceneNode(
           "BulletNode" + StringConverter::toString(objectCounter_));
           temp->setOrientation(rootNode_->getOrientation());
@@ -201 +205 @@
           + StringConverter::toString(objectCounter_++), "Barrel.mesh"), currentSpeed_
           + (rootNode_->getOrientation() * Vector3(0, 0, -1)).normalisedCopy()
-          * bulletSpeed_);
+          * bulletSpeed_);*/
+
+    mainWeapon_->primaryFireRequest();
   }
 
@@ -214 +220 @@
   bool OrxonoxShip::tick(unsigned long time, Real deltaTime)
   {
+    mainWeapon_->tick(time, deltaTime);
+
     Quaternion quad = rootNode_->getOrientation();
     quad.normalise();
     currentSpeed_ += quad * (Vector3(-1, -1, -1) * currentThrust_) * deltaTime;
-    //currentSpeed_ += quad * Vector3(0, 0, -1) * currentThrust_ * deltaTime;
-          //currentSpeed_ += quad * Vector3(-1, 0,  0) * currentSideThrust_ * deltaTime;
 
           rootNode_->translate(currentSpeed_ * deltaTime);