Changeset 2288

Timestamp:

Nov 26, 2008, 7:42:29 PM (16 years ago)

Author:

polakma

Message:

added WeaponPack

Location:

code/branches/weapon2/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• OrxonoxPrereqs.h (modified) (1 diff)
• objects/weaponSystem/Weapon.cc (modified) (1 diff)
• objects/weaponSystem/WeaponPack.cc (added)
• objects/weaponSystem/WeaponPack.h (added)
• objects/weaponSystem/WeaponSet.cc (modified) (3 diffs)
• objects/weaponSystem/WeaponSet.h (modified) (2 diffs)
• objects/weaponSystem/WeaponSlot.cc (modified) (2 diffs)
• objects/weaponSystem/WeaponSlot.h (modified) (2 diffs)
• objects/weaponSystem/WeaponSystem.cc (modified) (4 diffs)
• objects/weaponSystem/WeaponSystem.h (modified) (2 diffs)
• objects/weaponSystem/weapons/LaserGun.cc (modified) (1 diff)
• objects/worldentities/pawns/Pawn.cc (modified) (5 diffs)
• objects/worldentities/pawns/Pawn.h (modified) (1 diff)
• objects/worldentities/pawns/Spectator.cc (modified) (1 diff)
• objects/worldentities/pawns/Spectator.h (modified) (1 diff)

code/branches/weapon2/src/orxonox/CMakeLists.txt

@@ -88 +88 @@
   objects/weaponSystem/WeaponSet.cc
   objects/weaponSystem/WeaponSlot.cc
+  objects/weaponSystem/WeaponPack.cc
   objects/weaponSystem/Weapon.cc
   objects/weaponSystem/Munition.cc

code/branches/weapon2/src/orxonox/OrxonoxPrereqs.h

@@ -154 +154 @@
     class WeaponSet;
     class WeaponSlot;
+    class WeaponPack;
     class Weapon;
     class Munition;

code/branches/weapon2/src/orxonox/objects/weaponSystem/Weapon.cc

@@ -96 +96 @@
      */
     void Weapon::setParentWeaponSystem()
-    {   this->parentWeaponSystem_ = this->parentWeaponSlot_->getParentWeaponSet()->getParentWeaponSystem(); }
+    {   this->parentWeaponSystem_ = this->parentWeaponSlot_->getParentWeaponSystem(); }
 
     Munition * Weapon::getAttachedMunition()

code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSet.cc

@@ -35 +35 @@
 
 #include "WeaponSet.h"
+#include "WeaponPack.h"
 
 namespace orxonox
@@ -44 +45 @@
         this->parentWeaponSystem_ = 0;
 
-        /* will be made with XML
-        for (int i=0;i<k;i++)
-        {
-            attachWeaponSlot(new WeaponSlot(this));
-        }
-        */
     }
 
@@ -56 +51 @@
     }
 
-    void WeaponSet::attachWeaponSlot(WeaponSlot *wSlot)
+    void WeaponSet::attachWeaponPack(WeaponPack *wPack)
     {
-        this->weaponSlots_.push_back(wSlot);
+        if (this->parentWeaponSystem_->getWeaponSlotSize()>0 && wPack->getSize()>0 && ( wPack->getSize() <= this->parentWeaponSystem_->getWeaponSlotSize() ) )
+        {
+            //should be possible to choose which slot to use
+            for (  int i=0; i < wPack->getSize() ; i++  )
+            {
+                this->parentWeaponSystem_->getWeaponSlotPointer(i)->attachWeapon( wPack->getWeaponPointer(i) );
+            }
+        }
     }
 
+    /* this function will be in WeaponPack
     void WeaponSet::fire()
     {
         for (int i=0; i < (int) this->weaponSlots_.size(); i++)
         {
+COUT(0) << "WeaponSlot::fire"<< i << std::endl;
             this->weaponSlots_[i]->fire();
         }
     }
-
-    WeaponSlot * WeaponSet::getWeaponSlotPointer(unsigned int n)
-    {
-        if (n < this->weaponSlots_.size())
-            return this->weaponSlots_[n];
-        else
-            return 0;
-    }
-
+    */
 
     void WeaponSet::XMLPort(Element& xmlelement, XMLPort::Mode mode)

code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSet.h

@@ -48 +48 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
-            void attachWeaponSlot(WeaponSlot *wSlot);
+            void attachWeaponPack(WeaponPack *wPack);
             void fire();
-            WeaponSlot * getWeaponSlotPointer(unsigned int n);
 
             inline void setParentWeaponSystem(WeaponSystem *parentWeaponSystem)
@@ -58 +57 @@
 
         private:
-            std::vector<WeaponSlot *> weaponSlots_;
             WeaponSystem *parentWeaponSystem_;
     };

code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSlot.cc

@@ -44 +44 @@
         this->unlimitedAmmo_ = false;
         this->attachedWeapon_ = 0;
-        this->parentWeaponSet_ = 0;
         this->setObjectMode(0x0);
     }
@@ -65 +64 @@
     void WeaponSlot::fire()
     {
+COUT(0) << "WeaponSlot::fire" << std::endl;
         this->attachedWeapon_->fire();
     }

code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSlot.h

@@ -50 +50 @@
             void fire();
 
-            inline void setParentWeaponSet(WeaponSet *parentWeaponSet)
-                { parentWeaponSet_=parentWeaponSet; }
-            inline WeaponSet * getParentWeaponSet()
-                { return parentWeaponSet_; }
+            inline void setParentWeaponSystem(WeaponSystem *parentWeaponSystem)
+                { parentWeaponSystem_=parentWeaponSystem; }
+            inline WeaponSystem * getParentWeaponSystem()
+                { return parentWeaponSystem_; }
 
 
@@ -60 +60 @@
             bool unlimitedAmmo_;
 
-            WeaponSet *parentWeaponSet_;
+            WeaponSystem *parentWeaponSystem_;
     };
 }

code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSystem.cc

@@ -36 +36 @@
 
 #include "WeaponSystem.h"
+#include "WeaponPack.h"
 
 /* WEAPONSYSTEM
@@ -56 +57 @@
     WeaponSystem::~WeaponSystem()
     {
+    }
+
+    void WeaponSystem::attachWeaponPack(WeaponPack *wPack, int setNumber)
+    {
+        this->weaponSets_[setNumber]->attachWeaponPack(wPack);
+    }
+
+    void WeaponSystem::attachWeaponSlot(WeaponSlot *wSlot)
+    {
+        this->weaponSlots_.push_back(wSlot);
+        wSlot->setParentWeaponSystem(this);
     }
 
@@ -90 +102 @@
     void WeaponSystem::fire(WeaponMode::Enum n)
     {
+COUT(0) << "WeaponSystem::fire" << std::endl;
         if (n < (int)this->weaponSets_.size())
-            this->weaponSets_[n]->fire();
+COUT(0) << "WeaponSystem::fire - after if" << std::endl;
+            //this->weaponSets_[n]->fire();
     }
 
@@ -103 +117 @@
     }
 
+    WeaponSlot * WeaponSystem::getWeaponSlotPointer(unsigned int n)
+    {
+        if (n < this->weaponSlots_.size())
+            return this->weaponSlots_[n];
+        else
+            return 0;
+    }
+
     void WeaponSystem::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {

code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSystem.h

@@ -48 +48 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
+            void attachWeaponSlot(WeaponSlot *wSlot);
             void attachWeaponSet(WeaponSet *wSet);
-            void fire();
+            //void fire();
             void fire(WeaponMode::Enum fireMode);
             //void setActiveWeaponSet(unsigned int n);
+            void attachWeaponPack(WeaponPack * wPack, int setNumber);
             WeaponSet * getWeaponSetPointer(unsigned int n);
+            WeaponSlot * getWeaponSlotPointer(unsigned int n);
 
             void setNewMunition(std::string munitionType, Munition * munitionToAdd);
@@ -62 +65 @@
                 { return parentSpaceShip_; }
 
+            inline int getWeaponSlotSize()
+                { return this->weaponSlots_.size(); }
 
         private:
             std::vector<WeaponSet *> weaponSets_;
+            std::vector<WeaponSlot *> weaponSlots_;
             std::map<std::string, Munition *> munitionSet_;
             WeaponSet *activeWeaponSet_;

code/branches/weapon2/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc

@@ -56 +56 @@
     void LaserGun::fire()
     {
+COUT(0) << "LaserGun::fire" << std::endl;
         if ( this->getBulletReadyToShoot() && this->getMagazineReadyToShoot() )
         {

code/branches/weapon2/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -52 +52 @@
 
         this->lastHitOriginator_ = 0;
-        this->weaponSystem_ = 0;
 
         //WeaponSystem
@@ -58 +57 @@
         WeaponSet * weaponSet1 = new WeaponSet(this,1);
         this->weaponSystem_->attachWeaponSet(weaponSet1);
+        //totally bad solution...
+        weaponSet1->setParentWeaponSystem(weaponSystem_);
 
 
@@ -74 +75 @@
         XMLPortParam(Pawn, "maxhealth", setMaxHealth, getMaxHealth, xmlelement, mode).defaultValues(200);
         XMLPortParam(Pawn, "initialhealth", setInitialHealth, getInitialHealth, xmlelement, mode).defaultValues(100);
-    }
+
+        XMLPortObject(Pawn, WeaponSlot, "weaponslots", setWeaponSlot, getWeaponSlot, xmlelement, mode);
+        //XMLPortObject(Pawn, WeaponPack, "weapons", setWeaponPack, getWeaponPack, xmlelement, mode);
+
+        }
 
     void Pawn::registerVariables()
@@ -137 +142 @@
     void Pawn::fire(WeaponMode::Enum fireMode)
     {
+COUT(0) << "Pawn::fire" << std::endl;
         if (this->weaponSystem_)
             this->weaponSystem_->fire(fireMode);
@@ -146 +152 @@
         this->spawn();
     }
+
+    void Pawn::setWeaponSlot(WeaponSlot * wSlot)
+    {
+        this->weaponSystem_->attachWeaponSlot(wSlot);
+    }
+
+    WeaponSlot * Pawn::getWeaponSlot(unsigned int index) const
+    {
+        return this->weaponSystem_->getWeaponSlotPointer(index);
+    }
+
 }

code/branches/weapon2/src/orxonox/objects/worldentities/pawns/Pawn.h

@@ -79 +79 @@
             virtual void postSpawn();
 
+            void setWeaponSlot(WeaponSlot * wSlot);
+            WeaponSlot * getWeaponSlot(unsigned int index) const;
+
         protected:
             virtual void spawn();

code/branches/weapon2/src/orxonox/objects/worldentities/pawns/Spectator.cc

@@ -169 +169 @@
     }
 
-    void Spectator::fire()
+    void Spectator::fire(WeaponMode::Enum fireMode)
     {
         if (this->getPlayer())

code/branches/weapon2/src/orxonox/objects/worldentities/pawns/Spectator.h

@@ -56 +56 @@
             virtual void rotateRoll(const Vector2& value);
 
-            virtual void fire();
+            virtual void fire(WeaponMode::Enum fireMode);
             virtual void greet();