Changeset 2900

Timestamp:

Apr 6, 2009, 3:53:50 PM (16 years ago)

Author:

danielh

Message:

• some changes to the base framework
• added DroppedItem
• implemented usable items and a test UsableItem (Jump), console command to use an item is "useItem"
• added ModifierType::Acceleration

Location:

code/branches/pickups

Files:

• . (modified) (1 prop)
• src/orxonox/objects/controllers/HumanController.cc (modified) (4 diffs)
• src/orxonox/objects/controllers/HumanController.h (modified) (1 diff)
• src/orxonox/objects/items/Engine.cc (modified) (1 diff)
• src/orxonox/objects/pickup/BaseItem.cc (modified) (1 diff)
• src/orxonox/objects/pickup/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/pickup/DroppedItem.cc (added)
• src/orxonox/objects/pickup/DroppedItem.h (added)
• src/orxonox/objects/pickup/Jump.cc (added)
• src/orxonox/objects/pickup/Jump.h (added)
• src/orxonox/objects/pickup/ModifierPickup.cc (modified) (2 diffs)
• src/orxonox/objects/pickup/ModifierPickup.h (modified) (2 diffs)
• src/orxonox/objects/pickup/ModifierType.h (modified) (1 diff)
• src/orxonox/objects/pickup/PickupCollection.cc (modified) (2 diffs)
• src/orxonox/objects/pickup/PickupCollection.h (modified) (2 diffs)
• src/orxonox/objects/pickup/UsableItem.h (modified) (1 diff)
• src/orxonox/objects/worldentities/ControllableEntity.h (modified) (1 diff)
• src/orxonox/objects/worldentities/pawns/Pawn.h (modified) (1 diff)

code/branches/pickups/src/orxonox/objects/controllers/HumanController.cc

@@ -48 +48 @@
     SetConsoleCommand(HumanController, boost,         true).keybindMode(KeybindMode::OnHold);
     SetConsoleCommand(HumanController, greet,         true);
-    SetConsoleCommand(HumanController, use,           true);
     SetConsoleCommand(HumanController, switchCamera,  true);
     SetConsoleCommand(HumanController, mouseLook,     true);
@@ -55 +54 @@
     SetConsoleCommand(HumanController, killBots,      true).defaultValues(0);
     SetConsoleCommand(HumanController, dropItems,     true);
+    SetConsoleCommand(HumanController, useItem,       true);
 
     CreateUnloadableFactory(HumanController);
@@ -132 +132 @@
     }
 
-    void HumanController::use()
-    {
-        if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
-            HumanController::localController_s->controllableEntity_->use();
-    }
-
     void HumanController::switchCamera()
     {
@@ -160 +154 @@
     }
 
+    void HumanController::useItem()
+    {
+        if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
+            HumanController::localController_s->controllableEntity_->useItem();
+    }
+
     void HumanController::addBots(unsigned int amount)
     {

code/branches/pickups/src/orxonox/objects/controllers/HumanController.h

@@ -56 +56 @@
             static void boost();
             static void greet();
-            static void use();
             static void switchCamera();
             static void mouseLook();
             static void dropItems();
+            static void useItem();
 
             static void suicide();

code/branches/pickups/src/orxonox/objects/items/Engine.cc

@@ -192 +192 @@
         }
 
-        this->ship_->setAcceleration(this->ship_->getOrientation() * acceleration);
+        this->ship_->setAcceleration(this->ship_->getPickups().processModifiers(ModifierType::Acceleration, this->ship_->getOrientation() * acceleration, false));
 
         if (!this->ship_->getPermanentBoost())

code/branches/pickups/src/orxonox/objects/pickup/BaseItem.cc

@@ -63 +63 @@
         this->setOwner(pawn);
 
-        COUT(3) << "Adding '" << this->getPickupIdentifier() << "' item." << std::endl;
-
-        return pawn->getPickups().add(this);
+        if (pawn->getPickups().add(this))
+        {
+            COUT(3) << "Added '" << this->getPickupIdentifier() << "' item." << std::endl;
+            return true;
+        }
+        return false;
     }
     /**

code/branches/pickups/src/orxonox/objects/pickup/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   BaseItem.cc
+  DroppedItem.cc
   EquipmentItem.cc
+  Jump.cc
   ModifierPickup.cc
   PassiveItem.cc

code/branches/pickups/src/orxonox/objects/pickup/ModifierPickup.cc

@@ -74 +74 @@
         XMLPortParamTemplate(ModifierPickup, "damageAdd", setAdditiveDamage, getAdditiveDamage, element, mode, float);
         XMLPortParamTemplate(ModifierPickup, "damageMulti", setMultiplicativeDamage, getMultiplicativeDamage, element, mode, float);
+
+        XMLPortParamTemplate(ModifierPickup, "accelerationAdd", setAdditiveAcceleration, getAdditiveAcceleration, element, mode, float);
+        XMLPortParamTemplate(ModifierPickup, "accelerationMulti", setMultiplicativeAcceleration, getMultiplicativeAcceleration, element, mode, float);
     }
     /**
@@ -141 +144 @@
                 this->timer_.stopTimer();
 
+            delete this;
+
             return true;
         }

code/branches/pickups/src/orxonox/objects/pickup/ModifierPickup.h

@@ -58 +58 @@
         virtual bool dropped(Pawn* pawn);                               //!< Override of the BaseItem::dropped() method
 
+        virtual int getMaxCarryAmount(){ return INT_MAX; }              //!< Allow the player to carry infinite ModPickups
+
         /**
             @brief Get the duration of this pickup.
@@ -97 +99 @@
             { this->setMultiplicativeModifier(ModifierType::Damage, value); }
 
+        /**
+            @brief Get the amount of acceleration this pickup adds.
+            @return Returns how much acceleration this pickup adds.
+        */
+        inline float getAdditiveAcceleration() const
+            { return this->getAdditiveModifier(ModifierType::Acceleration); }
+        /**
+            @brief Get the factor by which this pickup multiplies the acceleration.
+            @return Returns the factor by which to multiply acceleration.
+        */
+        inline float getMultiplicativeAcceleration() const
+            { return this->getMultiplicativeModifier(ModifierType::Acceleration); }
+
+        /**
+            @brief Set the amount of acceleration this pickup adds.
+            @param value How much acceleration this pickup adds.
+        */
+        inline void setAdditiveAcceleration(float value)
+            { this->setAdditiveModifier(ModifierType::Acceleration, value); }
+        /**
+            @brief Set the factor by which this pickup multiplies the acceleration.
+            @param value Factor by which to multiply acceleration.
+        */
+        inline void setMultiplicativeAcceleration(float value)
+            { this->setMultiplicativeModifier(ModifierType::Acceleration, value); }
+
         void timerCallback(Pawn* pawn);     //!< Method called when the timer runs out.
     private:

code/branches/pickups/src/orxonox/objects/pickup/ModifierType.h

@@ -45 +45 @@
         {
             Unknown = 0,
-            Damage
+            Damage,
+            Acceleration
         };
     }

code/branches/pickups/src/orxonox/objects/pickup/PickupCollection.cc

@@ -94 +94 @@
         for (std::multimap<std::string, BaseItem*>::iterator it = this->items_.begin(); it != this->items_.end(); it++)
         {
-            (*it).second->dropped((*it).second->getOwner());
-
-            delete (*it).second;
+            if((*it).second && (*it).second->getOwner())
+                (*it).second->dropped((*it).second->getOwner());
         }
         this->items_.clear();
@@ -125 +124 @@
             return false;
         }
+    }
+    //! Uses the first usable item in the collection on the owner.
+    void PickupCollection::useItem()
+    {
+        Identifier* ident = Class(UsableItem);
+        for (std::multimap<std::string, BaseItem*>::iterator it = this->items_.begin(); it != this->items_.end(); it++)
+        {
+            if ((*it).second->isA(ident))
+            {
+                UsableItem* asUsable = dynamic_cast<UsableItem*>((*it).second);
+                asUsable->used(this->owner_);
+                return;
+            }
+        }
+    }
+    /**
+        @brief Uses a usable item on the owner of the collection.
+        @param item Item to use.
+    */
+    void PickupCollection::useItem(UsableItem* item)
+    {
+        if (item && this->owner_)
+            item->used(this->owner_);
     }
     /**

code/branches/pickups/src/orxonox/objects/pickup/PickupCollection.h

@@ -48 +48 @@
 {
     class BaseItem;
+    class UsableItem;
     class Pawn;
 
@@ -67 +68 @@
 
         void remove(BaseItem* item, bool removeAllOfType = false);                  //!< Remove an item from the collection.
+
+        void useItem();                                                             //!< Use the first usable item.
+        void useItem(UsableItem* item);                                             //!< Use a usable item.
 
         void addAdditiveModifier(ModifierType::Enum type, float value);             //!< Add an additive modifier.

code/branches/pickups/src/orxonox/objects/pickup/UsableItem.h

@@ -52 +52 @@
 
         /**
-            @brief Method invoked if the item was used.
-            @param pawn Pawn which used the item.
+            @brief Method invoked when the item is being used.
+            @param pawn Pawn which is using the item.
         */
         virtual void used(Pawn* pawn) { }

code/branches/pickups/src/orxonox/objects/worldentities/ControllableEntity.h

@@ -87 +87 @@
             virtual void boost() {}
             virtual void greet() {}
-            virtual void use() {}
+            virtual void useItem() {}
             virtual void dropItems() {}
             virtual void switchCamera();

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

@@ -110 +110 @@
             inline PickupCollection& getPickups()
                 { return this->pickups_; }
+            virtual void useItem()
+                { this->pickups_.useItem(); }
 
         protected: