Changeset 7164

Timestamp:

Aug 14, 2010, 11:56:56 PM (14 years ago)

Author:

dafrick

Message:

Moving notifications to own module.

Location:

code/trunk/src/modules

Files:

• CMakeLists.txt (modified) (2 diffs)
• notifications (moved) (moved from code/trunk/src/modules/questsystem/notifications)
• notifications/CMakeLists.txt (modified) (2 diffs)
• notifications/Notification.h (modified) (2 diffs)
• notifications/NotificationManager.h (modified) (2 diffs)
• notifications/NotificationOverlay.h (modified) (2 diffs)
• notifications/NotificationQueue.h (modified) (4 diffs)
• notifications/NotificationsPrecompiledHeaders.h (added)
• notifications/NotificationsPrereqs.h (added)
• questsystem/CMakeLists.txt (modified) (2 diffs)
• questsystem/QuestsystemPrereqs.h (modified) (1 diff)

code/trunk/src/modules/CMakeLists.txt

@@ -27 +27 @@
 ################ Sub Directories ################
 
+ADD_SUBDIRECTORY(designtools)
+ADD_SUBDIRECTORY(notifications)
 ADD_SUBDIRECTORY(objects)
 ADD_SUBDIRECTORY(overlays)
@@ -33 +35 @@
 ADD_SUBDIRECTORY(questsystem)
 ADD_SUBDIRECTORY(weapons)
-ADD_SUBDIRECTORY(designtools)

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

@@ -1 @@
-ADD_SOURCE_FILES(QUESTSYSTEM_SRC_FILES
+SET_SOURCE_FILES(NOTIFICATIONS_SRC_FILES
   Notification.cc
   NotificationManager.cc
@@ -5 +5 @@
   NotificationQueue.cc
 )
+
+ORXONOX_ADD_LIBRARY(notifications
+  MODULE
+  FIND_HEADER_FILES
+  TOLUA_FILES
+  PCH_FILE
+    NotificationsPrecompiledHeaders.h
+  LINK_LIBRARIES
+    orxonox
+    overlays
+  SOURCE_FILES ${NOTIFICATIONS_SRC_FILES}
+)

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

@@ -35 +35 @@
 #define _Notification_H__
 
-#include "questsystem/QuestsystemPrereqs.h"
+#include "notifications/NotificationsPrereqs.h"
 
 #include <string>
@@ -49 +49 @@
         Damian 'Mozork' Frick
     */
-    class _QuestsystemExport Notification : public BaseObject
+    class _NotificationsExport Notification : public BaseObject
     {
         public:

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

@@ -35 +35 @@
 #define _NotificationManager_H__
 
-#include "questsystem/QuestsystemPrereqs.h"
+#include "notifications/NotificationsPrereqs.h"
 
 #include <ctime>
@@ -53 +53 @@
         Damian 'Mozork' Frick
     */
-    class _QuestsystemExport NotificationManager : public Singleton<NotificationManager>, public OrxonoxClass
+    class _NotificationsExport NotificationManager : public Singleton<NotificationManager>, public OrxonoxClass
     {
             friend class Singleton<NotificationManager>;

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

@@ -36 +36 @@
 #define _NotificationOverlay_H__
 
-#include "questsystem/QuestsystemPrereqs.h"
+#include "notifications/NotificationsPrereqs.h"
 
 #include <string>
@@ -46 +46 @@
     /**
     @brief
-        The NotificationOverlay is used to display single Notifications, then bundled in a NotificationQUeue.
+        The NotificationOverlay is used to display single Notifications, then bundled in a NotificationQueue.
     @author
         Damian 'Mozork' Frick
     */
-    class _QuestsystemExport NotificationOverlay : public OverlayText
+    class _NotificationsExport NotificationOverlay : public OverlayText
     {
 

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

@@ -35 +35 @@
 #define _NotificationOueue_H__
 
-#include "questsystem/QuestsystemPrereqs.h"
+#include "notifications/NotificationsPrereqs.h"
 
 #include <ctime>
@@ -74 +74 @@
         <NotificationQueue
             name = "SuperQueue" //Name of your OverlayQueue.
-            maxSize = "5" //The maximum size of Notifications displayed.
-            notificationLength = "64" //The maximum number of characters of a Notification, that are displayed. (Default is 5)
+            maxSize = "5" //The maximum number of Notifications displayed. (Default is 5)
+            notificationLength = "64" //The maximum number of characters of a Notification, that are displayed. (Default is 64)
             displayTime = "30" //The time a Notification is displayed in seconds. (Default is 30)
             targets = "target1, target2" //The senders this NotificationQueue displays Notifications from. (all, if all Notifications should be displayed.)
             font = "VeraMono" //The font (Default is VeraMono)
             fontSize = '0.4' //The font size. (Default is 0.025)
-            position = "0.0, .0.0" //The position of the NotificationQueue. (Default is 0.0,0.0)
+            position = "0.0, 0.0" //The position of the NotificationQueue. (Default is 0.0,0.0)
         />
     @author
@@ -86 +86 @@
     */
 
-    class _QuestsystemExport NotificationQueue : public OverlayGroup, public Tickable, public NotificationListener
+    class _NotificationsExport NotificationQueue : public OverlayGroup, public Tickable, public NotificationListener
     {
 
@@ -162 +162 @@
         private:
             static const int DEFAULT_SIZE = 5; //!< The default maximum number of Notifications displayed.
-            static const int DEFAULT_LENGTH = 64; //!< The default maximum number of Notifications displayed.
+            static const int DEFAULT_LENGTH = 64; //!< The default maximum number of characters displayed.
             static const int DEFAULT_DISPLAY_TIME = 30; //!< The default display time.
             static const float DEFAULT_FONT_SIZE; //!< The default font size.

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

@@ -19 +19 @@
 )
 
-ADD_SUBDIRECTORY(notifications)
-
 ORXONOX_ADD_LIBRARY(questsystem
   MODULE
@@ -33 +31 @@
   LINK_LIBRARIES
     orxonox
+    notifications
     objects
-    overlays
   SOURCE_FILES ${QUESTSYSTEM_SRC_FILES}
 )

code/trunk/src/modules/questsystem/QuestsystemPrereqs.h

@@ -82 +82 @@
     class QuestManager;
     class QuestNotification;
-
-    // notifications
-    class Notification;
-    class NotificationManager;
-    class NotificationOverlay;
-    class NotificationQueue;
 }