Changeset 6484

Timestamp:

Mar 7, 2010, 11:00:05 PM (14 years ago)

Author:

dafrick

Message:

Cleanup and bug fixes.

Location:

code/branches/pickup3/src

Files:

• modules/pickup/PickupManager.cc (modified) (2 diffs)
• modules/pickup/PickupRepresentation.cc (modified) (2 diffs)
• modules/pickup/PickupSpawner.cc (modified) (2 diffs)
• modules/pickup/items/HealthPickup.cc (modified) (1 diff)
• orxonox/pickup/PickupIdentifier.cc (modified) (1 diff)

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

@@ -52 +52 @@
     PickupManager::PickupManager()
     {
+        this->defaultRepresentation_ = NULL;
+        this->pickupCarrierStructure_ = NULL;
         RegisterRootObject(PickupManager);
         
@@ -85 +87 @@
     bool PickupManager::registerRepresentation(const PickupIdentifier* identifier, PickupRepresentation* representation)
     {
-        if(this->representations_.find(identifier) == this->representations_.end()) //!< If the Pickupable already has a RepresentationRegistered.
+        if(this->representations_.find(identifier) != this->representations_.end()) //!< If the Pickupable already has a RepresentationRegistered.
             return false;
         

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

@@ -103 +103 @@
         
         PickupManager::getInstance().registerRepresentation(this->pickup_->getPickupIdentifier(), this); //!< Registers the PickupRepresentation with the PickupManager through the PickupIdentifier of the Pickupable it represents.
+        
+        if(this->spawnerRepresentation_ != NULL)
+            this->spawnerRepresentation_->setVisible(false);
+        
+        COUT(4) << "PickupRepresentation created: name: '" << this->name_ << "', description: '" << this->description_ << "', spawnerTemplate: '" << this->spawnerTemplate_ << "'." << std::endl;
     }
     
@@ -128 +133 @@
         
         StaticEntity* representation = this->spawnerRepresentation_;
+        representation->setVisible(true);
         
         this->addTemplate(this->spawnerTemplate_);
+        this->spawnerRepresentation_->setVisible(false);
         
         return representation;

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

@@ -147 +147 @@
         {
             PickupRepresentation* representation = PickupManager::getInstance().getRepresentation(this->pickup_->getPickupIdentifier());
+            representation->setVisible(this->isActive());
             this->attach(representation->getSpawnerRepresentation(this));
+            this->setActive(true);
         }
     }
@@ -273 +275 @@
     void PickupSpawner::trigger(Pawn* pawn)
     {
-        if (this->isActive()) //!< Checks whether PickupItem is active.
-        {
+        COUT(1) << "PickupSpawner triggered." << std::endl;
+        if (this->isActive()) //!< Checks whether PickupSpawner is active.
+        {
+            COUT(1) << "PickupSpawner triggered and active." << std::endl;
+            
             PickupCarrier* carrier = dynamic_cast<PickupCarrier*>(pawn);
             if(carrier == NULL)

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

@@ -120 +120 @@
         if(!this->isContinuous())
             this->healthRate_ = 0.0;
-        
-        COUT(1) << "HealthPickup " << this->getHealth() << ", " << this->getHealthRate() << ", " << this->getHealthType() << "." << std::endl;
         
         this->initializeIdentifier();

code/branches/pickup3/src/orxonox/pickup/PickupIdentifier.cc

@@ -101 +101 @@
     bool PickupIdentifier::addParameter(std::string & name, std::string & value)
     {
-        COUT(1) << "PickupIdentifier " << name << ", " << value << std::endl;
+        COUT(4) << "PickupIdentifier " << name << ", " << value << std::endl;
         
         if(!(this->parameters_.find(name) == this->parameters_.end()))