Changeset 177 for code/branches/main_reto_vs05/src

Timestamp:

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

Author:

rgrieder

Message:

 

Location:

code/branches/main_reto_vs05/src

Files:

• barrel_gun.cc (deleted)
• barrel_gun.h (deleted)
• bullet_manager.cc (added)
• bullet_manager.h (added)
• orxonox_prerequisites.h (modified) (1 diff)
• orxonox_ship.cc (modified) (10 diffs)
• orxonox_ship.h (modified) (3 diffs)
• run_manager.cc (modified) (8 diffs)
• run_manager.h (modified) (1 diff)
• weapon.h (modified) (3 diffs)
• weapon_manager.cc (modified) (6 diffs)
• weapon_manager.h (modified) (2 diffs)

code/branches/main_reto_vs05/src/orxonox_prerequisites.h

@@ -34 +34 @@
   class AmmunitionDump;
   class Bullet;
+  class BulletManager;
   class CameraManager;
   class OgreControl;

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);

code/branches/main_reto_vs05/src/orxonox_ship.h

@@ -40 +40 @@
   {
   public:
-          OrxonoxShip(Ogre::SceneManager*, Ogre::SceneNode*);
+          OrxonoxShip(Ogre::SceneManager*, Ogre::SceneNode*, BulletManager*);
           virtual ~OrxonoxShip();
 
@@ -54 +54 @@
     Ogre::Vector3 getSpeed();
 
-          Bullet* fire();
+          void fire();
 
           bool tick(unsigned long, Ogre::Real);
@@ -69 +69 @@
     Ogre::Real baseThrust_;
           int objectCounter_;
-          Ogre::Vector3 bulletSpeed_;
+
+    BulletManager *bulletManager_;
+          //Ogre::Vector3 bulletSpeed_;
 
     WeaponManager *mainWeapon_;

code/branches/main_reto_vs05/src/run_manager.cc

@@ -52 +52 @@
 #include "orxonox_ship.h"
 #include "bullet.h"
+#include "bullet_manager.h"
 #include "camera_manager.h"
+#include "weapon_manager.h"
 
 #include "run_manager.h"
@@ -97 +99 @@
     // background scene (world objects, skybox, lights, etc.)
     backgroundScene_ = new OrxonoxScene(sceneMgr_);
+
+
+    // BULLET LIST FOR THE TEST APPLICATION
+
+    // create a bullet manager
+    bulletManager_ = new BulletManager(sceneMgr_);
+    WeaponManager::loadWeapons();
+
+    // TODO: Use STL to make life easier. But it works this way too..
+    /*bullets_ = new Bullet*[10];
+    bulletsIndex_ = 0;
+    bulletsSize_ = 10;*/
+
 
     // PLAYER SPACESHIP
@@ -114 +129 @@
     // Construct a new spaceship and give it the node
     playerShip_ = new OrxonoxShip(sceneMgr_, sceneMgr_->getRootSceneNode()
-      ->createChildSceneNode("ShipNode", Vector3(20, 20, 20)));
+      ->createChildSceneNode("ShipNode", Vector3(20, 20, 20)), bulletManager_);
 
 
@@ -140 +155 @@
 
     
-    // BULLET LIST FOR THE TEST APPLICATION
-
-    // TODO: Use STL to make life easier. But it works this way too..
-    bullets_ = new Bullet*[10];
-    bulletsIndex_ = 0;
-    bulletsSize_ = 10;
-
 
     // HUMAN INTERFACE
@@ -205 +213 @@
     if (playerShip_)
       delete playerShip_;
+    if (bulletManager_)
+      delete bulletManager_;
+
+    WeaponManager::destroyWeapons();
 
     // clean up the bullet list
-    for (int i = 0; i < bulletsIndex_; i++)
+    /*for (int i = 0; i < bulletsIndex_; i++)
       delete bullets_[i];
-    delete bullets_;
+    delete bullets_;*/
   }
 
@@ -239 +251 @@
 
     // update the bullet positions
-    for (int i = 0; i < bulletsIndex_; i++)
+    bulletManager_->tick(time, deltaTime);
+
+    /*for (int i = 0; i < bulletsIndex_; i++)
     {
       bullets_[i]->node_->translate(bullets_[i]->speed_*deltaTime);
       bullets_[i]->node_->yaw(Degree(deltaTime*100));
       bullets_[i]->node_->roll(Degree(deltaTime*300));
-    }
+    }*/
 
     // HUMAN INTERFACE
@@ -447 +461 @@
       // Prevent continuous fire for the moment.
       leftButtonDown_ = true;
+
+      playerShip_->fire();
       
       // let ship fire one shot with its only weapon (Barrels..)
-      Bullet *tempBullet = playerShip_->fire();
+      /*Bullet *tempBullet = playerShip_->fire();
 
       // resize array if neccessary (double the size then)
@@ -464 +480 @@
 
       // add the bullet to the list
-      bullets_[bulletsIndex_++] = tempBullet;
+      bullets_[bulletsIndex_++] = tempBullet;*/
 
     }

code/branches/main_reto_vs05/src/run_manager.h

@@ -109 +109 @@
 
     // Bullet array
-          Bullet **bullets_;
+          /*Bullet **bullets_;
           int bulletsSize_;
-          int bulletsIndex_;
+          int bulletsIndex_;*/
+    BulletManager *bulletManager_;
 
           // previously elapsed render time

code/branches/main_reto_vs05/src/weapon.h

@@ -30 +30 @@
 #define WEAPON_H
 
+#include "OgrePrerequisites.h"
 #include "OgreString.h"
 
@@ -39 +40 @@
   {
   public:
-    Weapon(const Ogre::String &name, int firePower, int firingRate)
-          : name_(name), firePower_(firePower), firingRate_(firingRate) { }
+    Weapon(const Ogre::String &name, int firePower, int firingRate,
+      Ogre::Real bulletSpeed)
+          : name_(name), firePower_(firePower), firingRate_(firingRate),
+          bulletSpeed_(bulletSpeed) { }
+
     virtual ~Weapon() { }
 
@@ -47 +51 @@
     int firePower_;
     int firingRate_;
+    Ogre::Real bulletSpeed_;
   };
 

code/branches/main_reto_vs05/src/weapon_manager.cc

@@ -27 +27 @@
 
 #include "OgreSceneManager.h"
+#include "OgreEntity.h"
+#include "OgreSceneNode.h"
+#include "OgreVector3.h"
+#include "OgreStringConverter.h"
 
 #include "weapon.h"
+#include "bullet.h"
+#include "bullet_manager.h"
 #include "weapon_manager.h"
+
+#define ACTION_LIST_SIZE 4
 
 
@@ -38 +46 @@
 
   WeaponManager::WeaponManager(SceneManager *sceneMgr, SceneNode *node,
-        int slotSize)
-        : sceneMgr_(sceneMgr), node_(node), slotSize_(slotSize), slotIndex_(0)
+        BulletManager *bulletManager, int slotSize)
+        : sceneMgr_(sceneMgr), node_(node), slotSize_(slotSize), slotIndex_(0),
+        bulletCounter_(0), primaryFireRequest_(false), currentState_(IDLE),
+        secondaryFireRequest_(false), selectedWeapon_(0),
+        bulletManager_(bulletManager),
+        actionListReadIndex_(0), actionListWriteIndex_(0)
   {
         slots_ = new Weapon*[slotSize];
+    actionList_ = new Action[ACTION_LIST_SIZE];
+    for (int i = 0; i < ACTION_LIST_SIZE; i++)
+      actionList_[i] = NOTHING;
   }
 
@@ -49 +64 @@
     if (slots_)
       delete slots_;
+    if (actionList_)
+      delete actionList_;
   }
 
@@ -54 +71 @@
   bool WeaponManager::addWeapon(const Ogre::String &name)
   {
+    if (!weaponList_s)
+      return false;
+
     if (name == weaponList_s[0]->name_)
     {
       // this is ugly, but for the time being, it has to fit.
+      selectedWeapon_ = slotIndex_;
       slots_[slotIndex_++] = weaponList_s[0];
       return true;
@@ -65 +86 @@
 
 
+  bool WeaponManager::addAction(const Action act)
+  {
+    if (actionList_[actionListWriteIndex_] == NOTHING)
+    {
+      actionList_[actionListWriteIndex_] = act;
+      actionListWriteIndex_ = (actionListWriteIndex_ + 1) % ACTION_LIST_SIZE;
+      return true;
+    }
+    else
+      return false;
+  }
+
+
+  void WeaponManager::primaryFireRequest()
+  {
+    primaryFireRequest_ = true;
+  }
+
+
+  void WeaponManager::primaryFire()
+  {
+    currentState_ = PRIMARY_FIRE;
+
+    // TODO: add the name of the weapon manager. but for that,
+    // the factory is required.
+    SceneNode *temp = sceneMgr_->getRootSceneNode()->createChildSceneNode(
+          "BulletNode" + StringConverter::toString(bulletCounter_),
+          node_->getWorldPosition(), node_->getWorldOrientation());
+          temp->setScale(Vector3(1, 1, 1) * 10);
+          temp->yaw(Degree(-90));
+    Entity* bulletEntity = sceneMgr_->createEntity("BulletEntity"
+          + StringConverter::toString(bulletCounter_++), "Barrel.mesh");
+    Vector3 speed = (node_->getOrientation() * Vector3(0, 0, -1))
+          .normalisedCopy() * slots_[selectedWeapon_]->bulletSpeed_;
+          bulletManager_->addBullet(new Bullet(temp, bulletEntity, speed));
+  
+    currentState_ = IDLE;
+  }
+
+
+  void WeaponManager::secondaryFireRequest()
+  {
+    secondaryFireRequest_ = true;
+  }
+
+  void WeaponManager::secondaryFire()
+  {
+  }
+
+
+  bool WeaponManager::tick(unsigned long time, Real deltaTime)
+  {
+    // return if no weapon has been added
+    if (!slots_[slotIndex_])
+      return true;
+
+    switch (currentState_)
+    {
+    case IDLE:
+      // first, process actions
+      if (actionList_[actionListReadIndex_] != NOTHING)
+      {
+        actionListReadIndex_ = (actionListReadIndex_ + 1) % ACTION_LIST_SIZE;
+        break;
+      }
+
+      switch (actionList_[actionListReadIndex_])
+      {
+      case RELOAD:
+        break;
+
+      case ZOOM_IN:
+        break;
+
+      case ZOOM_OUT:
+        break;
+
+      default:
+        break;
+      }
+
+      // secondly, execute firing
+      if (primaryFireRequest_)
+        primaryFire();
+      else if (secondaryFireRequest_)
+        secondaryFire();
+
+      break;
+
+    case PRIMARY_FIRE:
+      break;
+
+    case SECONDARY_FIRE:
+      break;
+
+    case RELOADING:
+      break;
+    }
+
+    primaryFireRequest_ = false;
+    secondaryFireRequest_ = false;
+
+    return true;
+  }
+
+
   // static
   bool WeaponManager::loadWeapons()
   {
-    weaponList_s[0] = new Weapon("Barrel Gun", 10, 2);
+    weaponList_s = new Weapon*[5];
+    for (int i = 0; i < 5; i++)
+      weaponList_s[i] = NULL;
+    weaponList_s[0] = new Weapon("Barrel Gun", 10, 2, 500);
     return true;
   }
@@ -76 +206 @@
   void WeaponManager::destroyWeapons()
   {
-    delete weaponList_s[0];
+    if (weaponList_s)
+    {
+      for (int i = 0; i < 5; i++)
+        if (weaponList_s[i])
+          delete weaponList_s[i];
+      delete weaponList_s;
+    }
   }
 

code/branches/main_reto_vs05/src/weapon_manager.h

@@ -40 +40 @@
   {
   public:
-    WeaponManager(Ogre::SceneManager*, Ogre::SceneNode*, int);
+    enum Action {
+      NOTHING  = 0,
+      RELOAD   = 1,
+      ZOOM_IN  = 2,
+      ZOOM_OUT = 3
+    };
+
+  protected:
+    enum State {
+      IDLE = 0,
+      PRIMARY_FIRE = 1,
+      SECONDARY_FIRE = 2,
+      RELOADING = 4
+    };
+
+  public:
+    WeaponManager(Ogre::SceneManager*, Ogre::SceneNode*, BulletManager*, int);
           virtual ~WeaponManager();
 
     bool addWeapon(const Ogre::String&);
 
+    bool addAction(const Action);
+
+    void primaryFireRequest();
+
+    void secondaryFireRequest();
+
+    bool tick(unsigned long, Ogre::Real);
+
     bool static loadWeapons();
 
     void static destroyWeapons();
+
+  protected:
+    void primaryFire();
+
+    void secondaryFire();
+
+  public:
 
   protected:
@@ -56 +87 @@
     int slotSize_;
     int slotIndex_;
+    int selectedWeapon_;
+
+    int bulletCounter_;
+    BulletManager *bulletManager_;
+
+    bool primaryFireRequest_;
+    bool secondaryFireRequest_;
+
+    State currentState_;
+
+    Action *actionList_;
+    int actionListReadIndex_;
+    int actionListWriteIndex_;
 
     static Weapon **weaponList_s;