Changeset 2972 for code/branches/pickups2/src/orxonox/overlays/notifications

Timestamp:

May 11, 2009, 6:03:40 PM (16 years ago)

Author:

danielh

Message:

Update

• Minor changes in BaseItem
• Updated to NotificationQueue from trunk (compile error with old)
• Added PickupInventory for GUI handling
• Added basic support for toLua++ methods

Location:

code/branches/pickups2/src/orxonox/overlays/notifications

Files:

• NotificationQueue.cc (modified) (2 diffs)
• NotificationQueue.h (modified) (1 diff)

code/branches/pickups2/src/orxonox/overlays/notifications/NotificationQueue.cc

@@ -54 +54 @@
     const std::string NotificationQueue::DEFAULT_FONT = "VeraMono";
     const Vector2 NotificationQueue::DEFAULT_POSITION = Vector2(0.0,0.0);
+    const float NotificationQueue::DEFAULT_FONT_SIZE  = 0.025;
 
     /**
@@ -273 +274 @@
         string->clear();
         bool first = true;
-        for(std::set<std::string>::iterator it = this->targets_.begin(); it != this->targets_.end(); it++) //!< Iterate through the set of targets.
+        for(std::set<std::string>::const_iterator it = this->targets_.begin(); it != this->targets_.end(); it++) //!< Iterate through the set of targets.
         {
             if(!first)

code/branches/pickups2/src/orxonox/overlays/notifications/NotificationQueue.h

@@ -166 +166 @@
             static const int DEFAULT_LENGTH = 64; //!< The default maximum number of Notifications displayed.
             static const int DEFAULT_DISPLAY_TIME = 30; //!< The default display time.
-            static const float DEFAULT_FONT_SIZE = 0.025; //!< The default font size.
+            static const float DEFAULT_FONT_SIZE; //!< The default font size.
 
             static const std::string DEFAULT_FONT; //!< The default font.