Changeset 2389 for code/branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.cc

Timestamp:

Dec 10, 2008, 5:25:38 PM (16 years ago)

Author:

dsommer

Message:

funktioniert

File:

• code/branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.cc (modified) (5 diffs)

code/branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.cc

@@ -16 +16 @@
 
         this->template_ = 0;
-        this->distance_ = 50;
+        this->distance_ = 20;
+        this->respawntimer_= 0;
 }
 
@@ -28 +29 @@
 
         XMLPortParam(PickupSpawner, "item", setItemTemplate, getItemTemplate, xmlelement, mode);
-        XMLPortParam(PickupSpawner, "distance", setDistance, getDistance, xmlelement, mode).defaultValues(50.0f);
+        XMLPortParam(PickupSpawner, "distance", setDistance, getDistance, xmlelement, mode).defaultValues(20.0f);
+        XMLPortParam(PickupSpawner, "respawntimer", setRespawnTimer, getRespawnTimer, xmlelement, mode);
+        
 }
 
@@ -54 +57 @@
         if (this->isActive() && this->template_ && this->template_->getBaseclassIdentifier())
         {
-                COUT(0) << "activated" << std::endl;
+                COUT(0) << "ITEM PICKED UP" << std::endl;
                 //if(player->isA(itemtemplate_->getPlayerBaseClass())) 
                 {
@@ -63 +66 @@
                         newitem->addTemplate(this->itemtemplate_);
                         if (newitem->pickedUp(player)== true)
+                        {
+                                if(respawntimer_!=0)
+                                        this->triggerRespawnTimer();
                                 this->setActive(false);
+                                this->fireEvent();
+                        }       
                         else
                                 delete newobject;
@@ -72 +80 @@
         }
 }
+
+void PickupSpawner::triggerRespawnTimer()
+{       
+        
+        if(respawntimer_!=0)
+        {
+                ExecutorMember<BaseObject>* executor = createExecutor(createFunctor(&BaseObject::setActive));
+                executor->setDefaultValues(true);
+                RespawnTimer_.setTimer(this->respawntimer_, false, (BaseObject*)this, executor);
+                COUT(0) << "TIMER SET" << std::endl;
+        }       
 }
+void PickupSpawner::changedActivity()
+{
+/*
+        COUT(0) << "Visble?" << std::endl;
+        if(isActive())
+        {
+                setVisible(true);
+                COUT(0) << "Visble!" << std::endl;
+        }
+        if(isActive()==false)
+        {
+                setVisible(false);
+                COUT(0) << "INvisble!" << std::endl;
+        }
+                
+*/
+        SUPER(PickupSpawner, changedActivity);
+
+        for (std::set<WorldEntity*>::iterator it = this->getAttachedObjects().begin(); it != this->getAttachedObjects().end(); ++it)
+                (*it)->setVisible(this->isActive());
+}
+
+
+}
+
+
+