Changeset 7193

Timestamp:

Aug 20, 2010, 9:55:50 PM (14 years ago)

Author:

dafrick

Message:

Added NotificationDispatcher, class that can, upon being triggered, dispatch (send/display) a specified Notification.
Additionally a NotificationDispatcher called CommandNotification, that, upon being triggered, displays a Notification with a message and the name of the key that the command is mapped to. It is envisioned to be used in the, soon to be, tutorial level.
Also: Small bugfix in Notification.

Location:

code/trunk

Files:

• data/levels/tutorial.oxw (modified) (2 diffs)
• src/modules/notifications/CMakeLists.txt (modified) (1 diff)
• src/modules/notifications/Notification.cc (modified) (2 diffs)
• src/modules/notifications/NotificationDispatcher.cc (added)
• src/modules/notifications/NotificationDispatcher.h (added)
• src/modules/notifications/NotificationsPrereqs.h (modified) (1 diff)
• src/modules/notifications/dispatchers (added)
• src/modules/notifications/dispatchers/CMakeLists.txt (added)
• src/modules/notifications/dispatchers/CommandNotification.cc (added)
• src/modules/notifications/dispatchers/CommandNotification.h (added)

code/trunk/data/levels/tutorial.oxw

@@ -14 +14 @@
   </templates>
 
+  <NotificationQueue
+   name   = "notification"
+   position = "0.05, 0.05"
+   font   = "VeraMono"
+   textsize = 0.020
+   length   = 3
+   width  = 50
+  />
+
   <Scene
    ambientlight = "0.5, 0.5, 0.5"
@@ -19 +28 @@
   >
 
-  
-  
+      <CommandNotification preMessage="Press '" postMessage="' to fire your primary weapon." command="fire 0">
+        <events>
+            <trigger>
+                <DistanceTrigger name=trigger position="0,0,-100" distance=10 target="Pawn">
+                    <attached>
+                        <Billboard position="0,0,0" colour="1.0,1.0,0" material="Examples/Flare" />
+                    </attached>
+                </DistanceTrigger>
+            </trigger>
+        </events>
+    </CommandNotification>
   
 <Drone name="meineDrohne" primarythrust="80" auxilarythrust="10" rotationthrust="10" mass= "50" linearDamping = "0.9" angularDamping = "0.7">

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

@@ -1 +1 @@
 SET_SOURCE_FILES(NOTIFICATIONS_SRC_FILES
   Notification.cc
+  NotificationDispatcher.cc
   NotificationManager.cc
   NotificationOverlay.cc
   NotificationQueue.cc
 )
+
+ADD_SUBDIRECTORY(dispatchers)
 
 ORXONOX_ADD_LIBRARY(notifications

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

@@ -60 +60 @@
     Notification::Notification(BaseObject* creator, const std::string & message) : BaseObject(creator)
     {
+        RegisterObject(Notification);
+        this->initialize();
         this->message_ = message;
     }
@@ -104 +106 @@
     bool Notification::send(const std::string & sender)
     {
+        if(this->isSent()) //TODO: Needed?
+            return false;
+        
         this->sender_ = sender;
         bool successful = NotificationManager::getInstance().registerNotification(this);

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

@@ -66 +66 @@
 {
     class Notification;
+    class NotificationDispatcher;
     class NotificationManager;
     class NotificationOverlay;
     class NotificationQueue;
+    
+    //dispatchers
+    class CommandNotification;
 }