Changeset 5953 for code/branches/pickup2/src/orxonox/pickup/DroppedItem.h

Timestamp:

Oct 14, 2009, 4:36:56 PM (16 years ago)

Author:

dafrick

Message:

Made DroppedItem inherit from PickupSpawner. Also minor changes in PickupSpawner.

Location:

code/branches/pickup2

Files:

• . (modified) (1 prop)
• src/orxonox/pickup/DroppedItem.h (modified) (1 diff)

code/branches/pickup2/src/orxonox/pickup/DroppedItem.h

@@ -37 +37 @@
 #include "OrxonoxPrereqs.h"
 
-#include "tools/Timer.h"
-#include "tools/interfaces/Tickable.h"
-#include "worldentities/StaticEntity.h"
+#include "PickupSpawner.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport DroppedItem : public StaticEntity, public Tickable
+    class _OrxonoxExport DroppedItem : public PickupSpawner
     {
-    public:
-        DroppedItem(BaseObject* creator);
-        virtual ~DroppedItem();
+        public:
+            DroppedItem(BaseObject* creator);
+            DroppedItem(BaseObject* creator, BaseItem* item, float triggerDistance, float respawnTime, int maxSpawnedItems);
+            virtual ~DroppedItem();
 
-        //TODO: Comment.
-        //DroppedItem -> Item with no owner, alone in space?
-        //Would be much nicer if it would be triggered by a standard issue DistanceTrigger.
-        //Where is this created? I see no XMLPort.
-        //Where is the item for this created? What happens if more than one pawn triggers this?
-        //Add more than just one items, or even better create the ability to add a Collection.? Rename to ...?
+            static DroppedItem* createDefaultDrop(BaseItem* item, const Vector3& position, const ColourValue& flareColour = ColourValue(0.5f, 1.0f, 0.3f), float timeToLive = 0);
+            static DroppedItem* createDefaultDrop(BaseItem* item, Pawn* pawn, const ColourValue& flareColour = ColourValue(0.5f, 1.0f, 0.3f), float timeToLive = 0);
 
-        void tick(float dt);
-        void trigger(Pawn* pawn);
+        protected:
+            virtual BaseItem* getItem(void);
 
-        static DroppedItem* createDefaultDrop(BaseItem* item, const Vector3& position, const ColourValue& flareColour = ColourValue(0.5f, 1.0f, 0.3f), float timeToLive = 0);
-        static DroppedItem* createDefaultDrop(BaseItem* item, Pawn* pawn, const ColourValue& flareColour = ColourValue(0.5f, 1.0f, 0.3f), float timeToLive = 0);
+        private:
 
-        void createTimer(); //TODO: Can this be made private, too?
-        void timerCallback(); //TODO: This should really be private.
+            BaseItem* item_; //!< The dropped item.
 
-        inline float getTriggerDistance() const
-            { return this->triggerDistance_; }
-        inline void setTriggerDistance(float distance)
-            { this->triggerDistance_ = distance; }
-
-        inline BaseItem* getItem() const
-            { return this->item_; }
-        //TODO: Needs to be public?
-        inline void setItem(BaseItem* item)
-            { this->item_ = item; }
-
-        inline float getTimeToLive() const
-            { return this->timeToLive_; }
-        //TODO: Needs to be public?
-        inline void setTimeToLive(float time)
-            { this->timeToLive_ = time; }
-    private:
-        float timeToLive_;
-        float triggerDistance_;
-        BaseItem* item_;
-
-        Timer timer_;
     };
 }