Changeset 2915

Timestamp:

Apr 12, 2009, 12:34:55 AM (16 years ago)

Author:

landauf

Message:

• switched back to std::vector for the WeaponSlots to keep them in the same order as in the XML file
• added DefaultWeaponmodeLink, a class which links weaponmodes (a property of a Weapon or a WeaponPack) with firemodes (one firemode corresponds to one WeaponSet). This can be changed later (for example in a nice GUI), but DefaultWeaponmodeLink defines the default value.

Location:

code/branches/weapons/src/orxonox

Files:

• OrxonoxPrereqs.h (modified) (1 diff)
• objects/weaponSystem/CMakeLists.txt (modified) (1 diff)
• objects/weaponSystem/DefaultWeaponmodeLink.cc (added)
• objects/weaponSystem/DefaultWeaponmodeLink.h (added)
• objects/weaponSystem/Weapon.cc (modified) (3 diffs)
• objects/weaponSystem/WeaponPack.cc (modified) (7 diffs)
• objects/weaponSystem/WeaponPack.h (modified) (2 diffs)
• objects/weaponSystem/WeaponSet.cc (modified) (1 diff)
• objects/weaponSystem/WeaponSystem.cc (modified) (8 diffs)
• objects/weaponSystem/WeaponSystem.h (modified) (2 diffs)

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

@@ -157 +157 @@
     class WeaponPack;
     class Weapon;
+    class DefaultWeaponmodeLink;
     class Munition;
     class LaserGun;

code/branches/weapons/src/orxonox/objects/weaponSystem/CMakeLists.txt

@@ -6 +6 @@
   WeaponSlot.cc
   WeaponSystem.cc
+  DefaultWeaponmodeLink.cc
 )
 

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

@@ -34 +34 @@
 
 #include "Munition.h"
+#include "WeaponPack.h"
 #include "WeaponSystem.h"
 
@@ -64 +65 @@
     {
 COUT(0) << "~Weapon" << std::endl;
+        if (this->isInitialized() && this->weaponPack_)
+            this->weaponPack_->removeWeapon(this);
     }
 
@@ -69 +72 @@
     {
         SUPER(Weapon, XMLPort, xmlelement, mode);
+
         XMLPortParam(Weapon, "munitionType", setMunitionType, getMunitionType, xmlelement, mode);
         XMLPortParam(Weapon, "bulletLoadingTime", setBulletLoadingTime, getBulletLoadingTime, xmlelement, mode);

code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponPack.cc

@@ -23 +23 @@
  *      Martin Polak
  *   Co-authors:
- *      ... *
+ *      ...
+ *
  */
 
@@ -36 +37 @@
 #include "WeaponSlot.h"
 #include "WeaponSystem.h"
+#include "DefaultWeaponmodeLink.h"
 
 namespace orxonox
@@ -55 +57 @@
 
         if (this->isInitialized() && this->weaponSystem_)
+        {
             this->weaponSystem_->removeWeaponPack(this);
+
+            while (!this->weapons_.empty())
+                delete (*this->weapons_.begin());
+
+            for (std::set<DefaultWeaponmodeLink*>::iterator it = this->links_.begin(); it != this->links_.end(); )
+                delete (*(it++));
+        }
     }
 
@@ -63 +73 @@
 
         XMLPortObject(WeaponPack, Weapon, "", addWeapon, getWeapon, xmlelement, mode);
+        XMLPortObject(WeaponPack, DefaultWeaponmodeLink, "links", addDefaultWeaponmodeLink, getDefaultWeaponmodeLink, xmlelement, mode);
     }
 
@@ -80 +91 @@
     }
 
+    void WeaponPack::removeWeapon(Weapon * weapon)
+    {
+        if (!weapon)
+            return;
+
+        this->weapons_.erase(weapon);
+        weapon->setWeaponPack(0);
+    }
+
     Weapon * WeaponPack::getWeapon(unsigned int index) const
     {
@@ -94 +114 @@
     }
 
-    void WeaponPack::setWeaponSystemToAllWeapons(WeaponSystem * weaponSystem)
+    void WeaponPack::setWeaponSystemToAllWeapons()
     {
         for (std::set<Weapon *>::const_iterator it = this->weapons_.begin(); it != this->weapons_.end(); ++it)
-            (*it)->setWeaponSystem(weaponSystem);
+            (*it)->setWeaponSystem(this->weaponSystem_);
     }
 
@@ -108 +128 @@
         }
     }
+
+    void WeaponPack::addDefaultWeaponmodeLink(DefaultWeaponmodeLink* link)
+    {
+        this->links_.insert(link);
+    }
+
+    DefaultWeaponmodeLink* WeaponPack::getDefaultWeaponmodeLink(unsigned int index) const
+    {
+        unsigned int i = 0;
+        for (std::set<DefaultWeaponmodeLink*>::const_iterator it = this->links_.begin(); it != this->links_.end(); ++it)
+        {
+            if (i == index)
+                return (*it);
+
+            ++i;
+        }
+        return 0;
+    }
+
+    unsigned int WeaponPack::getDesiredWeaponmode(unsigned int firemode) const
+    {
+        for (std::set<DefaultWeaponmodeLink*>::const_iterator it = this->links_.begin(); it != this->links_.end(); ++it)
+            if ((*it)->getFiremode() == firemode)
+                return (*it)->getWeaponmode();
+
+        return WeaponSystem::WEAPON_MODE_UNASSIGNED;
+    }
 }

code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponPack.h

@@ -50 +50 @@
 
             void addWeapon(Weapon * weapon);
+            void removeWeapon(Weapon * weapon);
             Weapon * getWeapon(unsigned int index) const;
 
@@ -55 +56 @@
                 { return this->weapons_.size(); }
 
-            unsigned int getDesiredWeaponmode(unsigned int firemode) { return 0; } // TODO
+            void addDefaultWeaponmodeLink(DefaultWeaponmodeLink* link);
+            DefaultWeaponmodeLink* getDefaultWeaponmodeLink(unsigned int index) const;
 
-            void attachNeededMunitionToAllWeapons();
+            unsigned int getDesiredWeaponmode(unsigned int firemode) const;
 
             inline void setWeaponSystem(WeaponSystem *weaponSystem)
-                { this->weaponSystem_ = weaponSystem; this->setWeaponSystemToAllWeapons(weaponSystem); }
+            {
+                this->weaponSystem_ = weaponSystem;
+                this->setWeaponSystemToAllWeapons();
+                this->attachNeededMunitionToAllWeapons();
+            }
             inline WeaponSystem * getWeaponSystem() const
                 { return this->weaponSystem_; }
 
         private:
-            void setWeaponSystemToAllWeapons(WeaponSystem * weaponSystem);
+            void setWeaponSystemToAllWeapons();
+            void attachNeededMunitionToAllWeapons();
 
             std::set<Weapon *> weapons_;
+            std::set<DefaultWeaponmodeLink *> links_;
             WeaponSystem * weaponSystem_;
     };

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

@@ -23 +23 @@
  *      Martin Polak
  *   Co-authors:
- *      ... *
+ *      ...
+ *
  */
 

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

@@ -63 +63 @@
                 this->pawn_->setWeaponSystem(0);
 
-            for (std::map<unsigned int, WeaponSet*>::iterator it = this->weaponSets_.begin(); it != this->weaponSets_.end(); )
-                delete (it++)->second;
-
-            for (std::set<WeaponPack*>::iterator it = this->weaponPacks_.begin(); it != this->weaponPacks_.end(); )
-                delete (*(it++));
-
-            for (std::set<WeaponSlot*>::iterator it = this->weaponSlots_.begin(); it != this->weaponSlots_.end(); )
-                delete (*(it++));
+//            for (std::map<unsigned int, WeaponSet*>::iterator it = this->weaponSets_.begin(); it != this->weaponSets_.end(); )
+//                delete (it++)->second;
+            while (!this->weaponSets_.empty())
+                delete (this->weaponSets_.begin()->second);
+
+//            for (std::set<WeaponPack*>::iterator it = this->weaponPacks_.begin(); it != this->weaponPacks_.end(); )
+//                delete (*(it++));
+            while (!this->weaponPacks_.empty())
+                delete (*this->weaponPacks_.begin());
+
+//            for (std::vector<WeaponSlot*>::iterator it = this->weaponSlots_.begin(); it != this->weaponSlots_.end(); )
+//                delete (*(it++));
+            while (!this->weaponSlots_.empty())
+                delete (*this->weaponSlots_.begin());
         }
     }
@@ -79 +85 @@
             return;
 
-        this->weaponSlots_.insert(wSlot);
+        this->weaponSlots_.push_back(wSlot);
         wSlot->setWeaponSystem(this);
     }
@@ -91 +97 @@
             this->removeWeaponPack(wSlot->getWeapon()->getWeaponPack());
 
-        this->weaponSlots_.erase(wSlot);
+        for (std::vector<WeaponSlot*>::iterator it = this->weaponSlots_.begin(); it != this->weaponSlots_.end(); ++it)
+        {
+            if ((*it) == wSlot)
+            {
+                this->weaponSlots_.erase(it);
+                break;
+            }
+        }
     }
 
@@ -97 +110 @@
     {
         unsigned int i = 0;
-        for (std::set<WeaponSlot*>::iterator it = this->weaponSlots_.begin(); it != this->weaponSlots_.end(); ++it)
+        for (std::vector<WeaponSlot*>::const_iterator it = this->weaponSlots_.begin(); it != this->weaponSlots_.end(); ++it)
         {
             ++i;
@@ -159 +172 @@
 
         unsigned int freeSlots = 0;
-        for (std::set<WeaponSlot*>::iterator it = this->weaponSlots_.begin(); it != this->weaponSlots_.end(); ++it)
+        for (std::vector<WeaponSlot*>::iterator it = this->weaponSlots_.begin(); it != this->weaponSlots_.end(); ++it)
         {
             if (!(*it)->isOccupied())
@@ -175 +188 @@
         // Attach all weapons to the first free slots (and to the Pawn)
         unsigned int i = 0;
-        for (std::set<WeaponSlot*>::iterator it = this->weaponSlots_.begin(); it != this->weaponSlots_.end(); ++it)
+        for (std::vector<WeaponSlot*>::iterator it = this->weaponSlots_.begin(); it != this->weaponSlots_.end(); ++it)
         {
             if (!(*it)->isOccupied() && i < wPack->getNumWeapons())
@@ -196 +209 @@
         this->weaponPacks_.insert(wPack);
         wPack->setWeaponSystem(this);
-        wPack->attachNeededMunitionToAllWeapons(); // TODO - what is this?
 
         return true;
@@ -231 +243 @@
     bool WeaponSystem::swapWeaponSlots(WeaponSlot * wSlot1, WeaponSlot * wSlot2)
     {
-        // TODO
+        if (!wSlot1 || !wSlot2)
+            return false;
+
+        Weapon* weapon1 = wSlot1->getWeapon();
+        Weapon* weapon2 = wSlot2->getWeapon();
+
+        wSlot1->attachWeapon(weapon2);
+        wSlot2->attachWeapon(weapon1);
+
+        return true;
+        // In the future, certain weapons might not fit to some slots. Swapping would then be
+        // impossible and the returnvalue would be false.
     }
 

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

@@ -35 +35 @@
 #include <set>
 #include <map>
+#include <vector>
 
 #include "core/BaseObject.h"
@@ -93 +94 @@
         private:
             std::map<unsigned int, WeaponSet *> weaponSets_;
-            std::set<WeaponSlot *> weaponSlots_;
+            std::vector<WeaponSlot *> weaponSlots_;
             std::set<WeaponPack *> weaponPacks_;
             std::map<std::string, Munition *> munitionSet_;