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

Timestamp:

Nov 19, 2008, 4:06:51 PM (15 years ago)

Author:

dsommer

Message:

Turbo funktioniert

File:

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

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

@@ -1 +1 @@
 #include "PickupSpawner.h"
+#include "Item.h"
+#include "objects/worldentities/pawns/Pawn.h"
+#include "objects/worldentities/triggers/DistanceTrigger.h"
 #include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
 #include "core/Template.h"
 
@@ -12 +16 @@
 
         this->template_ = 0;
+        this->distance_ = 50;
+}
+
+PickupSpawner::~PickupSpawner()
+{
+}
+
+void PickupSpawner::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+{
+        SUPER(PickupSpawner, XMLPort, xmlelement, mode);
+
+        XMLPortParam(PickupSpawner, "item", setItemTemplate, getItemTemplate, xmlelement, mode);
+        XMLPortParam(PickupSpawner, "distance", setDistance, getDistance, xmlelement, mode).defaultValues(50.0f);
+}
+
+void PickupSpawner::tick(float dt)
+{
+  if (this->isActive())
+  {
+    for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it != ObjectList<Pawn>::end(); ++it)
+    {
+      Vector3 distanceVec = it->getWorldPosition() - this->getWorldPosition();
+      if (distanceVec.length() < this->distance_)
+        this->triggering(*it);
+    }
+  }
 }
 
@@ -20 +50 @@
 }
 
-    void PickupSpawner::processEvent(Event& event)
-    {
-        SUPER(PickupSpawner, processEvent, event);
-
-        SetSubclassEvent(PickupSpawner, "pickup", triggering, event, DistanceTrigger);
-    }
-
-void activateSpawner(bool active)
+void PickupSpawner::triggering(Pawn* player)
+{
+        if (this->isActive() && this->template_ && this->template_->getBaseclassIdentifier())
         {
-        if active=true
-        this->isActive =true;
-        else
-        this->isActive = false;
-        }
-
-void triggering(bool active, DistanceTrigger* trigger)
-{
-        if (active= true && this->template_ && this->template_->getBaseclassIdentifier())
-        {
-                Pawn* player = trigger->getPlayer(); // getPlayer muss noch implementiert werden
-                if(player->isA(itemtemplate_->getPlayerBaseClass())) 
+                COUT(0) << "activated" << std::endl;
+                //if(player->isA(itemtemplate_->getPlayerBaseClass())) 
                 {
-                BaseObject* newobject = this->template_->getBaseclassIdentifier()->fabricate();
+                BaseObject* newobject = this->template_->getBaseclassIdentifier()->fabricate(this);
                 Item* newitem = dynamic_cast<Item*>(newobject);
                 if (newitem)
-                newitem->addTemplate(this->itemtemplate_);
-                newitem->pickedUp(player);
+                {
+                        newitem->addTemplate(this->itemtemplate_);
+                        if (newitem->pickedUp(player)== true)
+                                this->setActive(false);
+                        else
+                                delete newobject;
                 }
-                else
-                        delete newobject;
-                activateSpawner(false);
+                }
+                //else
+                //      delete newobject;
         }
 }