Changeset 6512 for code/branches

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

Files:

• data/levels/pickup.oxw (added)
• data/levels/templates/pickup_representation_templates.oxt (modified) (4 diffs)
• src/modules/pickup/DroppedPickup.cc (modified) (3 diffs)
• src/modules/pickup/PickupPrereqs.h (modified) (1 diff)
• src/modules/pickup/PickupRepresentation.cc (modified) (1 diff)
• src/modules/pickup/PickupSpawner.cc (modified) (2 diffs)
• src/modules/pickup/PickupSpawner.h (modified) (1 diff)
• src/modules/pickup/items/CMakeLists.txt (modified) (1 diff)
• src/modules/pickup/items/TestPickup.cc (added)
• src/modules/pickup/items/TestPickup.h (added)
• src/orxonox/interfaces/PickupCarrier.h (modified) (6 diffs)
• src/orxonox/interfaces/Pickupable.cc (modified) (1 diff)

code/branches/pickup3/data/levels/templates/pickup_representation_templates.oxt

@@ -4 +4 @@
             <StaticEntity>
                 <attached>
-                    <Billboard position="0,0,0" colour="0.5,1.0,0" material="Examples/Flare" />
+                    <Billboard position="0,0,0" colour="0.50,0.90,0.25" material="Sphere2" scale=0.1>
+                        <attached>
+                            <Billboard position="0,0,0" colour="0.36,0.81,0.10" material="Cross" scale=0.3 />
+                        </attached>
+                    </Billboard>
                 </attached>
             </StaticEntity>
@@ -25 +29 @@
             <StaticEntity>
                 <attached>
-                    <Billboard position="0,0,0" colour="0,1.0,0.5" material="Examples/Flare" />
+                    <Billboard position="0,0,0" colour="0.50,0.90,0.25" material="Sphere2" scale=0.1>
+                        <attached>
+                            <Billboard position="0,0,0" colour="0.36,0.81,0.10" material="Cross" scale=0.5 />
+                        </attached>
+                    </Billboard>
                 </attached>
             </StaticEntity>
@@ -46 +54 @@
             <StaticEntity>
                 <attached>
-                    <Billboard position="0,0,0" colour="0,1.0,0.5" material="Examples/Flare" />
+                    <Billboard position="0,0,0" colour="0.50,0.90,0.25" material="Sphere2" scale=0.1>
+                        <attached>
+                            <Billboard position="0,0,0" colour="0.36,0.81,0.10" material="Cross" scale=0.7 />
+                        </attached>
+                    </Billboard>
                 </attached>
             </StaticEntity>
@@ -67 +79 @@
             <StaticEntity>
                 <attached>
-                    <Billboard position="0,0,0" colour="0,1.0,0.5" material="Examples/Flare" />
+                    <Billboard position="0,0,0" colour="0.50,0.90,0.25" material="Sphere2" scale=0.1>
+                        <attached>
+                            <Billboard position="0,0,0" colour="0.36,0.81,0.10" material="Cross" scale=1.2 />
+                        </attached>
+                    </Billboard>
                 </attached>
             </StaticEntity>

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
 )

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

@@ -40 +40 @@
 #include <set>
 #include "Pickupable.h"
+#include "core/Identifier.h"
 
 #include "core/OrxonoxClass.h"
@@ -45 +46 @@
 namespace orxonox
 {
+    
+    class Pickup;
+    class HealthPickup;
+    class TestPickup;
 
     /**
@@ -55 +60 @@
     {
         friend class Pickupable; //!< The Pickupable has full acces to its PickupCarrier.
+        //TODO: Ugly workaround.
+        friend class Pickup;
+        friend class HealthPickup;
+        friend class TestPickup;
         
         public:
@@ -69 +78 @@
                     bool pickedUp = this->pickups_.insert(pickup).second;
                     if(pickedUp)
+                    {
+                        COUT(4) << "Picked up Pickupable " << pickup->getIdentifier()->getName() << "(&" << pickup << ")." << std::endl;
                         pickup->pickedUp(this);
+                    }
                     return pickedUp;
                 }
@@ -81 +93 @@
             bool drop(Pickupable* pickup, bool drop = true)
                 { 
-                   bool dropped = this->pickups_.erase(pickup) == 1;
-                   if(dropped && drop)
-                   {
-                       pickup->dropped();
-                   }
-                   return dropped;
+                    bool dropped = this->pickups_.erase(pickup) == 1;
+                    if(dropped && drop)
+                    {
+                        COUT(4) << "Dropping Pickupable " << pickup->getIdentifier()->getName() << "(&" << pickup << ")." << std::endl;
+                        pickup->dropped();
+                    }
+                    return dropped;
                 }
                 
@@ -161 +174 @@
             */
             virtual const Vector3& getCarrierPosition(void) = 0;
+                            
+            //TODO: Remove.
+            std::set<Pickupable*>& getPickups(void)
+                { return this->pickups_; }
         
         private:

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

@@ -198 +198 @@
         //TODO: possible problem.
         if(!created)
+        {
             this->destroy();
+        }
         
         return true;