Changeset 7354 for code/branches/notifications/src/modules/notifications/NotificationManager.h

Timestamp:

Sep 5, 2010, 12:42:54 PM (14 years ago)

Author:

dafrick

Message:

Started work on edit mode. ConsoleCommand is not yet working.
Some additional cleanup. All the NotificationQueues generated by the NotificationManager now are destroyed upon destruction of the NotificationManager.
Removed NotificationQueue from level files.

File:

• code/branches/notifications/src/modules/notifications/NotificationManager.h (modified) (4 diffs)

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

@@ -40 +40 @@
 #include <map>
 #include <string>
+#include <vector>
 
 #include "util/Singleton.h"
 #include "core/OrxonoxClass.h"
 
-namespace orxonox
-{
+namespace orxonox // tolua_export
+{ // tolua_export
+
     /**
     @brief
@@ -53 +55 @@
         Damian 'Mozork' Frick
     */
-    class _NotificationsExport NotificationManager : public Singleton<NotificationManager>, public OrxonoxClass
-    {
+    class _NotificationsExport NotificationManager  // tolua_export
+        : public Singleton<NotificationManager>, public OrxonoxClass
+    { // tolua_export
             friend class Singleton<NotificationManager>;
         public:
             NotificationManager();
             virtual ~NotificationManager();
+
+            virtual void preDestroy(void);
+
+            static NotificationManager& getInstance() { return Singleton<NotificationManager>::getInstance(); } // tolua_export
 
             static const std::string ALL; //!< Static string to indicate a sender that sends to all NotificationListeners.
@@ -80 +87 @@
                 { return this->getNotifications(listener, map, std::time(0)-timeDelay, std::time(0)); }
 
+            void enterEditMode(void);
+
+            void createQueue(const std::string& name, const std::string& targets, unsigned int size, unsigned int displayTime); // tolua_export
+
         private:
             static NotificationManager* singletonPtr_s;
 
-            NotificationQueue* queue_; //!< Initial, first, NotificationQueue.
+            std::vector<NotificationQueue*> queues_; //!< The list of NotificationQueues created by the NotificationManager.
 
             int highestIndex_; //!< This variable holds the highest index (resp. key) in notificationLists_s, to secure that no key appears twice.
@@ -94 +105 @@
             bool removeNotification(Notification* notification, std::multimap<std::time_t, Notification*>& map); //!< Helper method that removes an input notification form an input map.
 
-    };
+    }; // tolua_export
 
-}
+} // tolua_export
 
 #endif /* _NotificationManager_H__ */