Changeset 5727

Timestamp:

Aug 31, 2009, 9:18:17 PM (15 years ago)

Author:

landauf

Message:

PlayerTrigger is now an interface instead of a child of Trigger. DistanceTrigger inherits now from Trigger AND PlayerTrigger.

Location:

code/branches/libraries2/src

Files:

• modules/questsystem/QuestEffectBeacon.cc (modified) (1 diff)
• orxonox/OrxonoxPrereqs.h (modified) (2 diffs)
• orxonox/interfaces/InterfaceCompilation.cc (modified) (3 diffs)
• orxonox/interfaces/PlayerTrigger.h (moved) (moved from code/branches/libraries2/src/orxonox/objects/worldentities/triggers/PlayerTrigger.h) (3 diffs)
• orxonox/objects/worldentities/triggers/CMakeLists.txt (modified) (1 diff)
• orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) (1 diff)
• orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified) (2 diffs)
• orxonox/objects/worldentities/triggers/PlayerTrigger.cc (deleted)

code/branches/libraries2/src/modules/questsystem/QuestEffectBeacon.cc

@@ -38 +38 @@
 #include "core/EventIncludes.h"
 #include "objects/worldentities/pawns/Pawn.h"
-#include "objects/worldentities/triggers/PlayerTrigger.h"
+#include "interfaces/PlayerTrigger.h"
 #include "QuestEffect.h"
 

code/branches/libraries2/src/orxonox/OrxonoxPrereqs.h

@@ -74 +74 @@
     class NotificationListener;
     class PawnListener;
+    class PlayerTrigger;
     class RadarListener;
     class RadarViewable;
@@ -161 +162 @@
     class DistanceTrigger;
     class EventTrigger;
-    class PlayerTrigger;
     class CheckPoint;
 

code/branches/libraries2/src/orxonox/interfaces/InterfaceCompilation.cc

@@ -35 +35 @@
 #include "GametypeMessageListener.h"
 #include "PawnListener.h"
+#include "PlayerTrigger.h"
 #include "RadarListener.h"
 #include "Rewardable.h"
@@ -84 +85 @@
     Rewardable::Rewardable()
     {
-        RegisterObject(Rewardable);
+        RegisterRootObject(Rewardable);
     }
 
@@ -92 +93 @@
     NotificationListener::NotificationListener()
     {
-        RegisterObject(NotificationListener);
+        RegisterRootObject(NotificationListener);
+    }
+
+    //----------------------------
+    // PlayerTrigger
+    //----------------------------
+    PlayerTrigger::PlayerTrigger()
+    {
+        RegisterRootObject(PlayerTrigger);
+
+        this->player_ = NULL;
+        this->isForPlayer_ = true;
     }
 }

code/branches/libraries2/src/orxonox/interfaces/PlayerTrigger.h

@@ -37 +37 @@
 
 #include "OrxonoxPrereqs.h"
-#include "Trigger.h"
+#include "core/OrxonoxClass.h"
 
 namespace orxonox
@@ -47 +47 @@
         Damian 'Mozork' Frick
     */
-    class _OrxonoxExport PlayerTrigger : public Trigger
+    class _OrxonoxExport PlayerTrigger : virtual public OrxonoxClass
     {
     public:
-        PlayerTrigger(BaseObject* creator);
-        virtual ~PlayerTrigger();
-
-        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a PlayerTrigger object through XML.
+        PlayerTrigger();
+        virtual ~PlayerTrigger() {}
 
         /**
@@ -70 +68 @@
 
     protected:
-        virtual bool isTriggered(TriggerMode::Value mode) = 0;
-
         /**
         @brief Set the player that triggered the PlayerTrigger. This is normally done by classes inheriting vom PlayerTrigger.

code/branches/libraries2/src/orxonox/objects/worldentities/triggers/CMakeLists.txt

@@ -3 +3 @@
   DistanceTrigger.cc
   EventTrigger.cc
-  PlayerTrigger.cc
   CheckPoint.cc
 )

code/branches/libraries2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc

@@ -37 +37 @@
   CreateFactory(DistanceTrigger);
 
-  DistanceTrigger::DistanceTrigger(BaseObject* creator) : PlayerTrigger(creator)
+  DistanceTrigger::DistanceTrigger(BaseObject* creator) : Trigger(creator)
   {
     RegisterObject(DistanceTrigger);

code/branches/libraries2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h

@@ -34 +34 @@
 #include <set>
 #include "core/ClassTreeMask.h"
-#include "PlayerTrigger.h"
+#include "Trigger.h"
+#include "interfaces/PlayerTrigger.h"
 
 namespace orxonox
 {
-  class _OrxonoxExport DistanceTrigger : public PlayerTrigger
+  class _OrxonoxExport DistanceTrigger : public Trigger, public PlayerTrigger
   {
     public:
@@ -67 +68 @@
       std::set<Ogre::Node*> targetSet_;
       float distance_;
-      
+
   };
 }