Changeset 8198 for code/branches/portals/src/orxonox/worldentities/PortalEndPoint.h

Timestamp:

Apr 6, 2011, 11:06:45 PM (13 years ago)

Author:

anbueche

Message:

First steps to use of Triggers and Events

File:

• code/branches/portals/src/orxonox/worldentities/PortalEndPoint.h (modified) (3 diffs)

code/branches/portals/src/orxonox/worldentities/PortalEndPoint.h

@@ -8 +8 @@
 #include "StaticEntity.h"
 #include "graphics/Billboard.h"
-#include "objects/triggers/DistanceMultiTrigger.h"
-#include "tools/interfaces/Tickable.h"
+#include "../../modules/objects/triggers/DistanceMultiTrigger.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport PortalEndPoint : public StaticEntity
+    class _OrxonoxExport PortalEndPoint : public DistanceMultiTrigger
     {
         public:
@@ -20 +19 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             //virtual void tick(float dt);
-            static std::map<unsigned int, PortalEndPoint *> idMap_s;
+            static std::map<unsigned int, PortalEndPoint *> idMap_s; //!< maps integer id values to portalendpoints
             inline void setID(unsigned int id)
             {
@@ -30 +29 @@
                 return this->id_;
             }
+            void jumpOut(WorldEntity * entity); //!< relocate an entity to the position of the endpoint and add it to the set of recentlyPortedOut entities
+            void tick(float dt);
+            bool hasRecentlyJumpedOut(WorldEntity * entity); //!< check if a certain entity recently jumped out of this endpoint
         protected:
         private:
             unsigned int id_;
-            std::set<WorldEntity *> recentlyJumpedOut_;
-            std::string material_;
+            std::set<WorldEntity *> recentlyJumpedOut_; //!< Entities which recently jumped out of this EndPoint, hence they shouldn't be pulled in again if the endpoint is the beginning of a link
             Billboard billboard_;
-            DistanceMultiTrigger trigger_;
     };