Changeset 6497 for code/branches/pickup3/src

Timestamp:

Mar 8, 2010, 9:17:22 PM (15 years ago)

Author:

dafrick

Message:

Fixed bug in clone() (Argument needed to be as reference). Pickups seem to be working now (after very sporadic testing), more systematic testing (and probably still some more bug fixes) will follow.

Location:

code/branches/pickup3/src

Files:

• libraries/core/OrxonoxClass.h (modified) (1 diff)
• modules/pickup/Pickup.cc (modified) (2 diffs)
• modules/pickup/Pickup.h (modified) (1 diff)
• modules/pickup/PickupCollection.cc (modified) (1 diff)
• modules/pickup/PickupCollection.h (modified) (1 diff)
• modules/pickup/items/HealthPickup.cc (modified) (1 diff)
• modules/pickup/items/HealthPickup.h (modified) (1 diff)
• orxonox/interfaces/Pickupable.cc (modified) (3 diffs)
• orxonox/interfaces/Pickupable.h (modified) (1 diff)

code/branches/pickup3/src/libraries/core/OrxonoxClass.h

@@ -109 +109 @@
             bool isDirectParentOf(const OrxonoxClass* object);
             
-            virtual void clone(OrxonoxClass* item) {}
+            virtual void clone(OrxonoxClass*& item) {}
 
             inline unsigned int getReferenceCount() const

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

@@ -188 +188 @@
         SUPER(Pickup, changedCarrier);
         
+        COUT(1) << "Changed Carrier: " << this->isPickedUp() << this->isImmediate() << std::endl;
         //! Sets the Pickup to used if the Pickup has activation type 'immediate' and gets picked up.
         if(this->getCarrier() != NULL && this->isPickedUp() && this->isImmediate())
@@ -201 +202 @@
         Returns the clone of this pickup as a pointer to a Pickupable.
     */
-    void Pickup::clone(OrxonoxClass* item)
+    void Pickup::clone(OrxonoxClass*& item)
     {
         if(item == NULL)

code/branches/pickup3/src/modules/pickup/Pickup.h

@@ -119 +119 @@
             virtual void changedCarrier(void); //!< Should be called when the pickup has transited from picked up to dropped or the other way around.
                                     
-            virtual void clone(OrxonoxClass* item); //!< Creates a duplicate of the Pickup.
+            virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the Pickup.
                 
         protected:

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

@@ -161 +161 @@
     
     //TODO: Steal description from Pickupable.
-    void PickupCollection::clone(OrxonoxClass* item)
+    void PickupCollection::clone(OrxonoxClass*& item)
     {
         if(item == NULL)

code/branches/pickup3/src/modules/pickup/PickupCollection.h

@@ -62 +62 @@
             virtual void changedCarrier(void);
             
-            virtual void clone(OrxonoxClass* item);
+            virtual void clone(OrxonoxClass*& item);
             
             virtual const PickupIdentifier* getPickupIdentifier(void);

code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc

@@ -280 +280 @@
         A pointer to the Orxonox class.
     */
-    void HealthPickup::clone(OrxonoxClass* item)
+    void HealthPickup::clone(OrxonoxClass*& item)
     {
         if(item == NULL)

code/branches/pickup3/src/modules/pickup/items/HealthPickup.h

@@ -74 +74 @@
             
             virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
-            virtual void clone(OrxonoxClass* item); //!< Creates a duplicate of the input OrxonoxClass.
+            virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the input OrxonoxClass.
             
             /**

code/branches/pickup3/src/orxonox/interfaces/Pickupable.cc

@@ -172 +172 @@
         
         COUT(4) << "Pickupable (&" << this << ") got picked up by a PickupCarrier (&" << carrier << ")." << std::endl;
+        this->setPickedUp(true);
         this->setCarrier(carrier);
-        this->setPickedUp(true);
         return true;
     }
@@ -231 +231 @@
     Pickupable* Pickupable::clone(void)
     {
-        Pickupable* pickup = NULL;
-        this->clone(pickup);
+        OrxonoxClass* item = NULL;
+        this->clone(item);
+        
+        Pickupable* pickup = dynamic_cast<Pickupable*>(item);
         
         COUT(4) << "Pickupable (&" << this << ") cloned. Clone is new Pickupable (&" << pickup << ")." << std::endl;
@@ -246 +248 @@
     */
     //TODO: Specify how the implementation must be done in detail.
-    void Pickupable::clone(OrxonoxClass* item)
+    void Pickupable::clone(OrxonoxClass*& item)
     {
         SUPER(Pickupable, clone, item);

code/branches/pickup3/src/orxonox/interfaces/Pickupable.h

@@ -102 +102 @@
             
             Pickupable* clone(void); //!< Creates a duplicate of the Pickupable.
-            virtual void clone(OrxonoxClass* item); //!< Creates a duplicate of the input OrxonoxClass.
+            virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the input OrxonoxClass.
             
             /**