Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7164 for code/trunk


Ignore:
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:
2 added
8 edited
1 moved

Legend:

Unmodified
Added
Removed
  • code/trunk/src/modules/CMakeLists.txt

    r7163 r7164  
    2727################ Sub Directories ################
    2828
     29ADD_SUBDIRECTORY(designtools)
     30ADD_SUBDIRECTORY(notifications)
    2931ADD_SUBDIRECTORY(objects)
    3032ADD_SUBDIRECTORY(overlays)
     
    3335ADD_SUBDIRECTORY(questsystem)
    3436ADD_SUBDIRECTORY(weapons)
    35 ADD_SUBDIRECTORY(designtools)
  • code/trunk/src/modules/notifications/CMakeLists.txt

    r5781 r7164  
    1 ADD_SOURCE_FILES(QUESTSYSTEM_SRC_FILES
     1SET_SOURCE_FILES(NOTIFICATIONS_SRC_FILES
    22  Notification.cc
    33  NotificationManager.cc
     
    55  NotificationQueue.cc
    66)
     7
     8ORXONOX_ADD_LIBRARY(notifications
     9  MODULE
     10  FIND_HEADER_FILES
     11  TOLUA_FILES
     12  PCH_FILE
     13    NotificationsPrecompiledHeaders.h
     14  LINK_LIBRARIES
     15    orxonox
     16    overlays
     17  SOURCE_FILES ${NOTIFICATIONS_SRC_FILES}
     18)
  • code/trunk/src/modules/notifications/Notification.h

    r7163 r7164  
    3535#define _Notification_H__
    3636
    37 #include "questsystem/QuestsystemPrereqs.h"
     37#include "notifications/NotificationsPrereqs.h"
    3838
    3939#include <string>
     
    4949        Damian 'Mozork' Frick
    5050    */
    51     class _QuestsystemExport Notification : public BaseObject
     51    class _NotificationsExport Notification : public BaseObject
    5252    {
    5353        public:
  • code/trunk/src/modules/notifications/NotificationManager.h

    r7163 r7164  
    3535#define _NotificationManager_H__
    3636
    37 #include "questsystem/QuestsystemPrereqs.h"
     37#include "notifications/NotificationsPrereqs.h"
    3838
    3939#include <ctime>
     
    5353        Damian 'Mozork' Frick
    5454    */
    55     class _QuestsystemExport NotificationManager : public Singleton<NotificationManager>, public OrxonoxClass
     55    class _NotificationsExport NotificationManager : public Singleton<NotificationManager>, public OrxonoxClass
    5656    {
    5757            friend class Singleton<NotificationManager>;
  • code/trunk/src/modules/notifications/NotificationOverlay.h

    r7163 r7164  
    3636#define _NotificationOverlay_H__
    3737
    38 #include "questsystem/QuestsystemPrereqs.h"
     38#include "notifications/NotificationsPrereqs.h"
    3939
    4040#include <string>
     
    4646    /**
    4747    @brief
    48         The NotificationOverlay is used to display single Notifications, then bundled in a NotificationQUeue.
     48        The NotificationOverlay is used to display single Notifications, then bundled in a NotificationQueue.
    4949    @author
    5050        Damian 'Mozork' Frick
    5151    */
    52     class _QuestsystemExport NotificationOverlay : public OverlayText
     52    class _NotificationsExport NotificationOverlay : public OverlayText
    5353    {
    5454
  • code/trunk/src/modules/notifications/NotificationQueue.h

    r7163 r7164  
    3535#define _NotificationOueue_H__
    3636
    37 #include "questsystem/QuestsystemPrereqs.h"
     37#include "notifications/NotificationsPrereqs.h"
    3838
    3939#include <ctime>
     
    7474        <NotificationQueue
    7575            name = "SuperQueue" //Name of your OverlayQueue.
    76             maxSize = "5" //The maximum size of Notifications displayed.
    77             notificationLength = "64" //The maximum number of characters of a Notification, that are displayed. (Default is 5)
     76            maxSize = "5" //The maximum number of Notifications displayed. (Default is 5)
     77            notificationLength = "64" //The maximum number of characters of a Notification, that are displayed. (Default is 64)
    7878            displayTime = "30" //The time a Notification is displayed in seconds. (Default is 30)
    7979            targets = "target1, target2" //The senders this NotificationQueue displays Notifications from. (all, if all Notifications should be displayed.)
    8080            font = "VeraMono" //The font (Default is VeraMono)
    8181            fontSize = '0.4' //The font size. (Default is 0.025)
    82             position = "0.0, .0.0" //The position of the NotificationQueue. (Default is 0.0,0.0)
     82            position = "0.0, 0.0" //The position of the NotificationQueue. (Default is 0.0,0.0)
    8383        />
    8484    @author
     
    8686    */
    8787
    88     class _QuestsystemExport NotificationQueue : public OverlayGroup, public Tickable, public NotificationListener
     88    class _NotificationsExport NotificationQueue : public OverlayGroup, public Tickable, public NotificationListener
    8989    {
    9090
     
    162162        private:
    163163            static const int DEFAULT_SIZE = 5; //!< The default maximum number of Notifications displayed.
    164             static const int DEFAULT_LENGTH = 64; //!< The default maximum number of Notifications displayed.
     164            static const int DEFAULT_LENGTH = 64; //!< The default maximum number of characters displayed.
    165165            static const int DEFAULT_DISPLAY_TIME = 30; //!< The default display time.
    166166            static const float DEFAULT_FONT_SIZE; //!< The default font size.
  • code/trunk/src/modules/questsystem/CMakeLists.txt

    r7163 r7164  
    1919)
    2020
    21 ADD_SUBDIRECTORY(notifications)
    22 
    2321ORXONOX_ADD_LIBRARY(questsystem
    2422  MODULE
     
    3331  LINK_LIBRARIES
    3432    orxonox
     33    notifications
    3534    objects
    36     overlays
    3735  SOURCE_FILES ${QUESTSYSTEM_SRC_FILES}
    3836)
  • code/trunk/src/modules/questsystem/QuestsystemPrereqs.h

    r7163 r7164  
    8282    class QuestManager;
    8383    class QuestNotification;
    84 
    85     // notifications
    86     class Notification;
    87     class NotificationManager;
    88     class NotificationOverlay;
    89     class NotificationQueue;
    9084}
    9185
Note: See TracChangeset for help on using the changeset viewer.