Changeset 7354

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.

Location:

code/branches/notifications

Files:

• data/gui/scripts/NotificationLayer.lua (modified) (2 diffs)
• data/levels/Fight in our Back.oxw (modified) (1 diff)
• data/levels/Quest_PirateAttack.oxw (modified) (1 diff)
• data/levels/old/princessaeryn.oxw (modified) (1 diff)
• data/levels/old/questsystem.oxw (modified) (1 diff)
• data/levels/princessaeryn.oxw (modified) (1 diff)
• data/levels/tutorial.oxw (modified) (1 diff)
• src/modules/notifications/CMakeLists.txt (modified) (1 diff)
• src/modules/notifications/NotificationManager.cc (modified) (5 diffs)
• src/modules/notifications/NotificationManager.h (modified) (4 diffs)
• src/modules/notifications/NotificationQueue.cc (modified) (3 diffs)
• src/modules/notifications/NotificationQueue.h (modified) (6 diffs)

code/branches/notifications/data/gui/scripts/NotificationLayer.lua

@@ -6 +6 @@
 P.nameList = {}
 P.visible = nil
+P.editMode = false
+P.editList = {}
 
 function P.createQueue(name, size)
     local root = winMgr:getWindow("orxonox/NotificationLayer/Root")
     local queue = winMgr:createWindow("MenuWidgets/Listbox", "orxonox/NotificationLayer/Root/Queue/" .. name)
-    queue:setProperty("BackgroundColor", "66FFFFFF")
+    queue:setProperty("BackgroundColor", "00FFFFFF")
     root:addChildWindow(queue)
 
@@ -123 +125 @@
 end
 
+function P.enterEditMode()
+    P.editMode = true
+
+    local root = winMgr:getWindow("orxonox/NotificationLayer/Root")
+    --Replace all queues with FrameWindows
+    for k,v in pairs(P.queueList) do
+        if v ~= nil then
+            root:removeChildWindow(v)
+            local frame = winMgr:createWindow("MenuWidgets/FrameWindow", "orxonox/NotificationLayer/Root/EditMode/" .. P.nameList(k))
+            frame:setArea(v:getArea())
+            P.editList[k] = frame
+        end
+    end
+end
+
+function P.leaveEditMode()
+    P.editMode = false
+
+    local root = winMgr:getWindow("orxonox/NotificationLayer/Root")
+    --Replace all queues with FrameWindows
+    for k,v in pairs(P.queueList) do
+        if v ~= nil then
+            root:addChildWindow(v)
+            v:setArea(P.editList[k]:getArea())
+            winMgr:destroyWindow(P.editList[k])
+            P.editList[k] = nil
+        end
+    end
+end
+
+function P.onHide()
+    if P.editMode then
+        P.leaveEditMode()
+    end
+end
+
 function P.nameToQueueHelper(name)
     local queue = nil

code/branches/notifications/data/levels/Fight in our Back.oxw

@@ -7 +7 @@
     include("templates/spaceship_Transporter.oxt")
 ?>
-
-<NotificationQueue
-    name     = "notification"
-    position = "0.40, 0.05"
-    font     = "VeraMono"
-    textsize = 0.020
-    length   = 3
-    width    = 50
-/>
 
 <!--*****************************************************************************************************************************************************************************************-->

code/branches/notifications/data/levels/Quest_PirateAttack.oxw

@@ -19 +19 @@
     dofile("includes/CuboidSpaceStation.lua")
 ?>
-
-<NotificationQueue
-     name     = "notification"
-     position = "0.40, 0.05"
-     font     = "VeraMono"
-     textsize = 0.020
-     length   = 3
-     width    = 50
-/>
-    
-    
     
 <Level

code/branches/notifications/data/levels/old/princessaeryn.oxw

@@ -8 +8 @@
     dofile("includes/CuboidSpaceStation.lua")
 ?>
-
-<NotificationQueue
- name  = "notification"
- position = "1.0, 1.0"
- targets = "questsystem"
-/>
 
 <Level

code/branches/notifications/data/levels/old/questsystem.oxw

@@ -4 +4 @@
   include("templates/spaceship_assff.oxt")
 ?>
-
-<NotificationQueue
- name  = "notification"
- position = "1.0, 1.0"
- targets = "all"
-/>
 
 <Level

code/branches/notifications/data/levels/princessaeryn.oxw

@@ -14 +14 @@
  description  = "The Tale of Princess Aeryn"
 >
-
-  <NotificationQueue
-   name   = "notification"
-   position = "0.55, 0.05"
-   font   = "VeraMono"
-   textsize = 0.020
-   length   = 3
-   width  = 50
-  />
 
   <templates>

code/branches/notifications/data/levels/tutorial.oxw

@@ -13 +13 @@
     <Template link=lodtemplate_default />
   </templates>
-
-  <NotificationQueue
-   name   = "notification"
-   position = "0.05, 0.05"
-   font   = "VeraMono"
-   textsize = 0.020
-   length   = 3
-   width  = 50
-  />
 
   <Scene

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

@@ -12 +12 @@
   FIND_HEADER_FILES
   TOLUA_FILES
+    NotificationManager.h
   PCH_FILE
     NotificationsPrecompiledHeaders.h

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

@@ -34 +34 @@
 #include "NotificationManager.h"
 
+#include "core/command/ConsoleCommand.h"
 #include "core/CoreIncludes.h"
 #include "core/GUIManager.h"
+#include "core/LuaState.h"
 #include "util/ScopedSingletonManager.h"
 #include "interfaces/NotificationListener.h"
@@ -49 +51 @@
     ManageScopedSingleton(NotificationManager, ScopeID::Graphics, false);
 
+    //TODO: Make work.
+    //SetConsoleCommand("enterEditMode", &NotificationManager::enterEditMode).description("Enter the NotificationLayer edit mode.");
+
     /**
     @brief
@@ -64 +69 @@
 
             // Create first queue:
-            this->queue_ = new NotificationQueue("all");
+            this->queues_.push_back(new NotificationQueue("all"));
         }
     }
@@ -74 +79 @@
     NotificationManager::~NotificationManager()
     {
-        //this->queue_->destroy();
+        
+    }
+
+    void NotificationManager::preDestroy(void)
+    {
+        for(std::vector<NotificationQueue*>::iterator it = this->queues_.begin(); it != this->queues_.end(); it++)
+            (*it)->destroy();
+        this->queues_.clear();
     }
 
@@ -291 +303 @@
     }
 
+    void NotificationManager::createQueue(const std::string& name, const std::string& targets, unsigned int size, unsigned int displayTime)
+    {
+        this->queues_.push_back(new NotificationQueue(name, targets, size, displayTime));
+    }
+
 }

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__ */

code/branches/notifications/src/modules/notifications/NotificationQueue.cc

@@ -45 +45 @@
 {
 
-    const Vector2 NotificationQueue::DEFAULT_POSITION(0.0,0.0);
-
     /**
     @brief
         Constructor. Creates and initializes the object.
     */
-    NotificationQueue::NotificationQueue(const std::string& name, const std::string& senders, unsigned int size, const Vector2& position, unsigned int displayTime)
+    NotificationQueue::NotificationQueue(const std::string& name, const std::string& senders, unsigned int size, unsigned int displayTime)
     {
         this->registered_ = false;
@@ -62 +60 @@
         this->name_ = name;
         this->maxSize_ = size;
-        this->position_ = position;
         this->setDisplayTime(displayTime);
 
         this->create();
-        this->positionChanged();
 
         NotificationManager::getInstance().registerListener(this);
@@ -245 +241 @@
         this->size_ = 0;
         GUIManager::getInstance().getLuaState()->doString("NotificationLayer.clearQueue(\"" + this->getName() + "\")");
-    }
-
-    /**
-    @brief
-        Adjusts the NotificationQueue, when the position has changed.
-    */
-    void NotificationQueue::positionChanged(void)
-    {
-        GUIManager::getInstance().getLuaState()->doString("NotificationLayer.changePosition(\"" + this->getName() + "\", " + multi_cast<std::string>(this->getPosition().x) + ", " + multi_cast<std::string>(this->getPosition().y) + ")");
     }
 

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

@@ -43 +43 @@
 
 #include "tools/interfaces/Tickable.h"
-#include "util/Math.h"
 #include "interfaces/NotificationListener.h"
 #include "NotificationManager.h"
@@ -73 +72 @@
 
         public:
-            NotificationQueue(const std::string& name, const std::string& senders = NotificationManager::ALL, unsigned int size = NotificationQueue::DEFAULT_SIZE, const Vector2& position = NotificationQueue::DEFAULT_POSITION, unsigned int displayTime = NotificationQueue::DEFAULT_DISPLAY_TIME);
+            NotificationQueue(const std::string& name, const std::string& senders = NotificationManager::ALL, unsigned int size = NotificationQueue::DEFAULT_SIZE, unsigned int displayTime = NotificationQueue::DEFAULT_DISPLAY_TIME);
             virtual ~NotificationQueue();
 
@@ -106 +105 @@
             inline float getDisplayTime() const
                 { return this->displayTime_; }
-            /**
-            @brief Returns the position of the NotificationQueue.
-            @return Returns the position.
-            */
-            inline const Vector2 & getPosition() const
-                { return this->position_; }
 
             /**
@@ -121 +114 @@
             bool getTargets(std::string* string) const; //!< Returns a string consisting of the concatination of the targets.
 
-            /**
-            @brief Sets the position of the NotificationQueue.
-            @param pos The position.
-            */
-            inline void setPosition(Vector2 pos)
-                { this->position_ = pos; this->positionChanged(); }
-
         private:
             static const unsigned int DEFAULT_SIZE = 5; //!< The default maximum number of Notifications displayed.
             static const unsigned int DEFAULT_DISPLAY_TIME = 30; //!< The default display time.
-            static const Vector2 DEFAULT_POSITION; //!< the default position.
 
             std::string name_; //!< The name of the NotificationQueue.
@@ -137 +122 @@
             unsigned int maxSize_; //!< The maximal number of Notifications displayed.
             unsigned int size_; //!< The number of Notifications displayed.
-            unsigned int notificationLength_; //!< The maximal number of characters a Notification-message is allowed to have.
             unsigned int displayTime_; //!< The time a Notification is displayed.
-            Vector2 position_; //!< The position of the NotificationQueue.
 
             std::set<std::string> targets_; //!< The targets the Queue displays Notifications of.
@@ -161 +144 @@
             bool setTargets(const std::string & targets); //!< Set the targets of this NotificationQueue.
 
-            void positionChanged(void); //!< Aligns all the Notifications to the position of the NotificationQueue.
             void sizeChanged(void); //!< Adjusts the NotificationQueue, when the maximum size has changed.