Changeset 9318 for code/branches/presentation2012merge/src/modules/pickup/Pickup.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/Pickup.cc (modified) (4 diffs)

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

@@ -36 +36 @@
 #include "core/CoreIncludes.h"
 #include "util/StringUtils.h"
-
-#include "pickup/PickupIdentifier.h"
 
 #include "DroppedPickup.h"
@@ -86 +84 @@
     /**
     @brief
-        Initializes the PickupIdentififer of this Pickup.
-    */
-    void Pickup::initializeIdentifier(void)
-    {
-        this->pickupIdentifier_->addParameter("activationType", this->getActivationType());
-        this->pickupIdentifier_->addParameter("durationType", this->getDurationType());
-    }
-
-    /**
-    @brief
         Method for creating a Pickup object through XML.
     */
@@ -102 +90 @@
         SUPER(Pickup, XMLPort, xmlelement, mode);
 
+        XMLPortParam(Pickup, "representation", setRepresentationName, getRepresentationName, xmlelement, mode);
         XMLPortParam(Pickup, "activationType", setActivationTypeAsString, getActivationTypeAsString, xmlelement, mode);
         XMLPortParam(Pickup, "durationType", setDurationTypeAsString, getDurationTypeAsString, xmlelement, mode);
-
-        this->initializeIdentifier();
     }
 
@@ -206 +193 @@
 
         Pickup* pickup = orxonox_cast<Pickup*>(item);
+        pickup->setRepresentationName(this->getRepresentationName());
         pickup->setActivationType(this->getActivationType());
         pickup->setDurationType(this->getDurationType());
-
-        pickup->initializeIdentifier();
     }