Changeset 232

Timestamp:

Nov 21, 2007, 12:44:02 AM (17 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

Files:

• scripts/weapon_framework.vcproj (modified) (5 diffs)
• src/class_hierarchy (added)
• src/class_hierarchy/BaseObject.cc (added)
• src/class_hierarchy/BaseObject.h (added)
• src/class_hierarchy/ClassHierarchy.cc (added)
• src/class_hierarchy/ClassHierarchy.h (added)
• src/class_hierarchy/Identifier.cc (added)
• src/class_hierarchy/Identifier.h (added)
• src/class_hierarchy/IdentifierIncludes.h (added)
• src/class_hierarchy/IdentifierList.cc (added)
• src/class_hierarchy/IdentifierList.h (added)
• src/class_hierarchy/ObjectList.cc (added)
• src/class_hierarchy/ObjectList.h (added)
• src/class_hierarchy/OrxonoxClass.cc (added)
• src/class_hierarchy/OrxonoxClass.h (added)
• src/class_hierarchy/Test.h (added)
• src/class_hierarchy/orxonox.cc (added)
• src/class_hierarchy/test1.cc (added)
• src/class_hierarchy/test1.h (added)
• src/class_hierarchy/test2.cc (added)
• src/class_hierarchy/test2.h (added)
• src/class_hierarchy/test3.cc (added)
• src/class_hierarchy/test3.h (added)
• src/main.cc (modified) (3 diffs)
• src/orxonox_prerequisites.h (modified) (1 diff)
• src/orxonox_ship.cc (modified) (4 diffs)
• src/orxonox_ship.h (modified) (1 diff)
• src/run_manager.cc (modified) (5 diffs)
• src/run_manager.h (modified) (3 diffs)
• src/weapon/ammunition_dump.cc (modified) (3 diffs)
• src/weapon/ammunition_dump.h (modified) (1 diff)
• src/weapon/barrel_gun.cc (added)
• src/weapon/barrel_gun.h (added)
• src/weapon/base_weapon.cpp (modified) (4 diffs)
• src/weapon/base_weapon.h (modified) (2 diffs)

code/branches/main_reto_vs05/scripts/weapon_framework.vcproj

@@ -42 +42 @@
                                 Optimization="0"
                                 AdditionalIncludeDirectories="..\src;"$(OGRE_HOME)\OgreMain\include";"$(OGRE_HOME)\Dependencies\include""
-                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+                                PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
                                 MinimalRebuild="true"
                                 BasicRuntimeChecks="3"
@@ -223 +223 @@
                                 </File>
                                 <File
+                                        RelativePath="..\src\weapon\barrel_gun.cc"
+                                        >
+                                </File>
+                                <File
                                         RelativePath="..\src\weapon\base_weapon.cpp"
                                         >
@@ -236 +240 @@
                                 <File
                                         RelativePath="..\src\weapon\weapon_station.cc"
+                                        >
+                                </File>
+                        </Filter>
+                        <Filter
+                                Name="class_hierarchy"
+                                >
+                                <File
+                                        RelativePath="..\src\class_hierarchy\BaseObject.cc"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\src\class_hierarchy\ClassHierarchy.cc"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\src\class_hierarchy\Identifier.cc"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\src\class_hierarchy\IdentifierList.cc"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\src\class_hierarchy\ObjectList.cc"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\src\class_hierarchy\OrxonoxClass.cc"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\src\class_hierarchy\test1.cc"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\src\class_hierarchy\test2.cc"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\src\class_hierarchy\test3.cc"
                                         >
                                 </File>
@@ -285 +329 @@
                                 </File>
                                 <File
+                                        RelativePath="..\src\weapon\barrel_gun.h"
+                                        >
+                                </File>
+                                <File
                                         RelativePath="..\src\weapon\base_weapon.h"
                                         >
@@ -302 +350 @@
                                 <File
                                         RelativePath="..\src\weapon\weapon_station.h"
+                                        >
+                                </File>
+                        </Filter>
+                        <Filter
+                                Name="class_hierarchy"
+                                >
+                                <File
+                                        RelativePath="..\src\class_hierarchy\BaseObject.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\src\class_hierarchy\ClassHierarchy.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\src\class_hierarchy\Identifier.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\src\class_hierarchy\IdentifierIncludes.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\src\class_hierarchy\IdentifierList.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\src\class_hierarchy\ObjectList.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\src\class_hierarchy\OrxonoxClass.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\src\class_hierarchy\Test.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\src\class_hierarchy\test1.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\src\class_hierarchy\test2.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\src\class_hierarchy\test3.h"
                                         >
                                 </File>

code/branches/main_reto_vs05/src/main.cc

@@ -31 +31 @@
 #include "orxonox.h"
 
+#include "class_hierarchy/BaseObject.h"
+#include "class_hierarchy/Test.h"
+#include "class_hierarchy/test1.h"
+#include "class_hierarchy/test2.h"
+#include "class_hierarchy/test3.h"
+
+
 #ifdef __cplusplus
 extern "C" {
@@ -43 +50 @@
 #endif 
   {
+#if 1
     try {
       // create an orxonox application and run it
@@ -60 +68 @@
     }
 
+#else
+#define testandcout(code) \
+    std::cout << #code << " " << code << "\n"
+
+    using namespace orxonox;
+
+    std::cout << "Test 8\n";
+
+    std::cout << "1\n";
+    Test1* test8_01 = new Test1;
+    Test1* asdf = new Test1;
+    Test3* test8_03 = new Test3;
+    test8_03->usefullClassesIsATest(test8_01);
+
+    std::cout << "2\n";
+    Test2* test8_02 = new Test2;
+    test8_03->usefullClassesIsATest(test8_02);
+
+    std::cout << "3\n";
+    test8_01->setUsefullClass1(Class(Test1));
+    test8_01->setUsefullClass1(test8_02->getIdentifier());
+    test8_01->setUsefullClass2(Class(Test2));
+    test8_01->setUsefullClassOfTypeTest3(Class(Test3));
+    test8_01->setUsefullClassOfTypeTest3(test8_03->getIdentifier());
+
+
+    testandcout(test8_01->isA(Class(Test1)));
+    testandcout(test8_01->isA(Class(Test2)));
+    testandcout(test8_01->isA(Class(Test3)));
+
+    Test2* test8_04 = new Test2;
+    testandcout(test8_02->isA(Class(Test1)));
+    testandcout(test8_02->isA(Class(Test2)));
+    testandcout(test8_02->isA(Class(Test3)));
+
+    Test3* test8_05 = new Test3;
+    testandcout(test8_03->isA(Class(Test1)));
+    testandcout(test8_03->isA(Class(Test2)));
+    testandcout(test8_03->isA(Class(Test3)));
+
+    delete test8_01;
+    delete test8_02;
+    delete test8_03;
+
+#endif
     return 0;
   }

code/branches/main_reto_vs05/src/orxonox_prerequisites.h

@@ -47 +47 @@
     class BulletManager;
     class BaseWeapon;
+    class BarrelGun;
     class WeaponStation;
 

code/branches/main_reto_vs05/src/orxonox_ship.cc

@@ -34 +34 @@
 
 #include "inertial_node.h"
+#include "run_manager.h"
 #include "weapon/bullet.h"
 #include "weapon/bullet_manager.h"
 #include "weapon/weapon_station.h"
 #include "weapon/base_weapon.h"
+#include "weapon/barrel_gun.h"
 #include "weapon/ammunition_dump.h"
 
@@ -68 +70 @@
   * @param mNode The scene node which the ship will be attached to later.
   */
-  OrxonoxShip::OrxonoxShip(SceneManager *sceneMgr, SceneNode *node,
-        BulletManager *bulletManager)
-              : sceneMgr_(sceneMgr),
-        baseThrust_(1000), currentThrust_(Vector3::ZERO),
-        objectCounter_(0), bulletManager_(bulletManager)
+  OrxonoxShip::OrxonoxShip(SceneNode *node)
+    : sceneMgr_(RunManager::getSingletonPtr()->getSceneManagerPtr()),
+      bulletManager_(RunManager::getSingletonPtr()->getBulletManagerPtr()),
+      baseThrust_(1000), currentThrust_(Vector3::ZERO), objectCounter_(0)
   {
     rootNode_ = new InertialNode(node, Vector3::ZERO);
@@ -115 +116 @@
 
     // initialise weapon(s)
-    ammoDump_ = new AmmunitionDump(420);
-    ammoDump_->store(420);
+    ammoDump_ = new AmmunitionDump();
+    ammoDump_->setDumpSize("Barrel", 1000);
+    ammoDump_->store("Barrel", 420);
 
     InertialNode *mainWeaponNode = rootNode_->createChildNode();
-    mainWeapon_ = new BaseWeapon(sceneMgr_, mainWeaponNode,
-          bulletManager_, ammoDump_);
+    mainWeapon_ = new BarrelGun(mainWeaponNode, ammoDump_);
 
     railGunStation_ = new WeaponStation(4);
@@ -216 +217 @@
   int OrxonoxShip::getAmmoStock()
   {
-    return ammoDump_->getStockSize();
+    return ammoDump_->getStockSize("Barrel");
   }
 

code/branches/main_reto_vs05/src/orxonox_ship.h

@@ -40 +40 @@
   {
   public:
-    OrxonoxShip(Ogre::SceneManager*, Ogre::SceneNode*, weapon::BulletManager*);
+    OrxonoxShip(Ogre::SceneNode*);
           virtual ~OrxonoxShip();
 

code/branches/main_reto_vs05/src/run_manager.cc

@@ -60 +60 @@
 #include "run_manager.h"
 
+namespace Ogre {
+  using namespace orxonox;
+  template<> RunManager* Singleton<RunManager>::ms_Singleton = 0;
+}
+
 namespace orxonox {
   using namespace Ogre;
@@ -77 +82 @@
   */
 
+  RunManager* RunManager::getSingletonPtr(void)
+  {
+      return ms_Singleton;
+  }
+  RunManager& RunManager::getSingleton(void)
+  {  
+      assert( ms_Singleton );  return ( *ms_Singleton );  
+  }
+
 
   /**
@@ -94 +108 @@
         debugOverlay_(0), inputManager_(0), mouse_(0), keyboard_(0), joystick_(0)
   {
-
     // SETTING UP THE SCENE
 
     // create one new SceneManger
-    sceneMgr_ = ogre_->getRoot()->createSceneManager(ST_GENERIC, "backgroundScene_");
+    sceneMgr_ = ogre_->getRoot()->createSceneManager(ST_GENERIC, "Orxonox Scene");
 
     // background scene (world objects, skybox, lights, etc.)
@@ -125 +138 @@
 
     // Construct a new spaceship and give it the node
-    playerShip_ = new OrxonoxShip(sceneMgr_, sceneMgr_->getRootSceneNode()
-      ->createChildSceneNode("ShipNode", Vector3(20, 20, 20)), bulletManager_);
+    playerShip_ = new OrxonoxShip(sceneMgr_->getRootSceneNode()
+      ->createChildSceneNode("ShipNode", Vector3(20, 20, 20)));
 
 
@@ -274 +287 @@
     // keep rendering
     return true;
+  }
+
+
+  SceneManager& RunManager::getSceneManager()
+  {
+    return *sceneMgr_;
+  }
+
+  SceneManager* RunManager::getSceneManagerPtr()
+  {
+    return sceneMgr_;
+  }
+
+  BulletManager* RunManager::getBulletManagerPtr()
+  {
+    return bulletManager_;
+  }
+
+  int RunManager::getAmmunitionID(const Ogre::String &ammoName)
+  {
+    Ogre::String ammoTypes[] = { "Energy Cell", "Barrel", "Lead Shot" };
+    int ammoTypesLength = 3;
+
+    for (int i = 0; i < ammoTypesLength; i++)
+    {
+      if (ammoTypes[i] == ammoName)
+        return i;
+    }
+    return -1;
+  }
+
+  int RunManager::getNumberOfAmmos()
+  {
+    return 3;
   }
 

code/branches/main_reto_vs05/src/run_manager.h

@@ -33 +33 @@
 #include "OgreWindowEventUtilities.h"
 #include "OgreTextureManager.h"
+#include "OgreSingleton.h"
 
 #include <OIS/OISPrereqs.h>
@@ -43 +44 @@
   // let the class inherit from WindowEventListener in order for the RunMgr
   // to act as the central point of all the calcuations in Orxonox
-  class RunManager : Ogre::WindowEventListener
+  class RunManager : public Ogre::WindowEventListener,
+                     public Ogre::Singleton<RunManager>
   {
   public:
-          RunManager(OgreControl*);
+    RunManager(OgreControl*);
 
-          virtual ~RunManager();
+    virtual ~RunManager();
+    //void initialise(OgreControl*);
 
-    virtual bool tick(unsigned long, Ogre::Real);
+    bool tick(unsigned long, Ogre::Real);
+
+    Ogre::SceneManager& getSceneManager();
+
+    Ogre::SceneManager* getSceneManagerPtr();
+
+    weapon::BulletManager* getBulletManagerPtr();
+
+    int getAmmunitionID(const Ogre::String&);
+
+    int getNumberOfAmmos();
+
+    static RunManager& getSingleton(void);
+
+    static RunManager* getSingletonPtr(void);
+
 
   protected:
-          virtual void createCamera(void);
+          void createCamera(void);
 
-          virtual void createViewports(void);
+          void createViewports(void);
 
 
@@ -61 +79 @@
 
           //Adjust mouse clipping area
-          virtual void windowResized(Ogre::RenderWindow*);
+          void windowResized(Ogre::RenderWindow*);
 
           //Unattach OIS before window shutdown (very important under Linux)
-          virtual void windowClosed(Ogre::RenderWindow*);
+          void windowClosed(Ogre::RenderWindow*);
 
 
           /** INPUT PROCESSING **/
-          virtual bool processUnbufferedKeyInput();
+          bool processUnbufferedKeyInput();
 
-          virtual bool processUnbufferedMouseInput();
+          bool processUnbufferedMouseInput();
 
 
           /** OUTPUT **/
 
-          virtual void updateStats(void);
+          void updateStats(void);
 
-          virtual void showDebugOverlay(bool);
+          void showDebugOverlay(bool);
 
   protected:

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: