Changeset 232 for code/branches/main_reto_vs05/src/weapon

Timestamp:

Nov 21, 2007, 12:44:02 AM (18 years ago)

Author:

rgrieder

Message:

• modified the AmmunitionDump to hold different types of ammo
• converted the RunManager into a Singleton
• added some methods to address ammo by string
• created a BaseWeapon class
• derived BarrelGun from BaseWeapon

Location:

code/branches/main_reto_vs05/src/weapon

Files:

• ammunition_dump.cc (modified) (3 diffs)
• ammunition_dump.h (modified) (1 diff)
• barrel_gun.cc (added)
• barrel_gun.h (added)
• base_weapon.cpp (modified) (4 diffs)
• base_weapon.h (modified) (2 diffs)

code/branches/main_reto_vs05/src/weapon/ammunition_dump.cc

@@ -26 +26 @@
  */
 
+#include "run_manager.h"
+
 #include "ammunition_dump.h"
 
@@ -32 +34 @@
 namespace weapon {
 
-  AmmunitionDump::AmmunitionDump(int capacity)
-        : stock_(0), capacity_(capacity)
+  AmmunitionDump::AmmunitionDump()
+    : numberOfAmmos_(RunManager::getSingletonPtr()->getNumberOfAmmos()),
+      stock_(new int[numberOfAmmos_]),
+      capacity_(new int[numberOfAmmos_])
   {
+    for (int i = 0; i < numberOfAmmos_; i++)
+    {
+      stock_[i] = 0;
+      capacity_[i] = 0;
+    }
   }
 
@@ -40 +49 @@
   AmmunitionDump::~AmmunitionDump()
   {
+    if (stock_)
+      delete stock_;
+    if (capacity_)
+      delete capacity_;
+  }
+
+  void AmmunitionDump::setDumpSize(const Ogre::String &name, int size)
+  {
+    if (size < 0)
+      return;
+    int id = RunManager::getSingletonPtr()->getAmmunitionID(name);
+    if (id == -1)
+      return;
+    capacity_[id] = size;
   }
 
   
-  void AmmunitionDump::store(int quantity)
+  int AmmunitionDump::store(const Ogre::String &name, int quantity)
   {
-    stock_ += quantity;
-    if (stock_ > capacity_)
-      stock_ = capacity_;
+    int id = RunManager::getSingletonPtr()->getAmmunitionID(name);
+    if (id == -1)
+      return quantity;
+    stock_[id] += quantity;
+    if (stock_[id] > capacity_[id])
+    {
+      quantity = capacity_[id] - stock_[id];
+      stock_[id] = capacity_[id];
+      return quantity;
+    }
+    else
+      return 0;
   }
 
 
-  int AmmunitionDump::getAmmunition(int quantity)
+  int AmmunitionDump::getAmmunition(const Ogre::String &name, int quantity)
   {
-    if (stock_ >= quantity)
-    {
-      stock_ -= quantity;
-      return quantity;
-    }
+    int id = RunManager::getSingletonPtr()->getAmmunitionID(name);
+    if (id == -1)
+      return 0;
+    if (stock_[id] >= quantity)
+      stock_[id] -= quantity;
     else
     {
-      quantity = stock_;
-      stock_ = 0;
-      return quantity;
+      quantity = stock_[id];
+      stock_[id] = 0;
     }
+    return quantity;
   }
 
 
-  int AmmunitionDump::getStockSize()
+  int AmmunitionDump::getStockSize(const Ogre::String &name)
   {
-    return stock_;
+    int id = RunManager::getSingletonPtr()->getAmmunitionID(name);
+    if (id = -1)
+      return -1;
+    return stock_[id];
   }
 }

code/branches/main_reto_vs05/src/weapon/ammunition_dump.h

@@ -41 +41 @@
   {
   public:
-          AmmunitionDump(int capacity);
+    AmmunitionDump();
           ~AmmunitionDump();
 
-    void store(int quantiy);
+    void setDumpSize(const Ogre::String &name, int size);
 
-    int getAmmunition(int quantity);
+    int store(const Ogre::String &name, int quantiy);
 
-    int getStockSize();
+    int getAmmunition(const Ogre::String &name, int quantity);
+
+    int getStockSize(const Ogre::String &name);
 
   protected:
-    int stock_;
-    int capacity_;
+    int numberOfAmmos_;
+    int *stock_;
+    int *capacity_;
 
   protected:

code/branches/main_reto_vs05/src/weapon/base_weapon.cpp

@@ -37 +37 @@
 #include "inertial_node.h"
 #include "ammunition_dump.h"
+#include "run_manager.h"
 
 #include "base_weapon.h"
@@ -45 +46 @@
   using namespace Ogre;
 
-  BaseWeapon::BaseWeapon(SceneManager *sceneMgr, InertialNode *node,
-        BulletManager *bulletManager, AmmunitionDump *ammoDump)
-        : sceneMgr_(sceneMgr), node_(node),
-        bulletCounter_(0), primaryFireRequest_(false), currentState_(IDLE),
-        secondaryFireRequest_(false),
-        bulletManager_(bulletManager), secondaryFired_(false),
-        timeSinceNextActionAdded_(0), actionAdded_(false), nextAction_(NOTHING),
-        name_("Base Weapon"), primaryFirePower_(100), secondaryFirePower_(500),
-        primaryFiringRate_(10), secondaryFiringRate_(2), primaryBulletSpeed_(1000),
-        secondaryBulletSpeed_(500), magazineSize_(25), ammoDump_(ammoDump)
+  BaseWeapon::BaseWeapon(InertialNode *node, AmmunitionDump *ammoDump)
+    : sceneMgr_(RunManager::getSingletonPtr()->getSceneManagerPtr()), node_(node),
+      bulletCounter_(0), primaryFireRequest_(false), currentState_(IDLE),
+      secondaryFireRequest_(false),
+      bulletManager_(RunManager::getSingletonPtr()->getBulletManagerPtr()),
+      secondaryFired_(false),
+      timeSinceNextActionAdded_(0), actionAdded_(false), nextAction_(NOTHING),
+      ammoDump_(ammoDump)
   {
-    leftAmmo_ = ammoDump_->getAmmunition(magazineSize_);
+    leftAmmo_ = 0;
   }
 
@@ -84 +83 @@
 
 
-  void BaseWeapon::primaryFire()
-  {
-    if (leftAmmo_ < 1)
-    {
-      currentState_ = IDLE;
-      return;
-    }
-
-    SceneNode *temp = sceneMgr_->getRootSceneNode()->createChildSceneNode(
-          node_->getSceneNode()->getWorldPosition(),
-          node_->getSceneNode()->getWorldOrientation());
-
-    Entity* bulletEntity = sceneMgr_->createEntity("BulletEntity"
-          + StringConverter::toString(bulletCounter_++), "Barrel.mesh");
-
-    Vector3 speed = (temp->getOrientation() * Vector3(0, 0, -1))
-          .normalisedCopy() * primaryBulletSpeed_;
-    speed += node_->getWorldSpeed();
-
-          temp->setScale(Vector3(1, 1, 1) * 4);
-          temp->yaw(Degree(-90));
-
-          bulletManager_->addBullet(new Bullet(temp, bulletEntity, speed));
-
-    --leftAmmo_;
-  }
-
-
-  void BaseWeapon::primaryFiring(unsigned int time)
-  {
-    if (time > 100)
-    {
-      currentState_ = IDLE;
-    }
-  }
-
-
   void BaseWeapon::secondaryFireRequest()
   {
     secondaryFireRequest_ = true;
-  }
-
-
-  void BaseWeapon::secondaryFire()
-  {
-    if (leftAmmo_ < 5)
-    {
-      currentState_ = IDLE;
-      return;
-    }
-
-    SceneNode *temp = sceneMgr_->getRootSceneNode()->createChildSceneNode(
-          node_->getSceneNode()->getWorldPosition(),
-          node_->getSceneNode()->getWorldOrientation());
-
-    Entity* bulletEntity = sceneMgr_->createEntity("BulletEntity"
-          + StringConverter::toString(bulletCounter_++), "Barrel.mesh");
-
-    Vector3 speed = (temp->getOrientation() * Vector3(0, 0, -1))
-          .normalisedCopy() * secondaryBulletSpeed_*0.5;
-    speed += node_->getWorldSpeed();
-
-          temp->setScale(Vector3(1, 1, 1) * 10);
-          temp->yaw(Degree(-90));
-
-          bulletManager_->addBullet(new Bullet(temp, bulletEntity, speed));
-
-    leftAmmo_ -= 5;
-  }
-
-
-  void BaseWeapon::secondaryFiring(unsigned int time)
-  {
-    if (time > 250)
-      currentState_ = IDLE;
   }
 
@@ -181 +108 @@
         {
         case RELOAD:
-          leftAmmo_ += ammoDump_->getAmmunition(magazineSize_ - leftAmmo_);
+          leftAmmo_ += ammoDump_->getAmmunition("Barrel", magazineSize_ - leftAmmo_);
           break;
 

code/branches/main_reto_vs05/src/weapon/base_weapon.h

@@ -58 +58 @@
 
   public:
-    BaseWeapon(Ogre::SceneManager*, InertialNode*, BulletManager*,
-          AmmunitionDump*);
+    BaseWeapon(InertialNode*, AmmunitionDump*);
           virtual ~BaseWeapon();
 
@@ -73 +72 @@
 
   protected:
-    void primaryFire();
+    virtual void primaryFire() = 0;
 
-    void primaryFiring(unsigned int);
+    virtual void primaryFiring(unsigned int) = 0;
 
-    void secondaryFire();
+    virtual void secondaryFire() = 0;
 
-    void secondaryFiring(unsigned int);
+    virtual void secondaryFiring(unsigned int) = 0;
 
   public: