Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
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/src/modules/notifications
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r7338 r7354  
    1212  FIND_HEADER_FILES
    1313  TOLUA_FILES
     14    NotificationManager.h
    1415  PCH_FILE
    1516    NotificationsPrecompiledHeaders.h

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

    r7351 r7354  
    3434#include "NotificationManager.h"
    3535
     36#include "core/command/ConsoleCommand.h"
    3637#include "core/CoreIncludes.h"
    3738#include "core/GUIManager.h"
     39#include "core/LuaState.h"
    3840#include "util/ScopedSingletonManager.h"
    3941#include "interfaces/NotificationListener.h"
    … …  
    4951    ManageScopedSingleton(NotificationManager, ScopeID::Graphics, false);
    5052
     53    //TODO: Make work.
     54    //SetConsoleCommand("enterEditMode", &NotificationManager::enterEditMode).description("Enter the NotificationLayer edit mode.");
     55
    5156    /**
    5257    @brief
    … …  
    6469
    6570            // Create first queue:
    66             this->queue_ = new NotificationQueue("all");
     71            this->queues_.push_back(new NotificationQueue("all"));
    6772        }
    6873    }
    … …  
    7479    NotificationManager::~NotificationManager()
    7580    {
    76         //this->queue_->destroy();
     81       
     82    }
     83
     84    void NotificationManager::preDestroy(void)
     85    {
     86        for(std::vector<NotificationQueue*>::iterator it = this->queues_.begin(); it != this->queues_.end(); it++)
     87            (*it)->destroy();
     88        this->queues_.clear();
    7789    }
    7890
    … …  
    291303    }
    292304
     305    void NotificationManager::createQueue(const std::string& name, const std::string& targets, unsigned int size, unsigned int displayTime)
     306    {
     307        this->queues_.push_back(new NotificationQueue(name, targets, size, displayTime));
     308    }
     309
    293310}

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

    r7349 r7354  
    4040#include <map>
    4141#include <string>
     42#include <vector>
    4243
    4344#include "util/Singleton.h"
    4445#include "core/OrxonoxClass.h"
    4546
    46 namespace orxonox
    47 {
     47namespace orxonox // tolua_export
     48{ // tolua_export
     49
    4850    /**
    4951    @brief
    … …  
    5355        Damian 'Mozork' Frick
    5456    */
    55     class _NotificationsExport NotificationManager : public Singleton<NotificationManager>, public OrxonoxClass
    56     {
     57    class _NotificationsExport NotificationManager  // tolua_export
     58        : public Singleton<NotificationManager>, public OrxonoxClass
     59    { // tolua_export
    5760            friend class Singleton<NotificationManager>;
    5861        public:
    5962            NotificationManager();
    6063            virtual ~NotificationManager();
     64
     65            virtual void preDestroy(void);
     66
     67            static NotificationManager& getInstance() { return Singleton<NotificationManager>::getInstance(); } // tolua_export
    6168
    6269            static const std::string ALL; //!< Static string to indicate a sender that sends to all NotificationListeners.
    … …  
    8087                { return this->getNotifications(listener, map, std::time(0)-timeDelay, std::time(0)); }
    8188
     89            void enterEditMode(void);
     90
     91            void createQueue(const std::string& name, const std::string& targets, unsigned int size, unsigned int displayTime); // tolua_export
     92
    8293        private:
    8394            static NotificationManager* singletonPtr_s;
    8495
    85             NotificationQueue* queue_; //!< Initial, first, NotificationQueue.
     96            std::vector<NotificationQueue*> queues_; //!< The list of NotificationQueues created by the NotificationManager.
    8697
    8798            int highestIndex_; //!< This variable holds the highest index (resp. key) in notificationLists_s, to secure that no key appears twice.
    … …  
    94105            bool removeNotification(Notification* notification, std::multimap<std::time_t, Notification*>& map); //!< Helper method that removes an input notification form an input map.
    95106
    96     };
     107    }; // tolua_export
    97108
    98 }
     109} // tolua_export
    99110
    100111#endif /* _NotificationManager_H__ */

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

    r7349 r7354  
    4545{
    4646
    47     const Vector2 NotificationQueue::DEFAULT_POSITION(0.0,0.0);
    48 
    4947    /**
    5048    @brief
    5149        Constructor. Creates and initializes the object.
    5250    */
    53     NotificationQueue::NotificationQueue(const std::string& name, const std::string& senders, unsigned int size, const Vector2& position, unsigned int displayTime)
     51    NotificationQueue::NotificationQueue(const std::string& name, const std::string& senders, unsigned int size, unsigned int displayTime)
    5452    {
    5553        this->registered_ = false;
    … …  
    6260        this->name_ = name;
    6361        this->maxSize_ = size;
    64         this->position_ = position;
    6562        this->setDisplayTime(displayTime);
    6663
    6764        this->create();
    68         this->positionChanged();
    6965
    7066        NotificationManager::getInstance().registerListener(this);
    … …  
    245241        this->size_ = 0;
    246242        GUIManager::getInstance().getLuaState()->doString("NotificationLayer.clearQueue(\"" + this->getName() + "\")");
    247     }
    248 
    249     /**
    250     @brief
    251         Adjusts the NotificationQueue, when the position has changed.
    252     */
    253     void NotificationQueue::positionChanged(void)
    254     {
    255         GUIManager::getInstance().getLuaState()->doString("NotificationLayer.changePosition(\"" + this->getName() + "\", " + multi_cast<std::string>(this->getPosition().x) + ", " + multi_cast<std::string>(this->getPosition().y) + ")");
    256243    }
    257244

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

    r7349 r7354  
    4343
    4444#include "tools/interfaces/Tickable.h"
    45 #include "util/Math.h"
    4645#include "interfaces/NotificationListener.h"
    4746#include "NotificationManager.h"
    … …  
    7372
    7473        public:
    75             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);
     74            NotificationQueue(const std::string& name, const std::string& senders = NotificationManager::ALL, unsigned int size = NotificationQueue::DEFAULT_SIZE, unsigned int displayTime = NotificationQueue::DEFAULT_DISPLAY_TIME);
    7675            virtual ~NotificationQueue();
    7776
    … …  
    106105            inline float getDisplayTime() const
    107106                { return this->displayTime_; }
    108             /**
    109             @brief Returns the position of the NotificationQueue.
    110             @return Returns the position.
    111             */
    112             inline const Vector2 & getPosition() const
    113                 { return this->position_; }
    114107
    115108            /**
    … …  
    121114            bool getTargets(std::string* string) const; //!< Returns a string consisting of the concatination of the targets.
    122115
    123             /**
    124             @brief Sets the position of the NotificationQueue.
    125             @param pos The position.
    126             */
    127             inline void setPosition(Vector2 pos)
    128                 { this->position_ = pos; this->positionChanged(); }
    129 
    130116        private:
    131117            static const unsigned int DEFAULT_SIZE = 5; //!< The default maximum number of Notifications displayed.
    132118            static const unsigned int DEFAULT_DISPLAY_TIME = 30; //!< The default display time.
    133             static const Vector2 DEFAULT_POSITION; //!< the default position.
    134119
    135120            std::string name_; //!< The name of the NotificationQueue.
    … …  
    137122            unsigned int maxSize_; //!< The maximal number of Notifications displayed.
    138123            unsigned int size_; //!< The number of Notifications displayed.
    139             unsigned int notificationLength_; //!< The maximal number of characters a Notification-message is allowed to have.
    140124            unsigned int displayTime_; //!< The time a Notification is displayed.
    141             Vector2 position_; //!< The position of the NotificationQueue.
    142125
    143126            std::set<std::string> targets_; //!< The targets the Queue displays Notifications of.
    … …  
    161144            bool setTargets(const std::string & targets); //!< Set the targets of this NotificationQueue.
    162145
    163             void positionChanged(void); //!< Aligns all the Notifications to the position of the NotificationQueue.
    164146            void sizeChanged(void); //!< Adjusts the NotificationQueue, when the maximum size has changed.
    165147
Note: See TracChangeset for help on using the changeset viewer.