[Orxonox-commit 369] r2972 - in branches/pickups2/src/orxonox: . objects/controllers objects/pickup overlays/notifications
danielh at orxonox.net
danielh at orxonox.net
Mon May 11 18:03:40 CEST 2009
Author: danielh
Date: 2009-05-11 18:03:40 +0200 (Mon, 11 May 2009)
New Revision: 2972
Added:
branches/pickups2/src/orxonox/objects/pickup/PickupInventory.cc
branches/pickups2/src/orxonox/objects/pickup/PickupInventory.h
Modified:
branches/pickups2/src/orxonox/CMakeLists.txt
branches/pickups2/src/orxonox/objects/controllers/HumanController.h
branches/pickups2/src/orxonox/objects/pickup/BaseItem.cc
branches/pickups2/src/orxonox/objects/pickup/BaseItem.h
branches/pickups2/src/orxonox/objects/pickup/CMakeLists.txt
branches/pickups2/src/orxonox/objects/pickup/DroppedItem.cc
branches/pickups2/src/orxonox/objects/pickup/PickupCollection.cc
branches/pickups2/src/orxonox/objects/pickup/PickupCollection.h
branches/pickups2/src/orxonox/objects/pickup/UsableItem.cc
branches/pickups2/src/orxonox/overlays/notifications/NotificationQueue.cc
branches/pickups2/src/orxonox/overlays/notifications/NotificationQueue.h
Log:
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
Modified: branches/pickups2/src/orxonox/CMakeLists.txt
===================================================================
--- branches/pickups2/src/orxonox/CMakeLists.txt 2009-05-11 15:31:21 UTC (rev 2971)
+++ branches/pickups2/src/orxonox/CMakeLists.txt 2009-05-11 16:03:40 UTC (rev 2972)
@@ -34,7 +34,7 @@
SET(ORXONOX_FILES ${ORXONOX_SRC_FILES} ${ORXONOX_HDR_FILES})
GENERATE_SOURCE_GROUPS(${ORXONOX_FILES})
-GENERATE_TOLUA_BINDINGS(Orxonox ORXONOX_FILES INPUTFILES gui/GUIManager.h)
+GENERATE_TOLUA_BINDINGS(Orxonox ORXONOX_FILES INPUTFILES gui/GUIManager.h objects/pickup/PickupInventory.h objects/pickup/BaseItem.h objects/pickup/EquipmentItem.h objects/pickup/UsableItem.h objects/pickup/PassiveItem.h)
# Not using precompiled header files: Avoid dependencies
INCLUDE_DIRECTORIES(pch/nopch)
Modified: branches/pickups2/src/orxonox/objects/controllers/HumanController.h
===================================================================
--- branches/pickups2/src/orxonox/objects/controllers/HumanController.h 2009-05-11 15:31:21 UTC (rev 2971)
+++ branches/pickups2/src/orxonox/objects/controllers/HumanController.h 2009-05-11 16:03:40 UTC (rev 2972)
@@ -65,6 +65,9 @@
static void addBots(unsigned int amount);
static void killBots(unsigned int amount = 0);
+ static inline HumanController* getLocalControllerSingleton()
+ { return HumanController::localController_s; }
+
private:
static HumanController* localController_s;
};
Modified: branches/pickups2/src/orxonox/objects/pickup/BaseItem.cc
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/BaseItem.cc 2009-05-11 15:31:21 UTC (rev 2971)
+++ branches/pickups2/src/orxonox/objects/pickup/BaseItem.cc 2009-05-11 16:03:40 UTC (rev 2972)
@@ -34,6 +34,9 @@
#include "BaseItem.h"
#include "PickupCollection.h"
+
+#include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
#include "objects/worldentities/pawns/Pawn.h"
namespace orxonox
@@ -53,7 +56,22 @@
BaseItem::~BaseItem()
{
}
+
/**
+ @brief XMLPort for BaseItem.
+ @param xmlelement Element of the XML-file.
+ @param mode XMLPort mode to use.
+ */
+ void BaseItem::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+ {
+ SUPER(BaseItem, XMLPort, xmlelement, mode);
+
+ XMLPortParam(BaseItem, "guiText", setGUIText, getGUIText, xmlelement, mode);
+ XMLPortParam(BaseItem, "guiTooltip", setGUITooltip, getGUITooltip, xmlelement, mode);
+ XMLPortParam(BaseItem, "guiImage", setGUIImage, getGUIImage, xmlelement, mode);
+ }
+
+ /**
@brief Method to add the item to a pawn.
@param pawn Pawn to which the item should get added.
@return Returns whether the pawn's PickupCollection accepted the item.
Modified: branches/pickups2/src/orxonox/objects/pickup/BaseItem.h
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/BaseItem.h 2009-05-11 15:31:21 UTC (rev 2971)
+++ branches/pickups2/src/orxonox/objects/pickup/BaseItem.h 2009-05-11 16:03:40 UTC (rev 2972)
@@ -38,6 +38,7 @@
#include "core/BaseObject.h"
+// tolua_begin
namespace orxonox
{
/**
@@ -50,10 +51,13 @@
*/
class _OrxonoxExport BaseItem : public BaseObject
{
+// tolua_end
public:
BaseItem(BaseObject* creator);
virtual ~BaseItem();
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< XMLPort
+
/**
@brief Checks how many instances of this item can be carried at a time.
@return How many of this item can be carried.
@@ -115,6 +119,22 @@
*/
inline void setPickupIdentifier(const std::string& identifier)
{ this->pickupIdentifier_ = identifier; }
+
+ // GUI stuff
+ virtual const std::string& getGUIText()
+ { return this->guiText_; }
+ inline void setGUIText(const std::string& text)
+ { this->guiText_ = text; }
+
+ virtual const std::string& getGUITooltip()
+ { return this->guiTooltip_; }
+ inline void setGUITooltip(const std::string& tooltip)
+ { this->guiTooltip_ = tooltip; }
+
+ virtual const std::string& getGUIImage()
+ { return this->guiImage_; }
+ inline void setGUIImage(const std::string& image)
+ { this->guiImage_ = image; }
private:
Pawn* owner_; //!< The current owner of the item.
@@ -126,6 +146,10 @@
used to index items in the PickupCollection.
*/
std::string pickupIdentifier_;
+
+ std::string guiText_;
+ std::string guiTooltip_;
+ std::string guiImage_;
};
}
Modified: branches/pickups2/src/orxonox/objects/pickup/CMakeLists.txt
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/CMakeLists.txt 2009-05-11 15:31:21 UTC (rev 2971)
+++ branches/pickups2/src/orxonox/objects/pickup/CMakeLists.txt 2009-05-11 16:03:40 UTC (rev 2972)
@@ -6,6 +6,7 @@
ModifierPickup.cc
PassiveItem.cc
PickupCollection.cc
+ PickupInventory.cc
PickupSpawner.cc
UsableItem.cc
)
Modified: branches/pickups2/src/orxonox/objects/pickup/DroppedItem.cc
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/DroppedItem.cc 2009-05-11 15:31:21 UTC (rev 2971)
+++ branches/pickups2/src/orxonox/objects/pickup/DroppedItem.cc 2009-05-11 16:03:40 UTC (rev 2972)
@@ -54,7 +54,10 @@
void DroppedItem::timerCallback()
{
if (this->item_)
+ {
+ COUT(3) << "Delete DroppedItem with '" << this->item_->getPickupIdentifier() << "'" << std::endl;
delete this->item_;
+ }
delete this;
}
Modified: branches/pickups2/src/orxonox/objects/pickup/PickupCollection.cc
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/PickupCollection.cc 2009-05-11 15:31:21 UTC (rev 2971)
+++ branches/pickups2/src/orxonox/objects/pickup/PickupCollection.cc 2009-05-11 16:03:40 UTC (rev 2972)
@@ -38,6 +38,8 @@
#include "PassiveItem.h"
#include "UsableItem.h"
+#include "core/CoreIncludes.h"
+
#include "objects/worldentities/pawns/Pawn.h"
namespace orxonox
@@ -311,15 +313,15 @@
@brief Get a list of equipment-type items.
@return Returns a list of all the equipment-type items in the collection.
*/
- std::set<BaseItem*> PickupCollection::getEquipmentItems()
+ std::deque<EquipmentItem*> PickupCollection::getEquipmentItems()
{
- std::set<BaseItem*> ret;
+ std::deque<EquipmentItem*> ret;
Identifier* ident = Class(EquipmentItem);
for (std::multimap<std::string, BaseItem*>::iterator it = this->items_.begin(); it != this->items_.end(); it++)
{
if ((*it).second->isA(ident))
- ret.insert((*it).second);
+ ret.push_back(dynamic_cast<EquipmentItem*>((*it).second));
}
return ret;
@@ -328,15 +330,15 @@
@brief Get a list of passive items.
@return Returns a list of all the passive items in the collection.
*/
- std::set<BaseItem*> PickupCollection::getPassiveItems()
+ std::deque<PassiveItem*> PickupCollection::getPassiveItems()
{
- std::set<BaseItem*> ret;
+ std::deque<PassiveItem*> ret;
Identifier* ident = Class(PassiveItem);
for (std::multimap<std::string, BaseItem*>::iterator it = this->items_.begin(); it != this->items_.end(); it++)
{
if ((*it).second->isA(ident))
- ret.insert((*it).second);
+ ret.push_back(dynamic_cast<PassiveItem*>((*it).second));
}
return ret;
@@ -345,15 +347,15 @@
@brief Get a list of usable items.
@return Returns a list of all the usable items in the collection.
*/
- std::set<BaseItem*> PickupCollection::getUsableItems()
+ std::deque<UsableItem*> PickupCollection::getUsableItems()
{
- std::set<BaseItem*> ret;
+ std::deque<UsableItem*> ret;
Identifier* ident = Class(UsableItem);
for (std::multimap<std::string, BaseItem*>::iterator it = this->items_.begin(); it != this->items_.end(); it++)
{
if ((*it).second->isA(ident))
- ret.insert((*it).second);
+ ret.push_back(dynamic_cast<UsableItem*>((*it).second));
}
return ret;
Modified: branches/pickups2/src/orxonox/objects/pickup/PickupCollection.h
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/PickupCollection.h 2009-05-11 15:31:21 UTC (rev 2971)
+++ branches/pickups2/src/orxonox/objects/pickup/PickupCollection.h 2009-05-11 16:03:40 UTC (rev 2972)
@@ -37,7 +37,7 @@
#include "OrxonoxPrereqs.h"
#include <map>
-#include <set>
+#include <deque>
#include <string>
#include "util/Math.h"
@@ -47,6 +47,8 @@
namespace orxonox
{
class BaseItem;
+ class EquipmentItem;
+ class PassiveItem;
class UsableItem;
class Pawn;
@@ -103,9 +105,9 @@
inline void setOwner(Pawn* owner)
{ this->owner_ = owner; }
- std::set<BaseItem*> getEquipmentItems(); //!< Get a list of equipment-type items.
- std::set<BaseItem*> getPassiveItems(); //!< Get a list of passive items.
- std::set<BaseItem*> getUsableItems(); //!< Get a list of usable items.
+ std::deque<EquipmentItem*> getEquipmentItems(); //!< Get a list of equipment-type items.
+ std::deque<PassiveItem*> getPassiveItems(); //!< Get a list of passive items.
+ std::deque<UsableItem*> getUsableItems(); //!< Get a list of usable items.
private:
Pawn* owner_; //!< The owner of the PickupCollection.
Added: branches/pickups2/src/orxonox/objects/pickup/PickupInventory.cc
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/PickupInventory.cc (rev 0)
+++ branches/pickups2/src/orxonox/objects/pickup/PickupInventory.cc 2009-05-11 16:03:40 UTC (rev 2972)
@@ -0,0 +1,200 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Daniel 'Huty' Haggenmueller
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include "PickupInventory.h"
+
+#include "EquipmentItem.h"
+#include "UsableItem.h"
+#include "PassiveItem.h"
+
+#include "core/CoreIncludes.h"
+#include "core/ConsoleCommand.h"
+#include "core/input/InputManager.h"
+
+#include "gui/GUIManager.h"
+#include "objects/controllers/HumanController.h"
+#include "objects/worldentities/pawns/SpaceShip.h"
+
+#include <CEGUIImagesetManager.h>
+#include <CEGUIWindow.h>
+#include <elements/CEGUITabControl.h>
+
+namespace orxonox
+{
+ orxonox::ConsoleCommand& function_PickupInventory_ToggleInventory_0 =
+ orxonox::CommandExecutor::addConsoleCommandShortcut(orxonox::createConsoleCommand(orxonox::createFunctor(&PickupInventory::toggleInventory), "toggleInventory"), true);
+
+ static bool bInventoryVisible_ = false;
+ void PickupInventory::toggleInventory()
+ {
+ if(bInventoryVisible_) {
+ GUIManager::getInstancePtr()->executeCode("hideGUI(\"PickupInventory\")");
+ GUIManager::getInstancePtr()->executeCode("hideCursor()");
+ InputManager::getInstance().requestLeaveState("guiMouseOnly");
+ }
+ else
+ {
+ GUIManager::getInstancePtr()->showGUI("PickupInventory");
+ GUIManager::getInstancePtr()->executeCode("showCursor()");
+ InputManager::getInstance().requestEnterState("guiMouseOnly");
+ }
+ bInventoryVisible_ = !bInventoryVisible_;
+ }
+ void PickupInventory::tabChanged(CEGUI::Window *tab)
+ {
+ CEGUI::TabControl* tabCtrl = dynamic_cast<CEGUI::TabControl*>(tab);
+ if(tabCtrl != NULL)
+ {
+ COUT(1) << "tabChanged() tab index: " << tabCtrl->getSelectedTabIndex() << std::endl;
+ }
+ else
+ {
+ COUT(1) << "tabChanged() argument is no CEGUI::TabControl!" << std::endl;
+ }
+ }
+ unsigned int PickupInventory::getEquipmentCount()
+ {
+ if (HumanController::getLocalControllerSingleton() && HumanController::getLocalControllerSingleton()->getControllableEntity())
+ {
+ Pawn* pawn = dynamic_cast<Pawn*>(HumanController::getLocalControllerSingleton()->getControllableEntity());
+ if(pawn)
+ return pawn->getPickups().getEquipmentItems().size();
+
+ }
+ return 0;
+ }
+ unsigned int PickupInventory::getUsableCount()
+ {
+ if (HumanController::getLocalControllerSingleton() && HumanController::getLocalControllerSingleton()->getControllableEntity())
+ {
+ Pawn* pawn = dynamic_cast<Pawn*>(HumanController::getLocalControllerSingleton()->getControllableEntity());
+ if(pawn)
+ return pawn->getPickups().getUsableItems().size();
+
+ }
+ return 0;
+ }
+ unsigned int PickupInventory::getPassiveCount()
+ {
+ if (HumanController::getLocalControllerSingleton() && HumanController::getLocalControllerSingleton()->getControllableEntity())
+ {
+ Pawn* pawn = dynamic_cast<Pawn*>(HumanController::getLocalControllerSingleton()->getControllableEntity());
+ if(pawn)
+ return pawn->getPickups().getPassiveItems().size();
+
+ }
+ return 0;
+ }
+ EquipmentItem* PickupInventory::getEquipmentItem(unsigned int i)
+ {
+ if (HumanController::getLocalControllerSingleton() && HumanController::getLocalControllerSingleton()->getControllableEntity())
+ {
+ Pawn* pawn = dynamic_cast<Pawn*>(HumanController::getLocalControllerSingleton()->getControllableEntity());
+ if(pawn)
+ {
+ std::deque<EquipmentItem*> l = pawn->getPickups().getEquipmentItems();
+ if (i >= l.size()) { return NULL; }
+ return l.at(i);
+ }
+
+ }
+ return NULL;
+ }
+ UsableItem* PickupInventory::getUsableItem(unsigned int i)
+ {
+ if (HumanController::getLocalControllerSingleton() && HumanController::getLocalControllerSingleton()->getControllableEntity())
+ {
+ Pawn* pawn = dynamic_cast<Pawn*>(HumanController::getLocalControllerSingleton()->getControllableEntity());
+ if(pawn)
+ {
+ std::deque<UsableItem*> l = pawn->getPickups().getUsableItems();
+ if (i >= l.size()) { return NULL; }
+ return l.at(i);
+ }
+
+ }
+ return NULL;
+ }
+ PassiveItem* PickupInventory::getPassiveItem(unsigned int i)
+ {
+ if (HumanController::getLocalControllerSingleton() && HumanController::getLocalControllerSingleton()->getControllableEntity())
+ {
+ Pawn* pawn = dynamic_cast<Pawn*>(HumanController::getLocalControllerSingleton()->getControllableEntity());
+ if(pawn)
+ {
+ std::deque<PassiveItem*> l = pawn->getPickups().getPassiveItems();
+ if (i >= l.size()) { return NULL; }
+ return l.at(i);
+ }
+
+ }
+ return NULL;
+ }
+ std::string PickupInventory::getImagesetForEquipment(unsigned int i)
+ {
+ EquipmentItem* item = PickupInventory::getEquipmentItem(i);
+ if(!item)
+ return "";
+
+ std::string name = "pickup_" + item->getGUIImage();
+
+ if(!CEGUI::ImagesetManager::getSingletonPtr()->isImagesetPresent(name)) {
+ CEGUI::ImagesetManager::getSingletonPtr()->createImagesetFromImageFile(name, item->getGUIImage(), "pickups");
+ }
+
+ return name;
+ }
+ std::string PickupInventory::getImagesetForUsable(unsigned int i)
+ {
+ UsableItem* item = PickupInventory::getUsableItem(i);
+ if(!item)
+ return "";
+
+ std::string name = "pickup_" + item->getGUIImage();
+
+ if(!CEGUI::ImagesetManager::getSingletonPtr()->isImagesetPresent(name)) {
+ CEGUI::ImagesetManager::getSingletonPtr()->createImagesetFromImageFile(name, item->getGUIImage(), "pickups");
+ }
+
+ return name;
+ }
+ std::string PickupInventory::getImagesetForPassive(unsigned int i)
+ {
+ PassiveItem* item = PickupInventory::getPassiveItem(i);
+ if(!item)
+ return "";
+
+ std::string name = "pickup_" + item->getGUIImage();
+
+ if(!CEGUI::ImagesetManager::getSingletonPtr()->isImagesetPresent(name)) {
+ CEGUI::ImagesetManager::getSingletonPtr()->createImagesetFromImageFile(name, item->getGUIImage(), "pickups");
+ }
+
+ return name;
+ }
+}
Added: branches/pickups2/src/orxonox/objects/pickup/PickupInventory.h
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/PickupInventory.h (rev 0)
+++ branches/pickups2/src/orxonox/objects/pickup/PickupInventory.h 2009-05-11 16:03:40 UTC (rev 2972)
@@ -0,0 +1,82 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Daniel 'Huty' Haggenmueller
+ * Co-authors:
+ * ...
+ *
+ */
+
+/**
+ @file
+ @brief Declaration of static class for the inventory GUI window.
+*/
+
+#ifndef _PickupInventory_H__
+#define _PickupInventory_H__
+
+#include "OrxonoxPrereqs.h"
+
+#include "core/BaseObject.h"
+
+namespace CEGUI { class Window; }
+
+// tolua_begin
+namespace orxonox
+{
+ class EquipmentItem;
+ class PassiveItem;
+ class UsableItem;
+
+ /**
+ @brief Static class for the inventory GUI window.
+ @author Daniel 'Huty' Haggenmueller
+ */
+ class _OrxonoxExport PickupInventory
+ {
+// tolua_end
+ public:
+ //PickupInventory(BaseObject* creator);
+ //virtual ~PickupInventory();
+
+ /**
+ @brief Toggle visiblity of inventory.
+ */
+ static void toggleInventory(); // tolua_export
+
+ static void tabChanged(CEGUI::Window* tab); // tolua_export
+
+ static unsigned int getEquipmentCount(); // tolua_export
+ static unsigned int getUsableCount(); // tolua_export
+ static unsigned int getPassiveCount(); // tolua_export
+
+ static EquipmentItem* getEquipmentItem(unsigned int i); // tolua_export
+ static UsableItem* getUsableItem(unsigned int i); // tolua_export
+ static PassiveItem* getPassiveItem(unsigned int i); // tolua_export
+
+ static std::string getImagesetForEquipment(unsigned int i); // tolua_export
+ static std::string getImagesetForUsable(unsigned int i); // tolua_export
+ static std::string getImagesetForPassive(unsigned int i); // tolua_export
+ }; // tolua_export
+} // tolua_export
+
+#endif /* _PickupInventory_H__ */
Modified: branches/pickups2/src/orxonox/objects/pickup/UsableItem.cc
===================================================================
--- branches/pickups2/src/orxonox/objects/pickup/UsableItem.cc 2009-05-11 15:31:21 UTC (rev 2971)
+++ branches/pickups2/src/orxonox/objects/pickup/UsableItem.cc 2009-05-11 16:03:40 UTC (rev 2972)
@@ -25,7 +25,7 @@
* ...
*
*/
-
+
/**
@file
@brief Implementation of UsableItem.
Modified: branches/pickups2/src/orxonox/overlays/notifications/NotificationQueue.cc
===================================================================
--- branches/pickups2/src/orxonox/overlays/notifications/NotificationQueue.cc 2009-05-11 15:31:21 UTC (rev 2971)
+++ branches/pickups2/src/orxonox/overlays/notifications/NotificationQueue.cc 2009-05-11 16:03:40 UTC (rev 2972)
@@ -53,6 +53,7 @@
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;
/**
@brief
@@ -272,7 +273,7 @@
}
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)
{
Modified: branches/pickups2/src/orxonox/overlays/notifications/NotificationQueue.h
===================================================================
--- branches/pickups2/src/orxonox/overlays/notifications/NotificationQueue.h 2009-05-11 15:31:21 UTC (rev 2971)
+++ branches/pickups2/src/orxonox/overlays/notifications/NotificationQueue.h 2009-05-11 16:03:40 UTC (rev 2972)
@@ -165,7 +165,7 @@
static const int DEFAULT_SIZE = 5; //!< The default maximum number of Notifications displayed.
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.
static const Vector2 DEFAULT_POSITION; //!< the default position.
More information about the Orxonox-commit
mailing list