Changeset 5648 for code/branches/libraries/src/orxonox/objects/quest/notifications

Timestamp:

Aug 14, 2009, 3:07:59 AM (15 years ago)

Author:

landauf

Message:

sorry, large commit, but all changes are dependent:

• Created a new plugin for the questsystem (called just "quest" for the moment because I'd had to rename the directory otherwise (the tolua script enforces this))
• Added QuestPrereqs.h file and _QuestExport macro
• Moved the GUI-name ↔ PlayerInfo map from QuestManager to GUIManager
• Moved NotificationOverlay and NotificationQueue from overlays to quest and linked the overlays plugin into the quest plugin
• Made QuestManager and NotificationManager ScopedSingletons with ScopeID GSLevel. Also removed both singletons from GSLevel and added the Scope instance instead.

Location:

code/branches/libraries/src/orxonox/objects/quest/notifications

Files:

• CMakeLists.txt (modified) (1 diff)
• Notification.h (modified) (2 diffs)
• NotificationManager.h (modified) (3 diffs)
• NotificationOverlay.cc (copied) (copied from code/branches/libraries/src/orxonox/overlays/notifications/NotificationOverlay.cc)
• NotificationOverlay.h (copied) (copied from code/branches/libraries/src/orxonox/overlays/notifications/NotificationOverlay.h) (2 diffs)
• NotificationQueue.cc (copied) (copied from code/branches/libraries/src/orxonox/overlays/notifications/NotificationQueue.cc)
• NotificationQueue.h (copied) (copied from code/branches/libraries/src/orxonox/overlays/notifications/NotificationQueue.h) (2 diffs)

code/branches/libraries/src/orxonox/objects/quest/notifications/CMakeLists.txt

@@ -1 @@
-ADD_SOURCE_FILES(ORXONOX_SRC_FILES
+ADD_SOURCE_FILES(QUEST_SRC_FILES
   Notification.cc
   NotificationManager.cc
+  NotificationOverlay.cc
+  NotificationQueue.cc
 )

code/branches/libraries/src/orxonox/objects/quest/notifications/Notification.h

@@ -35 +35 @@
 #define _Notification_H__
 
-#include "OrxonoxPrereqs.h"
+#include "objects/quest/QuestPrereqs.h"
 
 #include <string>
@@ -49 +49 @@
         Damian 'Mozork' Frick
     */
-    class _OrxonoxExport Notification : public BaseObject
+    class _QuestExport Notification : public BaseObject
     {
         public:

code/branches/libraries/src/orxonox/objects/quest/notifications/NotificationManager.h

@@ -35 +35 @@
 #define _NotificationManager_H__
 
-#include "OrxonoxPrereqs.h"
+#include "objects/quest/QuestPrereqs.h"
 
 #include <ctime>
@@ -41 +41 @@
 #include <string>
 
-#include "util/Singleton.h"
+#include "util/ScopedSingleton.h"
 #include "core/OrxonoxClass.h"
 
@@ -54 +54 @@
         Damian 'Mozork' Frick
     */
-    class _OrxonoxExport NotificationManager : public Singleton<NotificationManager>, public OrxonoxClass
+    class _QuestExport NotificationManager : public ScopedSingleton<NotificationManager, ScopeID::GSLevel>, public OrxonoxClass
     {
-            friend class Singleton<NotificationManager>;
+            friend class ScopedSingleton<NotificationManager, ScopeID::GSLevel>;
         public:
             NotificationManager();

code/branches/libraries/src/orxonox/objects/quest/notifications/NotificationOverlay.h

@@ -36 +36 @@
 #define _NotificationOverlay_H__
 
-#include "overlays/OverlaysPrereqs.h"
+#include "objects/quest/QuestPrereqs.h"
 
 #include <string>
@@ -50 +50 @@
         Damian 'Mozork' Frick
     */
-    class _OverlaysExport NotificationOverlay : public OverlayText
+    class _QuestExport NotificationOverlay : public OverlayText
     {
 

code/branches/libraries/src/orxonox/objects/quest/notifications/NotificationQueue.h

@@ -35 +35 @@
 #define _NotificationOueue_H__
 
-#include "overlays/OverlaysPrereqs.h"
+#include "objects/quest/QuestPrereqs.h"
 
 #include <ctime>
@@ -85 +85 @@
     */
 
-    class _OverlaysExport NotificationQueue : public OverlayGroup, public Tickable, public NotificationListener
+    class _QuestExport NotificationQueue : public OverlayGroup, public Tickable, public NotificationListener
     {