Changeset 8651 for code/branches

Timestamp:

May 28, 2011, 10:11:23 PM (13 years ago)

Author:

scheusso

Message:

first attempt to make notifications synchronisable
not yet succeeded though (some callbacks missing)

Location:

code/branches/presentation/src

Files:

• modules/notifications/NotificationQueue.cc (modified) (2 diffs)
• modules/notifications/NotificationQueue.h (modified) (3 diffs)
• modules/notifications/NotificationQueueCEGUI.cc (modified) (2 diffs)
• modules/notifications/NotificationQueueCEGUI.h (modified) (1 diff)
• orxonox/worldentities/pawns/SpaceShip.cc (modified) (1 diff)

code/branches/presentation/src/modules/notifications/NotificationQueue.cc

@@ -52 +52 @@
         The creator of the NotificationQueue.
     */
-    NotificationQueue::NotificationQueue(BaseObject* creator) : BaseObject(creator), registered_(false)
+    NotificationQueue::NotificationQueue(BaseObject* creator) : BaseObject(creator), Synchronisable(creator), registered_(false)
     {
         RegisterObject(NotificationQueue);
 
         this->initialize();
+        this->registerVariables();
     }
 
@@ -161 +162 @@
         this->create();
     }
+    
+    
+    /**
+    @brief
+        Registers Variables to be Synchronised.
+        Registers Variables which have to be synchronised to the network system.
+      */
+    void NotificationQueue::registerVariables()
+    {
+        registerVariable( this->maxSize_, VariableDirection::ToClient );
+        registerVariable( this->targets_, VariableDirection::ToClient );
+        registerVariable( this->displayTime_, VariableDirection::ToClient );
+    }
+
 
     /**

code/branches/presentation/src/modules/notifications/NotificationQueue.h

@@ -47 +47 @@
 #include "core/BaseObject.h"
 #include "tools/interfaces/Tickable.h"
+#include "network/synchronisable/Synchronisable.h"
 
 namespace orxonox
@@ -89 +90 @@
     @ingroup Notifications
     */
-    class _NotificationsExport NotificationQueue : public BaseObject, public Tickable
+    class _NotificationsExport NotificationQueue : public BaseObject, public Tickable, public Synchronisable
     {
 
@@ -99 +100 @@
             virtual void tick(float dt); // To update from time to time.
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-
+            void registerVariables();
+            
             void update(void); // Updates the NotificationQueue.
             void update(Notification* notification, const std::time_t & time); // Updates the NotificationQueue by adding an new Notification.

code/branches/presentation/src/modules/notifications/NotificationQueueCEGUI.cc

@@ -59 +59 @@
 
         this->initialize();
+        this->registerVariables();
     }
     
@@ -90 +91 @@
         XMLPortParam(NotificationQueueCEGUI, "alignment", setAlignment, getAlignment, xmlelement, mode);
         XMLPortParam(NotificationQueueCEGUI, "displaySize", setDisplaySize, getDisplaySize, xmlelement, mode);
+    }
+    
+    void NotificationQueueCEGUI::registerVariables()
+    {
+        registerVariable( this->position_, VariableDirection::ToClient );
+        registerVariable( this->fontSize_, VariableDirection::ToClient );
+        registerVariable( this->fontColor_, VariableDirection::ToClient );
+        registerVariable( this->alignment_, VariableDirection::ToClient );
+        registerVariable( this->displaySize_, VariableDirection::ToClient );
     }
 

code/branches/presentation/src/modules/notifications/NotificationQueueCEGUI.h

@@ -74 +74 @@
 
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            void registerVariables();
 
             void destroy(bool noGraphics = false); // Destroys the NotificationQueue.

code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc

@@ -118 +118 @@
         XMLPortParamVariable(SpaceShip, "boostRate", boostRate_, xmlelement, mode);
         XMLPortParamVariable(SpaceShip, "boostCooldownDuration", boostCooldownDuration_, xmlelement, mode);
-                XMLPortParamVariable(SpaceShip, "shakeFrequency", shakeFrequency_, xmlelement, mode);
+        XMLPortParamVariable(SpaceShip, "shakeFrequency", shakeFrequency_, xmlelement, mode);
         XMLPortParamVariable(SpaceShip, "shakeAmplitude", shakeAmplitude_, xmlelement, mode);
-                XMLPortParamVariable(SpaceShip, "lift", lift_, xmlelement, mode);
+        XMLPortParamVariable(SpaceShip, "lift", lift_, xmlelement, mode);
         XMLPortParamVariable(SpaceShip, "stallSpeed", stallSpeed_, xmlelement, mode);