Changeset 7404 for code/trunk/src/modules/notifications

Timestamp:

Sep 11, 2010, 2:42:47 PM (14 years ago)

Author:

dafrick

Message:

Adding new level notifications.oxw, to "showcase", or at this stage rather "test" Notifications.
Restoring tutorial.oxw to its old state, before it was hijacked by me for testing.

Extending Script class. Now also normal orxonox code can be executed with it, the execution of code can be triggered with Triggers (obviously) and cod can also executed on load.
I needed this to load the NotificationLayer in levels where it is needed.
Also inserted a Script that loads the NotificationQueue to display Notifications in all levels it was needed.

Location:

code/trunk/src/modules/notifications

Files:

• NotificationDispatcher.cc (modified) (1 diff)
• NotificationDispatcher.h (modified) (1 diff)

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

@@ -72 +72 @@
         Method for creating a NotificationDispatcher object through XML.
     */
-    void NotificationDispatcher::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    void NotificationDispatcher::XMLPort(Element& xmlElement, XMLPort::Mode mode)
     {
-        SUPER(NotificationDispatcher, XMLPort, xmlelement, mode);
+        SUPER(NotificationDispatcher, XMLPort, xmlElement, mode);
 
-        XMLPortEventSink(NotificationDispatcher, BaseObject, "trigger", trigger, xmlelement, mode); //TODO: Change BaseObject to MultiTrigger as soon as MultiTrigger is the base of all triggers.
+        XMLPortEventSink(NotificationDispatcher, BaseObject, "trigger", trigger, xmlElement, mode); //TODO: Change BaseObject to MultiTrigger as soon as MultiTrigger is the base of all triggers.
     }
 
-    void NotificationDispatcher::XMLEventPort(Element& xmlelement, XMLPort::Mode mode)
+    void NotificationDispatcher::XMLEventPort(Element& xmlElement, XMLPort::Mode mode)
     {
-        SUPER(NotificationDispatcher, XMLEventPort, xmlelement, mode);
+        SUPER(NotificationDispatcher, XMLEventPort, xmlElement, mode);
 
-        XMLPortEventState(NotificationDispatcher, BaseObject, "trigger", trigger, xmlelement, mode);
+        XMLPortEventState(NotificationDispatcher, BaseObject, "trigger", trigger, xmlElement, mode);
     }
 

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

@@ -55 +55 @@
             virtual ~NotificationDispatcher(); //!< Destructor.
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a NotificationDispatcher object through XML.
-            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlElement, XMLPort::Mode mode); //!< Method for creating a NotificationDispatcher object through XML.
+            virtual void XMLEventPort(Element& xmlElement, XMLPort::Mode mode);
 
             /**