Changeset 7324 for code/branches

Timestamp:

Sep 2, 2010, 10:06:51 AM (14 years ago)

Author:

dafrick

Message:

Hiding MultiTrigger behind PlayerTrigger for consistency of use.
Trying some things out with notifications.

Location:

code/branches/notifications/src/modules

Files:

• notifications/CMakeLists.txt (modified) (1 diff)
• notifications/Notification.cc (modified) (5 diffs)
• notifications/Notification.h (modified) (4 diffs)
• notifications/NotificationDispatcher.cc (modified) (4 diffs)
• notifications/NotificationDispatcher.h (modified) (1 diff)
• objects/triggers/MultiTriggerContainer.cc (modified) (2 diffs)
• objects/triggers/MultiTriggerContainer.h (modified) (3 diffs)
• objects/triggers/Trigger.cc (modified) (1 diff)
• questsystem/QuestNotification.cc (modified) (1 diff)

code/branches/notifications/src/modules/notifications/CMakeLists.txt

@@ -16 +16 @@
     NotificationsPrecompiledHeaders.h
   LINK_LIBRARIES
+    objects
     orxonox
     overlays

code/branches/notifications/src/modules/notifications/Notification.cc

@@ -35 +35 @@
 
 #include "core/CoreIncludes.h"
+#include "network/NetworkFunction.h"
 #include "NotificationManager.h"
 
@@ -42 +43 @@
     CreateUnloadableFactory(Notification);
 
+    registerMemberNetworkFunction(Notification, send);
+
     /**
     @brief
         Default constructor. Initializes the object.
     */
-    Notification::Notification(BaseObject* creator) : BaseObject(creator)
+    Notification::Notification(BaseObject* creator) : BaseObject(creator), Synchronisable(creator)
     {
         RegisterObject(Notification);
         this->initialize();
+        this->registerVariables();
     }
 
@@ -58 +62 @@
         The message of the Notification.
     */
-    Notification::Notification(BaseObject* creator, const std::string & message) : BaseObject(creator)
+    Notification::Notification(BaseObject* creator, const std::string & message) : BaseObject(creator), Synchronisable(creator)
     {
         RegisterObject(Notification);
         this->initialize();
         this->message_ = message;
+        this->registerVariables();
     }
 
@@ -85 +90 @@
     }
 
-    /**
-    @brief
-        Sends the Notification to the Notificationmanager, with sender NetificationManager::NONE.
-    @return
-        Returns true if successful.
-    */
-    bool Notification::send(void)
+    void Notification::registerVariables(void)
     {
-        return this->send(NotificationManager::NONE);
+        registerVariable(this->message_);
+        registerVariable(this->sender_);
+        registerVariable(this->sent_);
     }
 
@@ -104 +105 @@
         Returns true if successful.
     */
-    bool Notification::send(const std::string & sender)
+    bool Notification::send(unsigned int clientId, const std::string & sender = NotificationManager::NONE)
     {
-        if(this->isSent()) //TODO: Needed?
-            return false;
-        
-        this->sender_ = sender;
-        bool successful = NotificationManager::getInstance().registerNotification(this);
-        if(!successful)
-            return false;
-        this->sent_ = true;
+        if(GameMode::isMaster())
+        {
+            if(this->isSent()) //TODO: Needed?
+                return false;
 
-        COUT(3) << "Notification \"" << this->getMessage() << "\" sent." << std::endl;
+            this->sender_ = sender;
+            bool successful = NotificationManager::getInstance().registerNotification(this);
+            if(!successful)
+                return false;
+            this->sent_ = true;
+
+            COUT(3) << "Notification \"" << this->getMessage() << "\" sent." << std::endl;
+        }
+        else
+        {
+            callMemberNetworkFunction(Notification, send, this->getObjectID(), clientId, clientId, sender);
+        }
 
         return true;

code/branches/notifications/src/modules/notifications/Notification.h

@@ -39 +39 @@
 #include <string>
 #include "core/BaseObject.h"
+#include "network/synchronisable/Synchronisable.h"
 
 namespace orxonox
@@ -49 +50 @@
         Damian 'Mozork' Frick
     */
-    class _NotificationsExport Notification : public BaseObject
+    class _NotificationsExport Notification : public BaseObject, public Synchronisable
     {
         public:
@@ -56 +57 @@
             virtual ~Notification();
 
-            bool send(void); //!< Sends the Notification to the Notificationmanager, with sender NotificationManager::NONE;
-            bool send(const std::string & sender); //!< Sends the Notification to the Notificationmanager.
+            bool send(unsigned int clientId, const std::string & sender); //!< Sends the Notification to the Notificationmanager.
 
             /**
@@ -83 +83 @@
 
             void initialize(void);
+            void registerVariables(void);
 
     };

code/branches/notifications/src/modules/notifications/NotificationDispatcher.cc

@@ -39 +39 @@
 #include "Notification.h"
 #include "NotificationManager.h"
+#include "interfaces/PlayerTrigger.h"
+#include "infos/PlayerInfo.h"
+#include "worldentities/pawns/Pawn.h"
 
 namespace orxonox
@@ -86 +89 @@
     @brief
         Dispatches a Notification with a message supplied by the createNotificationMessage() method, which can be overloaded.
+    @param clientId
+        The id of the client the notification should be dispatched to.
     */
-    void NotificationDispatcher::dispatch(void)
+    void NotificationDispatcher::dispatch(unsigned int clientId)
     {
         const std::string message = this->createNotificationMessage();
         Notification* notification = new Notification(this, message);
 
-        notification->send(this->getSender());
+        notification->send(clientId, this->getSender());
     }
 
@@ -103 +108 @@
         Returns true if the NotificationDispatcher was successfully triggered.
     */
-    bool NotificationDispatcher::trigger(bool triggered)
+    bool NotificationDispatcher::trigger(bool triggered, BaseObject* trigger)
     {
         if(!triggered || !this->isActive()) // If the NotificationDispatcher is inactive it cannot be executed.
@@ -110 +115 @@
         COUT(4) << "NotificationDispatcher (&" << this << ") triggered." << std::endl;
 
-        this->dispatch();
+        PlayerTrigger* pTrigger = orxonox_cast<PlayerTrigger*>(trigger);
+        Pawn* pawn = NULL;
+
+        // If the trigger is a PlayerTrigger.
+        if(pTrigger != NULL)
+        {
+            if(!pTrigger->isForPlayer())  //!< The PlayerTrigger is not exclusively for Pawns which means we cannot extract one.
+                return false;
+            else
+                pawn = pTrigger->getTriggeringPlayer();
+        }
+        else
+            return false;
+
+        if(pawn == NULL)
+        {
+            COUT(4) << "The QuestEffectBeacon was triggered by an entity other than a Pawn. (" << trigger->getIdentifier()->getName() << ")" << std::endl;
+            return false;
+        }
+
+        //! Extract the PlayerInfo from the Pawn.
+        PlayerInfo* player = pawn->getPlayer();
+
+        if(player == NULL)
+        {
+            COUT(3) << "The PlayerInfo* is NULL." << std::endl;
+            return false;
+        }
+
+        this->dispatch(player->getClientID());
 
         return true;

code/branches/notifications/src/modules/notifications/NotificationDispatcher.h

@@ -65 +65 @@
                 { return this->sender_; }
 
-            void dispatch(void); //!< Dispatches a specific Notification.
-            bool trigger(bool triggered); //!< Is called when the NotificationDispatcher is triggered.
+            void dispatch(unsigned int clientId); //!< Dispatches a specific Notification.
+            bool trigger(bool triggered, BaseObject* trigger); //!< Is called when the NotificationDispatcher is triggered.
 
         protected:

code/branches/notifications/src/modules/objects/triggers/MultiTriggerContainer.cc

@@ -35 +35 @@
 
 #include "core/CoreIncludes.h"
+#include "worldentities/pawns/Pawn.h"
 
 namespace orxonox
@@ -65 +66 @@
     {
         RegisterObject(MultiTriggerContainer);
+
+        Pawn* pawn = orxonox_cast<Pawn*>(data);
+        if(pawn != NULL)
+        {
+            this->setForPlayer(true);
+            this->setTriggeringPlayer(pawn);
+        }
     }
 

code/branches/notifications/src/modules/objects/triggers/MultiTriggerContainer.h

@@ -38 +38 @@
 
 #include "core/BaseObject.h"
+#include "interfaces/PlayerTrigger.h"
 
 namespace orxonox
@@ -48 +49 @@
         Damian 'Mozork' Frick
     */
-    class _ObjectsExport MultiTriggerContainer : public BaseObject
+    class _ObjectsExport MultiTriggerContainer : public BaseObject, public PlayerTrigger
     {
 
@@ -72 +73 @@
             MultiTrigger* originator_; //!< The originator.
             BaseObject* data_; //!< The data.
+
     };
 

code/branches/notifications/src/modules/objects/triggers/Trigger.cc

@@ -160 +160 @@
   void Trigger::triggered(bool bIsTriggered)
   {
-      COUT(1) << "Trigger triggered." << std::endl; //TODO: Remove debug.
     this->fireEvent(bIsTriggered);
   }

code/branches/notifications/src/modules/questsystem/QuestNotification.cc

@@ -73 +73 @@
     bool QuestNotification::send(void)
     {
-        return this->Notification::send(QuestNotification::SENDER);
+        return true;//this->Notification::send(QuestNotification::SENDER); //TODO: Adjust.
     }