Changeset 9318 for code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc

Timestamp:

Jul 18, 2012, 10:36:24 PM (12 years ago)

Author:

landauf

Message:

removed PickupIdentifier for a number of reasons (I talked to Damian about it before)
a pickup now references the PickupRepresentation by name with the "representation" attribute

File:

• code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc (modified) (6 diffs)

code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc

@@ -39 +39 @@
 #include "CollectiblePickup.h"
 #include "DroppedPickup.h"
-#include "PickupCollectionIdentifier.h"
 
 #include "PickupCollection.h"
@@ -54 +53 @@
         The creator of the object.
     */
-    PickupCollection::PickupCollection(BaseObject* creator) : BaseObject(creator), pickupCollectionIdentifier_(NULL)
+    PickupCollection::PickupCollection(BaseObject* creator) : BaseObject(creator)
     {
         RegisterObject(PickupCollection);
 
-        this->pickupCollectionIdentifier_ = new PickupCollectionIdentifier(this);
         this->processingUsed_ = false;
         this->processingPickedUp_ = false;
@@ -76 +74 @@
         }
         this->pickups_.clear();
-
-        if(this->pickupCollectionIdentifier_ != NULL)
-            this->pickupCollectionIdentifier_->destroy();
     }
 
@@ -89 +84 @@
         SUPER(PickupCollection, XMLPort, xmlelement, mode);
 
+        XMLPortParam(PickupCollection, "representation", setRepresentationName, getRepresentationName, xmlelement, mode);
         XMLPortObject(PickupCollection, CollectiblePickup, "pickupables", addPickupable, getPickupable, xmlelement, mode);
     }
@@ -217 +213 @@
 
         PickupCollection* pickup = orxonox_cast<PickupCollection*>(item);
+        pickup->setRepresentationName(this->getRepresentationName());
         // Clone all Pickupables this PickupCollection consist of.
         for(std::list<CollectiblePickup*>::iterator it = this->pickups_.begin(); it != this->pickups_.end(); ++it)
@@ -243 +240 @@
 
         return true;
-    }
-
-    /**
-    @brief
-        Get the PickupIdentifier of this PickupCollection.
-        This is in fact the PickupCollectionIdentifier.
-    @return
-        Returns a pointer to the PickupIdentifier of this PickupCollection.
-    */
-    const PickupIdentifier* PickupCollection::getPickupIdentifier(void) const
-    {
-        return this->pickupCollectionIdentifier_;
     }