Changeset 2289 for code/branches

Timestamp:

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

Author:

dsommer

Message:

Added ShipEquipment to Pawn and various funtions for it -not compiling, because private…

Location:

code/branches/pickups2/src/orxonox/objects

Files:

• pickup/Item.cc (modified) (1 diff)
• pickup/Item.h (modified) (2 diffs)
• pickup/ShipEquipment.cc (added)
• pickup/ShipEquipment.h (modified) (4 diffs)
• pickup/Turbo.cc (modified) (5 diffs)
• pickup/Turbo.h (modified) (3 diffs)
• worldentities/pawns/Pawn.h (modified) (3 diffs)
• worldentities/pawns/SpaceShip.h (modified) (2 diffs)

code/branches/pickups2/src/orxonox/objects/pickup/Item.cc

@@ -29 +29 @@
 void Item::addTo (Pawn* player)
 {
-        //player->Equipment.insert ( std::pair<std::string, Item*>(this->itemname,this) );
+        if(checkSlot(player)==true)
+        player->pickUp.Equipment.insert ( std::pair<std::string, Item*>(this->getName(),this) );
+        else
+        COUT(3) << "swap?" << std::endl;
 }
-
+bool Item::remove(Pawn* player)
+{
+        if(player->pickUp.Equipment.find(this->getName())!= player->pickUp.Equipment.end())
+        {
+        std::multimap<std::string,Item*>::iterator it;
+        it=player->pickUp.Equipment.find(this->getName());
+        player->pickUp.Equipment.erase (it);
+        return true;
+        }
+        else
+        return false;
+}
+bool Item::checkSlot(Pawn* player)
+{
+        std::multimap<std::string,Item*>::iterator it;
+        for ( it=player->pickUp.Equipment.begin() ; it != player->pickUp.Equipment.end(); it++ )
+        {
+        if((*it).second->playerBaseClass_==this->playerBaseClass_)
+        return false;
+        }
+        return true;
+}
 void Item::setPlayerBaseClassName(const std::string& name)
 {

code/branches/pickups2/src/orxonox/objects/pickup/Item.h

@@ -12 +12 @@
         Item( BaseObject* creator);
         virtual ~Item();
-
+        bool checkSlot(Pawn* player);
         virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-
+        
         virtual bool pickedUp(Pawn* player) { return true; }
         virtual bool dropped(Pawn* player) { return true; } //erst bei festen Items
+        bool remove(Pawn* player);
         void addTo(Pawn* player);
 
@@ -28 +29 @@
         const std::string& getPlayerBaseClassName() const;
 
-        Identifier* playerBaseClass_; //class(...)
+        Identifier* playerBaseClass_;
         };
 }

code/branches/pickups2/src/orxonox/objects/pickup/ShipEquipment.h

@@ -3 +3 @@
 #define _ShipEquipment_H__
 #include <string>
-#include <multimap>
+#include <map>
+#include "Item.h"
 
 
@@ -11 +12 @@
 
 
+/*          std::map<std::itemtype, Item*> EQClasses;
+            EQClasses["jacke"] = 0;
+            Item* item = itemMap_["jacke"];
+
+           if (itemMap_["jacke"])
+           if (itemMap_.find("jacke") != itemMap_.end()) */
 namespace orxonox
 {
@@ -16 +23 @@
     {
         public:
-            void AddItem(Shipitem toAddItem);
-            void RemoveItem(Shipitem toRemoveItem);
-            bool CheckifValid(Shipitem toBeChecked);
-            int
+        inline int getSpace()
+        {
+        return Usable.size()+Trunk.size();
+        };
+
+//      const std::multimap<std::string, Item*>& getEquipment() const { return this->Equipment; }
 
         private:
             std::multimap<std::string, Item*> Equipment;
+            std::multimap<std::string, Item*> Usable;
+            std::multimap<std::string, Item*> Trunk;
     };
 }
@@ -39 +50 @@
 
 
-
-
-
-
 #endif

code/branches/pickups2/src/orxonox/objects/pickup/Turbo.cc

@@ -19 +19 @@
                 this->duration_ = 0;
                 this->accboost_ = 1;
+                this->rotacc_= 0;
         }
 
@@ -32 +33 @@
         XMLPortParam(Turbo, "duration", setDuration, getDuration, xmlelement, mode);
         XMLPortParam(Turbo, "accboost", setAccBoost, getAccBoost, xmlelement, mode);
+        XMLPortParam(Turbo, "rotacc", setRotAcc, getRotAcc, xmlelement, mode);
+        
     }
 
@@ -53 +56 @@
         ship->setMaxSpeed( ship->getMaxSpeed() - this->boost_);
         ship->setTransAcc( ship->getTransAcc()/this->accboost_);
+        ship->setMaxRotation( ship->getMaxRotation()-this->rotacc_);
+        ship->setRotAcc( ship->getRotAcc()-this->rotacc_);
         COUT(3)<<"PickUp Timer expired"<<std::endl;
         }
@@ -60 +65 @@
         ship->setMaxSpeed( ship->getMaxSpeed() + this->boost_);
         ship->setTransAcc( ship->getTransAcc()*this->accboost_);
+        ship->setMaxRotation( ship->getMaxRotation()+this->rotacc_);
+        ship->setRotAcc( ship->getRotAcc()+this->rotacc_);
         if( this->duration_ != 0)
         {
@@ -72 +79 @@
                 if (this->duration_ == 0)
                 {
-                        //player->Equipment.erase ( std::pair<std::string, Item*>(this->itemname,this) );
+                        if(remove(player)==true);
+                        {
                         SpaceShip* ship = dynamic_cast <SpaceShip*>(player);
                         this->unsetSpeedBoost(ship);
+                        }       
                 }
                 return true;

code/branches/pickups2/src/orxonox/objects/pickup/Turbo.h

@@ -5 +5 @@
 #include "Item.h"
 #include "OrxonoxPrereqs.h"
+#include "util/Math.h"
 
 namespace orxonox
@@ -33 +34 @@
                 { return this->duration_; }
 
+        inline void setRotAcc(Degree rotacc)
+                { this->rotacc_ = rotacc; }
+        inline Degree getRotAcc() const
+                { return this->rotacc_; }
+
         
         inline void setAccBoost(float accboost)
@@ -44 +50 @@
         float duration_;
         float accboost_;
+        Degree rotacc_;
         };
 }

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

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
-
+#include "objects/pickup/ShipEquipment.h"
 #include "objects/worldentities/ControllableEntity.h"
 
@@ -75 +75 @@
 
             virtual void fire();
-
+            ShipEquipment pickUp;
             virtual void postSpawn();
 
@@ -83 +83 @@
 
             bool bAlive_;
+            
 
             float health_;

code/branches/pickups2/src/orxonox/objects/worldentities/pawns/SpaceShip.h

@@ -74 +74 @@
             inline float getMaxSecondarySpeed() const
                 { return this->maxSecondarySpeed_; }
-            inline float getMaxRotation() const
-                { return this->maxRotation_.valueDegrees(); }
+            inline const Degree& getMaxRotation() const
+                { return this->maxRotation_; }
             inline float getTransAcc() const
                 { return this->translationAcceleration_; }
-            inline float getRotAcc() const
-                { return this->rotationAcceleration_.valueDegrees(); }
+            inline const Degree& getRotAcc() const
+                { return this->rotationAcceleration_; }
             inline float getTransDamp() const
                 { return this->translationDamping_; }
@@ -90 +90 @@
             float translationAcceleration_;
             float translationDamping_;
-
             Degree maxRotation_;
             Degree rotationAcceleration_;