Changeset 198 for code/branches/main_reto_vs05/src

Timestamp:

Nov 13, 2007, 9:25:37 PM (18 years ago)

Author:

rgrieder

Message:

• added a simple ammo dump
• created BaseWeapon from WeaponManager
• created the WeaponStation object

Location:

code/branches/main_reto_vs05/src

Files:

• orxonox_prerequisites.h (modified) (1 diff)
• orxonox_scene.cc (modified) (2 diffs)
• orxonox_ship.cc (modified) (5 diffs)
• orxonox_ship.h (modified) (2 diffs)
• run_manager.cc (modified) (5 diffs)
• weapon/ammunition_dump.cc (modified) (2 diffs)
• weapon/ammunition_dump.h (modified) (1 diff)
• weapon/base_weapon.cpp (added)
• weapon/base_weapon.h (added)
• weapon/weapon.h (modified) (4 diffs)
• weapon/weapon_manager.cc (deleted)
• weapon/weapon_manager.h (deleted)
• weapon/weapon_station.cc (added)
• weapon/weapon_station.h (added)

code/branches/main_reto_vs05/src/orxonox_prerequisites.h

@@ -46 +46 @@
     class Bullet;
     class BulletManager;
-    class Weapon;
-    class WeaponManager;
+    class BaseWeapon;
+    class WeaponStation;
 
   }

code/branches/main_reto_vs05/src/orxonox_scene.cc

@@ -98 +98 @@
   void OrxonoxScene::createScene()
   {
-          sceneMgr_->setAmbientLight(ColourValue(0.3,0.3,0.3));
+          sceneMgr_->setAmbientLight(ColourValue(0.3,0.3,0.3)*2);
 
           //create first entity
@@ -110 +110 @@
 
           // set up skybox
-          sceneMgr_->setSkyBox(true, "Examples/SceneSkyBox2");
+          sceneMgr_->setSkyBox(true, "Examples/SceneSkyBox1");
 
           // set up one light_ source

code/branches/main_reto_vs05/src/orxonox_ship.cc

@@ -36 +36 @@
 #include "weapon/bullet.h"
 #include "weapon/bullet_manager.h"
-#include "weapon/weapon_manager.h"
+#include "weapon/weapon_station.h"
+#include "weapon/base_weapon.h"
+#include "weapon/ammunition_dump.h"
 
 #include "orxonox_ship.h"
@@ -68 +70 @@
   OrxonoxShip::OrxonoxShip(SceneManager *sceneMgr, SceneNode *node,
         BulletManager *bulletManager)
-              : sceneMgr_(sceneMgr), //currentSpeed_(Vector3(0, 0, 0)),
+              : sceneMgr_(sceneMgr),
         baseThrust_(1000), currentThrust_(Vector3::ZERO),
-        objectCounter_(0), bulletManager_(bulletManager)//, bulletSpeed_(400)
+        objectCounter_(0), bulletManager_(bulletManager)
   {
     rootNode_ = new InertialNode(node, Vector3::ZERO);
@@ -84 +86 @@
     if (mainWeapon_)
       delete mainWeapon_;
+    if (railGunStation_)
+      delete railGunStation_;
     if (rootNode_)
       delete rootNode_;
@@ -111 +115 @@
 
     // initialise weapon(s)
+    ammoDump_ = new AmmunitionDump(420);
+    ammoDump_->store(420);
+
     InertialNode *mainWeaponNode = rootNode_->createChildNode();
-    mainWeapon_ = new WeaponManager(sceneMgr_, mainWeaponNode,
-          bulletManager_, 1);
-    mainWeapon_->addWeapon("Barrel Gun");
+    mainWeapon_ = new BaseWeapon(sceneMgr_, mainWeaponNode,
+          bulletManager_, ammoDump_);
+
+    railGunStation_ = new WeaponStation(4);
+    railGunStation_->addWeapon(mainWeapon_);
+    railGunStation_->selectWeapon(0);
 
           return true;
@@ -198 +208 @@
   * @return Bullet containing speed and entity.
   */
-  WeaponManager* OrxonoxShip::getMainWeapon()
+  BaseWeapon* OrxonoxShip::getMainWeapon()
   {
     return mainWeapon_;
+  }
+
+
+  int OrxonoxShip::getAmmoStock()
+  {
+    return ammoDump_->getStockSize();
   }
 

code/branches/main_reto_vs05/src/orxonox_ship.h

@@ -54 +54 @@
     Ogre::Vector3 getSpeed();
 
-    weapon::WeaponManager* getMainWeapon();
+    weapon::BaseWeapon* getMainWeapon();
+
+    int getAmmoStock();
 
           bool tick(unsigned long, Ogre::Real);
@@ -74 +76 @@
           //Ogre::Vector3 bulletSpeed_;
 
-    weapon::WeaponManager *mainWeapon_;
+    weapon::BaseWeapon *mainWeapon_;
+    weapon::WeaponStation *railGunStation_;
+
+    weapon::AmmunitionDump *ammoDump_;
   };
 

code/branches/main_reto_vs05/src/run_manager.cc

@@ -56 +56 @@
 #include "weapon/bullet.h"
 #include "weapon/bullet_manager.h"
-#include "weapon/weapon_manager.h"
+#include "weapon/base_weapon.h"
 
 #include "run_manager.h"
@@ -108 +108 @@
     // create a bullet manager
     bulletManager_ = new BulletManager(sceneMgr_);
-    WeaponManager::loadWeapons();
 
 
@@ -213 +212 @@
     if (bulletManager_)
       delete bulletManager_;
-
-    WeaponManager::destroyWeapons();
   }
 
@@ -352 +349 @@
 
     if (keyboard_->isKeyDown(KC_G))
-      playerShip_->getMainWeapon()->addAction(WeaponManager::RELOAD);
+      playerShip_->getMainWeapon()->addAction(BaseWeapon::RELOAD);
 
     if( keyboard_->isKeyDown(KC_ESCAPE) || keyboard_->isKeyDown(KC_Q) )
@@ -421 +418 @@
     if(displayCameraDetails)
       debugText_ = " | Speed = "
-            + StringConverter::toString(playerShip_->getSpeed());
+            + StringConverter::toString(playerShip_->getSpeed())
+            + " | Left Ammo = "
+            + StringConverter::toString(playerShip_
+            ->getMainWeapon()->getAmmoState())
+            + " | Ammo stock = "
+            + StringConverter::toString(playerShip_->getAmmoStock());
     // debugText_ = "P: " + StringConverter::toString(camera_
     //      ->getDerivedPosition()) + " " + "O: "

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

@@ -32 +32 @@
 namespace weapon {
 
-  AmmunitionDump::AmmunitionDump()
+  AmmunitionDump::AmmunitionDump(int capacity)
+        : stock_(0), capacity_(capacity)
   {
   }
@@ -41 +42 @@
   }
 
+  
+  void AmmunitionDump::store(int quantity)
+  {
+    stock_ += quantity;
+    if (stock_ > capacity_)
+      stock_ = capacity_;
+  }
+
+
+  int AmmunitionDump::getAmmunition(int quantity)
+  {
+    if (stock_ >= quantity)
+    {
+      stock_ -= quantity;
+      return quantity;
+    }
+    else
+    {
+      quantity = stock_;
+      stock_ = 0;
+      return quantity;
+    }
+  }
+
+
+  int AmmunitionDump::getStockSize()
+  {
+    return stock_;
+  }
 }
 }

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

@@ -41 +41 @@
   {
   public:
-          AmmunitionDump();
+          AmmunitionDump(int capacity);
           ~AmmunitionDump();
 
+    void store(int quantiy);
+
+    int getAmmunition(int quantity);
+
+    int getStockSize();
+
   protected:
+    int stock_;
+    int capacity_;
 
   protected:

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

@@ -26 +26 @@
  */
 
+#if 0
 
 #ifndef WEAPON_H
@@ -42 +43 @@
   public:
     Weapon(const Ogre::String &name, int firePower, int firingRate,
-      Ogre::Real bulletSpeed)
+      Ogre::Real bulletSpeed, int magazineSize)
           : name_(name), firePower_(firePower), firingRate_(firingRate),
-          bulletSpeed_(bulletSpeed) { }
+          bulletSpeed_(bulletSpeed), magazineSize_(magazineSize) { }
 
     virtual ~Weapon() { }
@@ -53 +54 @@
     int firingRate_;
     Ogre::Real bulletSpeed_;
+    int magazineSize_;
   };
 
@@ -59 +61 @@
 
 #endif /* WEAPON_H */
+
+#endif