Changeset 6512 for code/branches/pickup3/src/modules/pickup

Timestamp:

Mar 11, 2010, 4:30:30 PM (15 years ago)

Author:

dafrick

Message:

Added additional pickup (TestPickup), and did some bug $fixing.

Location:

code/branches/pickup3/src/modules/pickup

Files:

• DroppedPickup.cc (modified) (3 diffs)
• PickupPrereqs.h (modified) (1 diff)
• PickupRepresentation.cc (modified) (1 diff)
• PickupSpawner.cc (modified) (2 diffs)
• PickupSpawner.h (modified) (1 diff)
• items/CMakeLists.txt (modified) (1 diff)
• items/TestPickup.cc (added)
• items/TestPickup.h (added)

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

@@ -40 +40 @@
 namespace orxonox
 {
+    
+    CreateFactory(DroppedPickup);
+    
     /**
     @brief
@@ -63 +66 @@
         The distance at which the PickupSpawner triggers. Default is 10.
     */
-    DroppedPickup::DroppedPickup(BaseObject* creator, Pickupable* pickup, const Vector3& position, float triggerDistance) : PickupSpawner(creator, pickup, triggerDistance, 0, 1)
+    DroppedPickup::DroppedPickup(BaseObject* creator, Pickupable* pickup, const Vector3& position, float triggerDistance) : PickupSpawner(creator, pickup, triggerDistance, 10, 1)
     {   
         RegisterObject(DroppedPickup);
@@ -70 +73 @@
         
         this->setPosition(position);
+        this->setActive(false);
+        this->startRespawnTimer();
     }
 

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

@@ -76 +76 @@
     //items
     class HealthPickup;
+    class TestPickup;
     
 }

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

@@ -154 +154 @@
     {
         StaticEntity* representation = new StaticEntity(spawner);
-        //TODO: Nicer...
-        Billboard* billboard = new Billboard(spawner);
-        billboard->setColour(ColourValue(1.0, 0.0, 0.0));
-        billboard->setMaterial("Examples/Flare");
-        representation->attach(billboard);
+        Billboard* sphere = new Billboard(spawner);
+        sphere->setColour(ColourValue(0.95, 0.85, 0.27));
+        sphere->setMaterial("Sphere2");
+        sphere->setScale(0.1);
+        Billboard* icon = new Billboard(spawner);
+        icon->setColour(ColourValue(0.89, 0.79, 0.08));
+        icon->setMaterial("Asterix");
+        icon->setScale(0.5);
+        sphere->attach(icon);
+        representation->attach(sphere);
         return representation;
     }

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

@@ -216 +216 @@
         {
             //TODO: Nicer? Does this even work?
-            this->respawnTimer_.setTimer(this->respawnTime_, false, createExecutor(createFunctor(&PickupSpawner::respawnTimerCallback, this)));
+            this->startRespawnTimer();
 
             this->setActive(false);
@@ -227 +227 @@
             this->destroy();
         }
+    }
+    
+    /**
+    @brief
+        Starts the respawn timer.
+    */
+    void PickupSpawner::startRespawnTimer(void)
+    {
+        this->respawnTimer_.setTimer(this->respawnTime_, false, createExecutor(createFunctor(&PickupSpawner::respawnTimerCallback, this)));
     }
     

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

@@ -101 +101 @@
         protected:
             void decrementSpawnsRemaining(void); //!< Decrements the number of remaining spawns.
+                        
+            void startRespawnTimer(void);
             
             virtual Pickupable* getPickup(void); //!< Creates a new Pickupable.

code/branches/pickup3/src/modules/pickup/items/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(PICKUP_SRC_FILES
   HealthPickup.cc
+  TestPickup.cc
 )