Changeset 7162 for code/branches/presentation3/src/orxonox/interfaces/PickupCarrier.h

Timestamp:

Aug 8, 2010, 8:53:52 PM (15 years ago)

Author:

dafrick

Message:

Significant structural changes to the pickup module. Lots of bugs found and fixed.
Introduced a new class CollectiblePickup (which is now the only kind a PickupCollection can consist of) to solve some issues cleanly.
MetaPickup received additional functionality. It can now also be set to either destroy all the pickups of a PickupCarrier or destroy the PickupCarrier itself. (This was done mainly for testing purposes)
I've done some extensive testing on the pickups, so they should really work now.

File:

• code/branches/presentation3/src/orxonox/interfaces/PickupCarrier.h (modified) (5 diffs)

code/branches/presentation3/src/orxonox/interfaces/PickupCarrier.h

@@ -79 +79 @@
             PickupCarrier(); //!< Constructor.
             virtual ~PickupCarrier(); //!< Destructor.
+            void preDestroy(void);
 
             /**
@@ -138 +139 @@
             virtual const Vector3& getCarrierPosition(void) = 0;
 
-            /**
-            @brief Get the name of this PickupCarrier.
-            @return Returns the name as a string.
-            */
-            const std::string& getCarrierName(void) { return this->carrierName_; } // tolua_export
-
         protected:
             /**
@@ -160 +155 @@
 
             /**
+            @brief Get all Pickupables this PickupCarrier has.
+            @return  Returns the set of all Pickupables this PickupCarrier has.
+            */
+            std::set<Pickupable*>& getPickups(void)
+                { return this->pickups_; }
+
+        private:
+            std::set<Pickupable*> pickups_; //!< The list of Pickupables carried by this PickupCarrier.
+
+            /**
             @brief Adds a Pickupable to the list of pickups that are carried by this PickupCarrier.
             @param pickup A pointer to the pickup to be added.
@@ -165 +170 @@
             */
             bool addPickup(Pickupable* pickup)
-                { return this->pickups_.insert(pickup).second; }
+                {
+                    COUT(4) << "Adding Pickupable (&" << pickup << ") to PickupCarrier (&" << this << ")" << std::endl;
+                    return this->pickups_.insert(pickup).second;
+                }
 
             /**
@@ -173 +181 @@
             */
             bool removePickup(Pickupable* pickup)
-                { return this->pickups_.erase(pickup) == 1; }
-
-            /**
-            @brief Get all Pickupables this PickupCarrier has.
-            @return  Returns the set of all Pickupables this PickupCarrier has.
-            */
-            std::set<Pickupable*>& getPickups(void)
-                { return this->pickups_; }
-
-            /**
-            @brief Set the name of this PickupCarrier.
-                   The name needs to be set in the constructor of every class inheriting from PickupCarrier, by calling setCarrierName().
-            @param name The name to be set.
-            */
-            void setCarrierName(const std::string& name)
-                { this->carrierName_ = name; }
-
-        private:
-            std::set<Pickupable*> pickups_; //!< The list of Pickupables carried by this PickupCarrier.
-            std::string carrierName_; //!< The name of the PickupCarrier, as displayed in the PickupInventory.
-
-            /**
-            @brief Get the number of carrier children this PickupCarrier has.
-            @return Returns the number of carrier children.
-            */
-            unsigned int getNumCarrierChildren(void)
                 {
-                    std::vector<PickupCarrier*>* list = this->getCarrierChildren();
-                    unsigned int size = list->size();
-                    delete list;
-                    return size;
-                }
-
-            /**
-            @brief Get the index-th child of this PickupCarrier.
-            @param index The index of the child to return.
-            @return Returns the index-th child.
-            */
-            PickupCarrier* getCarrierChild(unsigned int index)
-                {
-                    std::vector<PickupCarrier*>* list = this->getCarrierChildren();
-                    if(list->size() < index)
-                        return NULL;
-                    PickupCarrier* carrier = (*list)[index];
-                    delete list;
-                    return carrier;
-                }
-
-            /**
-            @brief Get the number of Pickupables this PickupCarrier carries.
-            @return returns the number of pickups.
-            */
-            unsigned int getNumPickups(void)
-                { return this->pickups_.size(); }
-
-            /**
-            @brief Get the index-th Pickupable of this PickupCarrier.
-            @param index The index of the Pickupable to return.
-            @return Returns the index-th pickup.
-            */
-            Pickupable* getPickup(unsigned int index)
-                {
-                    std::set<Pickupable*>::iterator it;
-                    for(it = this->pickups_.begin(); index != 0 && it != this->pickups_.end(); it++)
-                        index--;
-                    if(it == this->pickups_.end())
-                        return NULL;
-                    return *it;
+                    COUT(4) << "Removing Pickupable (&" << pickup << ") from PickupCarrier (&" << this << ")" << std::endl;
+                    return this->pickups_.erase(pickup) == 1;
                 }