[Orxonox-commit 612] r3144 - in branches/pch/src/orxonox/overlays: . console debug hud map notifications
rgrieder at orxonox.net
rgrieder at orxonox.net
Wed Jun 10 22:58:53 CEST 2009
Author: rgrieder
Date: 2009-06-10 22:58:53 +0200 (Wed, 10 Jun 2009)
New Revision: 3144
Modified:
branches/pch/src/orxonox/overlays/FadeoutText.cc
branches/pch/src/orxonox/overlays/FadeoutText.h
branches/pch/src/orxonox/overlays/GUIOverlay.cc
branches/pch/src/orxonox/overlays/GUIOverlay.h
branches/pch/src/orxonox/overlays/OrxonoxOverlay.h
branches/pch/src/orxonox/overlays/OverlayGroup.h
branches/pch/src/orxonox/overlays/OverlayText.cc
branches/pch/src/orxonox/overlays/OverlayText.h
branches/pch/src/orxonox/overlays/console/InGameConsole.cc
branches/pch/src/orxonox/overlays/console/InGameConsole.h
branches/pch/src/orxonox/overlays/debug/DebugFPSText.cc
branches/pch/src/orxonox/overlays/debug/DebugFPSText.h
branches/pch/src/orxonox/overlays/debug/DebugRTRText.cc
branches/pch/src/orxonox/overlays/debug/DebugRTRText.h
branches/pch/src/orxonox/overlays/hud/AnnounceMessage.h
branches/pch/src/orxonox/overlays/hud/ChatOverlay.cc
branches/pch/src/orxonox/overlays/hud/ChatOverlay.h
branches/pch/src/orxonox/overlays/hud/DeathMessage.h
branches/pch/src/orxonox/overlays/hud/GametypeStatus.cc
branches/pch/src/orxonox/overlays/hud/GametypeStatus.h
branches/pch/src/orxonox/overlays/hud/HUDBar.cc
branches/pch/src/orxonox/overlays/hud/HUDBar.h
branches/pch/src/orxonox/overlays/hud/HUDHealthBar.cc
branches/pch/src/orxonox/overlays/hud/HUDHealthBar.h
branches/pch/src/orxonox/overlays/hud/HUDNavigation.cc
branches/pch/src/orxonox/overlays/hud/HUDNavigation.h
branches/pch/src/orxonox/overlays/hud/HUDRadar.cc
branches/pch/src/orxonox/overlays/hud/HUDRadar.h
branches/pch/src/orxonox/overlays/hud/HUDSpeedBar.cc
branches/pch/src/orxonox/overlays/hud/HUDSpeedBar.h
branches/pch/src/orxonox/overlays/hud/HUDTimer.cc
branches/pch/src/orxonox/overlays/hud/HUDTimer.h
branches/pch/src/orxonox/overlays/hud/KillMessage.h
branches/pch/src/orxonox/overlays/hud/PongScore.cc
branches/pch/src/orxonox/overlays/hud/PongScore.h
branches/pch/src/orxonox/overlays/hud/TeamBaseMatchScore.cc
branches/pch/src/orxonox/overlays/hud/TeamBaseMatchScore.h
branches/pch/src/orxonox/overlays/hud/UnderAttackHealthBar.h
branches/pch/src/orxonox/overlays/map/Map.cc
branches/pch/src/orxonox/overlays/map/Map.h
branches/pch/src/orxonox/overlays/notifications/Notification.cc
branches/pch/src/orxonox/overlays/notifications/Notification.h
branches/pch/src/orxonox/overlays/notifications/NotificationManager.cc
branches/pch/src/orxonox/overlays/notifications/NotificationManager.h
branches/pch/src/orxonox/overlays/notifications/NotificationOverlay.cc
branches/pch/src/orxonox/overlays/notifications/NotificationOverlay.h
branches/pch/src/orxonox/overlays/notifications/NotificationQueue.cc
branches/pch/src/orxonox/overlays/notifications/NotificationQueue.h
Log:
Header file section clean up in orxonox/overlays (without stats). Also reduced dependencies as much as possible.
Modified: branches/pch/src/orxonox/overlays/FadeoutText.cc
===================================================================
--- branches/pch/src/orxonox/overlays/FadeoutText.cc 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/FadeoutText.cc 2009-06-10 20:58:53 UTC (rev 3144)
@@ -29,7 +29,7 @@
#include "FadeoutText.h"
#include <OgreTextAreaOverlayElement.h>
-
+#include "util/Math.h"
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
Modified: branches/pch/src/orxonox/overlays/FadeoutText.h
===================================================================
--- branches/pch/src/orxonox/overlays/FadeoutText.h 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/FadeoutText.h 2009-06-10 20:58:53 UTC (rev 3144)
@@ -31,9 +31,9 @@
#include "OrxonoxPrereqs.h"
+#include "tools/Timer.h"
+#include "objects/Tickable.h"
#include "overlays/OverlayText.h"
-#include "objects/Tickable.h"
-#include "tools/Timer.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/overlays/GUIOverlay.cc
===================================================================
--- branches/pch/src/orxonox/overlays/GUIOverlay.cc 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/GUIOverlay.cc 2009-06-10 20:58:53 UTC (rev 3144)
@@ -27,12 +27,15 @@
*/
#include "GUIOverlay.h"
+
#include <string>
#include <sstream>
+
#include "core/input/InputManager.h"
+#include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
+#include "gui/GUIManager.h"
-#include "../gui/GUIManager.h"
-
namespace orxonox
{
CreateFactory(GUIOverlay);
@@ -52,7 +55,7 @@
XMLPortParam(GUIOverlay, "guiname", setGUIName, getGUIName, xmlElement, mode);
- GUIManager::getInstancePtr()->registerOverlay(this->guiName_, this);
+ GUIManager::getInstance().registerOverlay(this->guiName_, this);
}
void GUIOverlay::changedVisibility()
@@ -65,14 +68,14 @@
std::stringstream out;
out << (long)this;
str = out.str();
- GUIManager::getInstancePtr()->executeCode("showCursor()");
+ GUIManager::getInstance().executeCode("showCursor()");
InputManager::getInstance().requestEnterState("guiMouseOnly");
- GUIManager::getInstancePtr()->executeCode("showGUI(\"" + this->guiName_ + "\", " + str + ")");
+ GUIManager::getInstance().executeCode("showGUI(\"" + this->guiName_ + "\", " + str + ")");
}
else
{
- GUIManager::getInstancePtr()->executeCode("hideGUI(\"" + this->guiName_ + "\")");
- GUIManager::getInstancePtr()->executeCode("hideCursor()");
+ GUIManager::getInstance().executeCode("hideGUI(\"" + this->guiName_ + "\")");
+ GUIManager::getInstance().executeCode("hideCursor()");
InputManager::getInstance().requestLeaveState("guiMouseOnly");
}
}
Modified: branches/pch/src/orxonox/overlays/GUIOverlay.h
===================================================================
--- branches/pch/src/orxonox/overlays/GUIOverlay.h 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/GUIOverlay.h 2009-06-10 20:58:53 UTC (rev 3144)
@@ -29,14 +29,11 @@
#ifndef _GUIOverlay_H__
#define _GUIOverlay_H__
+#include "OrxonoxPrereqs.h"
+#include <string>
#include "OrxonoxOverlay.h"
-#include "OrxonoxPrereqs.h"
-#include <OgrePrerequisites.h>
-
-#include "core/XMLPort.h"
-
namespace orxonox
{
class _OrxonoxExport GUIOverlay : public OrxonoxOverlay
Modified: branches/pch/src/orxonox/overlays/OrxonoxOverlay.h
===================================================================
--- branches/pch/src/orxonox/overlays/OrxonoxOverlay.h 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/OrxonoxOverlay.h 2009-06-10 20:58:53 UTC (rev 3144)
@@ -36,10 +36,12 @@
#include "OrxonoxPrereqs.h"
+#include <string>
#include <OgrePrerequisites.h>
-#include "tools/WindowEventListener.h"
+
#include "util/Math.h"
#include "core/BaseObject.h"
+#include "tools/WindowEventListener.h"
namespace orxonox
{
@@ -133,10 +135,10 @@
void setSize(const Vector2& size) { this->size_ = size; this->sizeChanged(); }
//! Gets the current size that was set (uncorrected)
- const Vector2& getSize() const { return this->size_; }
+ const Vector2& getSize() const { return this->size_; }
//! Gets the actual size of the overlay on the screen (corrected)
- Vector2 getActualSize() const { return this->size_ * this->sizeCorrection_; }
+ Vector2 getActualSize() const { return this->size_ * this->sizeCorrection_; }
//! Gets the current size correction (default: 1.0, 1.0)
const Vector2& getSizeCorrection() const { return this->sizeCorrection_; }
@@ -197,7 +199,7 @@
Vector2 position_; //!< Position of the pickPoint on the screen.
Vector2 pickPoint_; //!< Point on the overlay to pick when translating
Degree angle_; //!< Rotation angle of the overlay
- RotationState rotState_; //!< horizontal, vertical or inbetween
+ RotationState rotState_; //!< horizontal, vertical or inbetween
private:
void windowResized(unsigned int newWidth, unsigned int newHeight);
Modified: branches/pch/src/orxonox/overlays/OverlayGroup.h
===================================================================
--- branches/pch/src/orxonox/overlays/OverlayGroup.h 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/OverlayGroup.h 2009-06-10 20:58:53 UTC (rev 3144)
@@ -38,8 +38,8 @@
#include <set>
#include <OgrePrerequisites.h>
+#include "util/Math.h"
#include "core/BaseObject.h"
-#include "util/Math.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/overlays/OverlayText.cc
===================================================================
--- branches/pch/src/orxonox/overlays/OverlayText.cc 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/OverlayText.cc 2009-06-10 20:58:53 UTC (rev 3144)
@@ -30,15 +30,22 @@
#include <OgreOverlayManager.h>
#include <OgrePanelOverlayElement.h>
+#include <OgreTextAreaOverlayElement.h>
+#include <boost/static_assert.hpp>
#include "util/String.h"
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
+
namespace orxonox
{
CreateFactory(OverlayText);
+ BOOST_STATIC_ASSERT(Ogre::TextAreaOverlayElement::Left == OverlayText::Left);
+ BOOST_STATIC_ASSERT(Ogre::TextAreaOverlayElement::Center == OverlayText::Center);
+ BOOST_STATIC_ASSERT(Ogre::TextAreaOverlayElement::Right == OverlayText::Right);
+
OverlayText::OverlayText(BaseObject* creator)
: OrxonoxOverlay(creator)
{
@@ -75,20 +82,14 @@
XMLPortParam(OverlayText, "spacewidth", setSpaceWidth, getSpaceWidth, xmlElement, mode);
}
- void OverlayText::setFont(const std::string& font)
- {
- if (font != "")
- this->text_->setFontName(font);
- }
-
void OverlayText::setAlignmentString(const std::string& alignment)
{
if (alignment == "right")
- this->setAlignment(Ogre::TextAreaOverlayElement::Right);
+ this->setAlignment(OverlayText::Right);
else if (alignment == "center")
- this->setAlignment(Ogre::TextAreaOverlayElement::Center);
+ this->setAlignment(OverlayText::Center);
else // "left" and default
- this->setAlignment(Ogre::TextAreaOverlayElement::Left);
+ this->setAlignment(OverlayText::Left);
}
std::string OverlayText::getAlignmentString() const
@@ -119,4 +120,51 @@
positionChanged();
}
+
+ void OverlayText::setCaption(const std::string& caption)
+ {
+ this->text_->setCaption(caption);
+ this->changedCaption();
+ }
+ std::string OverlayText::getCaption() const
+ {
+ return this->text_->getCaption();
+ }
+
+ void OverlayText::setFont(const std::string& font)
+ {
+ if (font != "")
+ this->text_->setFontName(font);
+ }
+ const std::string& OverlayText::getFont() const
+ {
+ return this->text_->getFontName();
+ }
+
+ void OverlayText::setSpaceWidth(float width)
+ {
+ this->text_->setSpaceWidth(width);
+ }
+ float OverlayText::getSpaceWidth() const
+ {
+ return this->text_->getSpaceWidth();
+ }
+
+ void OverlayText::setColour(const ColourValue& colour)
+ {
+ this->text_->setColour(colour); this->changedColour();
+ }
+ const ColourValue& OverlayText::getColour() const
+ {
+ return this->text_->getColour();
+ }
+
+ void OverlayText::setAlignment(OverlayText::Alignment alignment)
+ {
+ this->text_->setAlignment((Ogre::TextAreaOverlayElement::Alignment)alignment);
+ }
+ OverlayText::Alignment OverlayText::getAlignment() const
+ {
+ return (OverlayText::Alignment)this->text_->getAlignment();
+ }
}
Modified: branches/pch/src/orxonox/overlays/OverlayText.h
===================================================================
--- branches/pch/src/orxonox/overlays/OverlayText.h 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/OverlayText.h 2009-06-10 20:58:53 UTC (rev 3144)
@@ -32,8 +32,7 @@
#include "OrxonoxPrereqs.h"
#include <string>
-#include <OgrePrerequisites.h>
-#include <OgreTextAreaOverlayElement.h>
+#include "util/Math.h"
#include "OrxonoxOverlay.h"
namespace orxonox
@@ -41,25 +40,32 @@
class _OrxonoxExport OverlayText : public OrxonoxOverlay
{
public:
+ enum Alignment
+ {
+ Left,
+ Right,
+ Center
+ };
+
OverlayText(BaseObject* creator);
virtual ~OverlayText();
virtual void XMLPort(Element& xmlElement, XMLPort::Mode mode);
- inline void setCaption(const std::string& caption) { this->text_->setCaption(caption); this->changedCaption(); }
- inline std::string getCaption() const { return this->text_->getCaption(); }
+ void setCaption(const std::string& caption);
+ std::string getCaption() const;
void setFont(const std::string& font);
- inline const std::string& getFont() const { return this->text_->getFontName(); }
+ const std::string& getFont() const;
- inline void setSpaceWidth(float width) { this->text_->setSpaceWidth(width); }
- inline float getSpaceWidth() const { return this->text_->getSpaceWidth(); }
+ void setSpaceWidth(float width);
+ float getSpaceWidth() const;
- inline void setColour(const ColourValue& colour) { this->text_->setColour(colour); this->changedColour(); }
- inline const ColourValue& getColour() const { return this->text_->getColour(); }
+ void setColour(const ColourValue& colour);
+ const ColourValue& getColour() const;
- inline void setAlignment(Ogre::TextAreaOverlayElement::Alignment alignment) { this->text_->setAlignment(alignment); }
- inline Ogre::TextAreaOverlayElement::Alignment getAlignment() const { return this->text_->getAlignment(); }
+ void setAlignment(OverlayText::Alignment alignment);
+ OverlayText::Alignment getAlignment() const;
void setAlignmentString(const std::string& alignment);
std::string getAlignmentString() const;
Modified: branches/pch/src/orxonox/overlays/console/InGameConsole.cc
===================================================================
--- branches/pch/src/orxonox/overlays/console/InGameConsole.cc 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/console/InGameConsole.cc 2009-06-10 20:58:53 UTC (rev 3144)
@@ -34,6 +34,8 @@
#include <OgreOverlayElement.h>
#include <OgreOverlayManager.h>
#include <OgreOverlayContainer.h>
+#include <OgreBorderPanelOverlayElement.h>
+#include <OgreTextAreaOverlayElement.h>
#include <OgreFontManager.h>
#include <OgreFont.h>
Modified: branches/pch/src/orxonox/overlays/console/InGameConsole.h
===================================================================
--- branches/pch/src/orxonox/overlays/console/InGameConsole.h 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/console/InGameConsole.h 2009-06-10 20:58:53 UTC (rev 3144)
@@ -31,18 +31,14 @@
#include "OrxonoxPrereqs.h"
-#include <OgrePrerequisites.h>
-#include <OgreBorderPanelOverlayElement.h>
-#include <OgreTextAreaOverlayElement.h>
+#include <string>
#include "core/Shell.h"
-#include "core/OrxonoxClass.h"
#include "tools/WindowEventListener.h"
-
namespace orxonox
{
- class _OrxonoxExport InGameConsole : virtual public OrxonoxClass, public ShellListener, public WindowEventListener
+ class _OrxonoxExport InGameConsole : public ShellListener, public WindowEventListener
{
public: // functions
InGameConsole();
Modified: branches/pch/src/orxonox/overlays/debug/DebugFPSText.cc
===================================================================
--- branches/pch/src/orxonox/overlays/debug/DebugFPSText.cc 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/debug/DebugFPSText.cc 2009-06-10 20:58:53 UTC (rev 3144)
@@ -27,7 +27,7 @@
*/
#include "DebugFPSText.h"
-#include <OgreTextAreaOverlayElement.h>
+
#include "util/Convert.h"
#include "core/CoreIncludes.h"
#include "core/Game.h"
@@ -50,6 +50,6 @@
SUPER(DebugFPSText, tick, dt);
float fps = Game::getInstance().getAvgFPS();
- this->setCaption(convertToString(fps));
+ this->setCaption(multi_cast<std::string>(fps));
}
}
Modified: branches/pch/src/orxonox/overlays/debug/DebugFPSText.h
===================================================================
--- branches/pch/src/orxonox/overlays/debug/DebugFPSText.h 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/debug/DebugFPSText.h 2009-06-10 20:58:53 UTC (rev 3144)
@@ -31,8 +31,8 @@
#include "OrxonoxPrereqs.h"
+#include "objects/Tickable.h"
#include "overlays/OverlayText.h"
-#include "objects/Tickable.h"
namespace orxonox
{
@@ -40,7 +40,7 @@
{
public:
DebugFPSText(BaseObject* creator);
- ~DebugFPSText();
+ virtual ~DebugFPSText();
virtual void tick(float dt);
};
Modified: branches/pch/src/orxonox/overlays/debug/DebugRTRText.cc
===================================================================
--- branches/pch/src/orxonox/overlays/debug/DebugRTRText.cc 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/debug/DebugRTRText.cc 2009-06-10 20:58:53 UTC (rev 3144)
@@ -27,9 +27,9 @@
*/
#include "DebugRTRText.h"
-#include <OgreTextAreaOverlayElement.h>
+
+#include "util/Convert.h"
#include "core/CoreIncludes.h"
-#include "util/Convert.h"
#include "core/Game.h"
namespace orxonox
@@ -50,6 +50,6 @@
SUPER(DebugRTRText, tick, dt);
float rtr = Game::getInstance().getAvgTickTime();
- this->setCaption(convertToString(rtr));
+ this->setCaption(multi_cast<std::string>(rtr));
}
}
Modified: branches/pch/src/orxonox/overlays/debug/DebugRTRText.h
===================================================================
--- branches/pch/src/orxonox/overlays/debug/DebugRTRText.h 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/debug/DebugRTRText.h 2009-06-10 20:58:53 UTC (rev 3144)
@@ -31,8 +31,8 @@
#include "OrxonoxPrereqs.h"
+#include "objects/Tickable.h"
#include "overlays/OverlayText.h"
-#include "objects/Tickable.h"
namespace orxonox
{
@@ -40,7 +40,7 @@
{
public:
DebugRTRText(BaseObject* creator);
- ~DebugRTRText();
+ virtual ~DebugRTRText();
virtual void tick(float dt);
};
Modified: branches/pch/src/orxonox/overlays/hud/AnnounceMessage.h
===================================================================
--- branches/pch/src/orxonox/overlays/hud/AnnounceMessage.h 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/hud/AnnounceMessage.h 2009-06-10 20:58:53 UTC (rev 3144)
@@ -31,8 +31,9 @@
#include "OrxonoxPrereqs.h"
+#include <string>
+#include "objects/GametypeMessageListener.h"
#include "overlays/FadeoutText.h"
-#include "objects/GametypeMessageListener.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/overlays/hud/ChatOverlay.cc
===================================================================
--- branches/pch/src/orxonox/overlays/hud/ChatOverlay.cc 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/hud/ChatOverlay.cc 2009-06-10 20:58:53 UTC (rev 3144)
@@ -30,19 +30,16 @@
#include <OgreTextAreaOverlayElement.h>
+#include "util/Convert.h"
#include "util/UTFStringConversions.h"
#include "core/CoreIncludes.h"
#include "core/ConfigValueIncludes.h"
#include "core/Executor.h"
-#include "network/ClientInformation.h"
-
-#include "PlayerManager.h"
-#include "objects/infos/PlayerInfo.h"
#include "tools/Timer.h"
+#include "objects/infos/PlayerInfo.h"
+#include "PlayerManager.h"
-#include "util/Convert.h"
-
namespace orxonox
{
CreateFactory(ChatOverlay);
Modified: branches/pch/src/orxonox/overlays/hud/ChatOverlay.h
===================================================================
--- branches/pch/src/orxonox/overlays/hud/ChatOverlay.h 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/hud/ChatOverlay.h 2009-06-10 20:58:53 UTC (rev 3144)
@@ -31,7 +31,9 @@
#include "OrxonoxPrereqs.h"
-#include <OgreTextAreaOverlayElement.h>
+#include <string>
+#include <list>
+#include <OgreUTFString.h>
#include "network/ChatListener.h"
#include "overlays/OverlayText.h"
@@ -42,7 +44,7 @@
{
public:
ChatOverlay(BaseObject* creator);
- ~ChatOverlay();
+ virtual ~ChatOverlay();
void setConfigValues();
Modified: branches/pch/src/orxonox/overlays/hud/DeathMessage.h
===================================================================
--- branches/pch/src/orxonox/overlays/hud/DeathMessage.h 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/hud/DeathMessage.h 2009-06-10 20:58:53 UTC (rev 3144)
@@ -31,8 +31,9 @@
#include "OrxonoxPrereqs.h"
+#include <string>
+#include "objects/GametypeMessageListener.h"
#include "overlays/FadeoutText.h"
-#include "objects/GametypeMessageListener.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/overlays/hud/GametypeStatus.cc
===================================================================
--- branches/pch/src/orxonox/overlays/hud/GametypeStatus.cc 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/hud/GametypeStatus.cc 2009-06-10 20:58:53 UTC (rev 3144)
@@ -28,10 +28,8 @@
#include "GametypeStatus.h"
-#include <OgreTextAreaOverlayElement.h>
-
-#include "core/CoreIncludes.h"
#include "util/Convert.h"
+#include "core/CoreIncludes.h"
#include "objects/infos/GametypeInfo.h"
#include "objects/infos/PlayerInfo.h"
#include "objects/worldentities/ControllableEntity.h"
Modified: branches/pch/src/orxonox/overlays/hud/GametypeStatus.h
===================================================================
--- branches/pch/src/orxonox/overlays/hud/GametypeStatus.h 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/hud/GametypeStatus.h 2009-06-10 20:58:53 UTC (rev 3144)
@@ -31,8 +31,8 @@
#include "OrxonoxPrereqs.h"
+#include "objects/Tickable.h"
#include "overlays/OverlayText.h"
-#include "objects/Tickable.h"
namespace orxonox
{
@@ -40,7 +40,7 @@
{
public:
GametypeStatus(BaseObject* creator);
- ~GametypeStatus();
+ virtual ~GametypeStatus();
virtual void tick(float dt);
virtual void changedOwner();
Modified: branches/pch/src/orxonox/overlays/hud/HUDBar.cc
===================================================================
--- branches/pch/src/orxonox/overlays/hud/HUDBar.cc 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/hud/HUDBar.cc 2009-06-10 20:58:53 UTC (rev 3144)
@@ -33,6 +33,7 @@
#include <OgreOverlayManager.h>
#include <OgreMaterialManager.h>
#include <OgreTechnique.h>
+#include <OgrePass.h>
#include <OgrePanelOverlayElement.h>
#include "util/Convert.h"
Modified: branches/pch/src/orxonox/overlays/hud/HUDBar.h
===================================================================
--- branches/pch/src/orxonox/overlays/hud/HUDBar.h 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/hud/HUDBar.h 2009-06-10 20:58:53 UTC (rev 3144)
@@ -34,8 +34,11 @@
#include "OrxonoxPrereqs.h"
#include <map>
+#include <vector>
#include <OgrePrerequisites.h>
+
#include "util/Math.h"
+#include "core/BaseObject.h"
#include "overlays/OrxonoxOverlay.h"
namespace orxonox
@@ -44,7 +47,7 @@
{
public:
BarColour(BaseObject* creator);
- ~BarColour() { }
+ virtual ~BarColour() { }
virtual void XMLPort(Element& xmlElement, XMLPort::Mode mode);
Modified: branches/pch/src/orxonox/overlays/hud/HUDHealthBar.cc
===================================================================
--- branches/pch/src/orxonox/overlays/hud/HUDHealthBar.cc 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/hud/HUDHealthBar.cc 2009-06-10 20:58:53 UTC (rev 3144)
@@ -28,15 +28,11 @@
#include "HUDHealthBar.h"
-#include <OgreOverlayManager.h>
-#include <OgrePanelOverlayElement.h>
-
+#include "util/Convert.h"
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
#include "objects/worldentities/pawns/Pawn.h"
-#include "objects/items/Engine.h"
#include "overlays/OverlayGroup.h"
-#include "util/Convert.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/overlays/hud/HUDHealthBar.h
===================================================================
--- branches/pch/src/orxonox/overlays/hud/HUDHealthBar.h 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/hud/HUDHealthBar.h 2009-06-10 20:58:53 UTC (rev 3144)
@@ -31,9 +31,10 @@
#include "OrxonoxPrereqs.h"
-#include "HUDBar.h"
+#include "util/Math.h"
#include "objects/Tickable.h"
#include "overlays/OverlayText.h"
+#include "HUDBar.h"
namespace orxonox
{
@@ -41,7 +42,7 @@
{
public:
HUDHealthBar(BaseObject* creator);
- ~HUDHealthBar();
+ virtual ~HUDHealthBar();
virtual void XMLPort(Element& xmlElement, XMLPort::Mode mode);
virtual void tick(float dt);
@@ -63,9 +64,9 @@
inline bool getTextUseBarColour() const
{ return this->bUseBarColour_; }
- inline void setTextAlignment(Ogre::TextAreaOverlayElement::Alignment alignment)
+ inline void setTextAlignment(OverlayText::Alignment alignment)
{ this->textoverlay_->setAlignment(alignment); }
- inline Ogre::TextAreaOverlayElement::Alignment getTextAlignment() const
+ inline OverlayText::Alignment getTextAlignment() const
{ return this->textoverlay_->getAlignment(); }
void setTextAlignmentString(const std::string& alignment)
Modified: branches/pch/src/orxonox/overlays/hud/HUDNavigation.cc
===================================================================
--- branches/pch/src/orxonox/overlays/hud/HUDNavigation.cc 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/hud/HUDNavigation.cc 2009-06-10 20:58:53 UTC (rev 3144)
@@ -35,7 +35,6 @@
#include "util/Math.h"
#include "util/String.h"
#include "util/Convert.h"
-#include "core/ConsoleCommand.h"
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
#include "objects/Radar.h"
Modified: branches/pch/src/orxonox/overlays/hud/HUDNavigation.h
===================================================================
--- branches/pch/src/orxonox/overlays/hud/HUDNavigation.h 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/hud/HUDNavigation.h 2009-06-10 20:58:53 UTC (rev 3144)
@@ -31,9 +31,10 @@
#include "OrxonoxPrereqs.h"
+#include <string>
#include <OgrePrerequisites.h>
+#include "objects/Tickable.h"
#include "overlays/OrxonoxOverlay.h"
-#include "objects/Tickable.h"
namespace orxonox
{
@@ -41,7 +42,7 @@
{
public:
HUDNavigation(BaseObject* creator);
- ~HUDNavigation();
+ virtual ~HUDNavigation();
virtual void XMLPort(Element& xmlElement, XMLPort::Mode mode);
virtual void tick(float dt);
Modified: branches/pch/src/orxonox/overlays/hud/HUDRadar.cc
===================================================================
--- branches/pch/src/orxonox/overlays/hud/HUDRadar.cc 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/hud/HUDRadar.cc 2009-06-10 20:58:53 UTC (rev 3144)
@@ -34,13 +34,11 @@
#include "util/Math.h"
#include "util/String.h"
-#include "core/ConsoleCommand.h"
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
-#include "objects/Radar.h"
+#include "tools/TextureGenerator.h"
#include "objects/worldentities/WorldEntity.h"
#include "objects/worldentities/pawns/Pawn.h"
-#include "tools/TextureGenerator.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/overlays/hud/HUDRadar.h
===================================================================
--- branches/pch/src/orxonox/overlays/hud/HUDRadar.h 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/hud/HUDRadar.h 2009-06-10 20:58:53 UTC (rev 3144)
@@ -32,9 +32,10 @@
#include "OrxonoxPrereqs.h"
+#include <map>
#include <vector>
-#include <map>
#include <OgrePrerequisites.h>
+
#include "overlays/OrxonoxOverlay.h"
#include "objects/RadarListener.h"
#include "objects/RadarViewable.h"
@@ -45,7 +46,7 @@
{
public:
HUDRadar(BaseObject* creator);
- ~HUDRadar();
+ virtual ~HUDRadar();
virtual void XMLPort(Element& xmlElement, XMLPort::Mode mode);
virtual void changedOwner();
Modified: branches/pch/src/orxonox/overlays/hud/HUDSpeedBar.cc
===================================================================
--- branches/pch/src/orxonox/overlays/hud/HUDSpeedBar.cc 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/hud/HUDSpeedBar.cc 2009-06-10 20:58:53 UTC (rev 3144)
@@ -28,6 +28,7 @@
*/
#include "HUDSpeedBar.h"
+
#include "core/CoreIncludes.h"
#include "objects/worldentities/pawns/SpaceShip.h"
#include "objects/items/Engine.h"
Modified: branches/pch/src/orxonox/overlays/hud/HUDSpeedBar.h
===================================================================
--- branches/pch/src/orxonox/overlays/hud/HUDSpeedBar.h 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/hud/HUDSpeedBar.h 2009-06-10 20:58:53 UTC (rev 3144)
@@ -32,8 +32,8 @@
#include "OrxonoxPrereqs.h"
+#include "objects/Tickable.h"
#include "HUDBar.h"
-#include "objects/Tickable.h"
namespace orxonox
{
@@ -41,7 +41,7 @@
{
public:
HUDSpeedBar(BaseObject* creator);
- ~HUDSpeedBar();
+ virtual ~HUDSpeedBar();
virtual void tick(float dt);
virtual void changedOwner();
Modified: branches/pch/src/orxonox/overlays/hud/HUDTimer.cc
===================================================================
--- branches/pch/src/orxonox/overlays/hud/HUDTimer.cc 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/hud/HUDTimer.cc 2009-06-10 20:58:53 UTC (rev 3144)
@@ -28,45 +28,45 @@
#include "HUDTimer.h"
+#include "util/Convert.h"
#include "core/CoreIncludes.h"
-#include "util/Convert.h"
#include "objects/worldentities/ControllableEntity.h"
#include "objects/gametypes/Gametype.h"
namespace orxonox
{
- CreateFactory(HUDTimer);
+ CreateFactory(HUDTimer);
- HUDTimer::HUDTimer(BaseObject* creator) : OverlayText(creator)
- {
- RegisterObject(HUDTimer);
+ HUDTimer::HUDTimer(BaseObject* creator) : OverlayText(creator)
+ {
+ RegisterObject(HUDTimer);
- this->owner_ = 0;
- }
+ this->owner_ = 0;
+ }
- HUDTimer::~HUDTimer()
- {
- }
+ HUDTimer::~HUDTimer()
+ {
+ }
- void HUDTimer::tick(float dt)
- {
- SUPER(HUDTimer, tick, dt);
+ void HUDTimer::tick(float dt)
+ {
+ SUPER(HUDTimer, tick, dt);
- Gametype* gametype = this->getGametype();
-
- if(gametype)
- {
- if (gametype->getTimerIsActive())
- {
- this->setCaption(convertToString((int)gametype->getTime() + 1));
- }
+ Gametype* gametype = this->getGametype();
+
+ if (gametype)
+ {
+ if (gametype->getTimerIsActive())
+ {
+ this->setCaption(convertToString((int)gametype->getTime() + 1));
+ }
+ }
}
- }
- void HUDTimer::changedOwner()
- {
- SUPER(HUDTimer, changedOwner);
+ void HUDTimer::changedOwner()
+ {
+ SUPER(HUDTimer, changedOwner);
- this->owner_ = dynamic_cast<ControllableEntity*>(this->getOwner());
- }
+ this->owner_ = dynamic_cast<ControllableEntity*>(this->getOwner());
+ }
}
Modified: branches/pch/src/orxonox/overlays/hud/HUDTimer.h
===================================================================
--- branches/pch/src/orxonox/overlays/hud/HUDTimer.h 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/hud/HUDTimer.h 2009-06-10 20:58:53 UTC (rev 3144)
@@ -31,23 +31,23 @@
#include "OrxonoxPrereqs.h"
+#include "objects/Tickable.h"
#include "overlays/OverlayText.h"
-#include "objects/Tickable.h"
namespace orxonox
{
- class _OrxonoxExport HUDTimer : public OverlayText, public Tickable
- {
+ class _OrxonoxExport HUDTimer : public OverlayText, public Tickable
+ {
public:
- HUDTimer(BaseObject* creator);
- ~HUDTimer();
+ HUDTimer(BaseObject* creator);
+ virtual ~HUDTimer();
- virtual void tick(float dt);
+ virtual void tick(float dt);
- virtual void changedOwner();
+ virtual void changedOwner();
- private:
+ private:
ControllableEntity* owner_;
- };
+ };
}
#endif /* _HUDTimer_H__ */
Modified: branches/pch/src/orxonox/overlays/hud/KillMessage.h
===================================================================
--- branches/pch/src/orxonox/overlays/hud/KillMessage.h 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/hud/KillMessage.h 2009-06-10 20:58:53 UTC (rev 3144)
@@ -31,8 +31,9 @@
#include "OrxonoxPrereqs.h"
+#include <string>
+#include "objects/GametypeMessageListener.h"
#include "overlays/FadeoutText.h"
-#include "objects/GametypeMessageListener.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/overlays/hud/PongScore.cc
===================================================================
--- branches/pch/src/orxonox/overlays/hud/PongScore.cc 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/hud/PongScore.cc 2009-06-10 20:58:53 UTC (rev 3144)
@@ -28,11 +28,9 @@
#include "PongScore.h"
-#include <OgreTextAreaOverlayElement.h>
-
+#include "util/Convert.h"
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
-#include "util/Convert.h"
#include "objects/gametypes/Pong.h"
#include "objects/infos/PlayerInfo.h"
Modified: branches/pch/src/orxonox/overlays/hud/PongScore.h
===================================================================
--- branches/pch/src/orxonox/overlays/hud/PongScore.h 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/hud/PongScore.h 2009-06-10 20:58:53 UTC (rev 3144)
@@ -31,8 +31,8 @@
#include "OrxonoxPrereqs.h"
+#include "objects/Tickable.h"
#include "overlays/OverlayText.h"
-#include "objects/Tickable.h"
namespace orxonox
{
@@ -40,7 +40,7 @@
{
public:
PongScore(BaseObject* creator);
- ~PongScore();
+ virtual ~PongScore();
virtual void tick(float dt);
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
Modified: branches/pch/src/orxonox/overlays/hud/TeamBaseMatchScore.cc
===================================================================
--- branches/pch/src/orxonox/overlays/hud/TeamBaseMatchScore.cc 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/hud/TeamBaseMatchScore.cc 2009-06-10 20:58:53 UTC (rev 3144)
@@ -28,8 +28,6 @@
#include "TeamBaseMatchScore.h"
-#include <OgreTextAreaOverlayElement.h>
-
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
#include "util/Convert.h"
Modified: branches/pch/src/orxonox/overlays/hud/TeamBaseMatchScore.h
===================================================================
--- branches/pch/src/orxonox/overlays/hud/TeamBaseMatchScore.h 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/hud/TeamBaseMatchScore.h 2009-06-10 20:58:53 UTC (rev 3144)
@@ -31,8 +31,8 @@
#include "OrxonoxPrereqs.h"
+#include "objects/Tickable.h"
#include "overlays/OverlayText.h"
-#include "objects/Tickable.h"
namespace orxonox
{
@@ -40,7 +40,7 @@
{
public:
TeamBaseMatchScore(BaseObject* creator);
- ~TeamBaseMatchScore();
+ virtual ~TeamBaseMatchScore();
virtual void tick(float dt);
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
Modified: branches/pch/src/orxonox/overlays/hud/UnderAttackHealthBar.h
===================================================================
--- branches/pch/src/orxonox/overlays/hud/UnderAttackHealthBar.h 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/hud/UnderAttackHealthBar.h 2009-06-10 20:58:53 UTC (rev 3144)
@@ -31,8 +31,9 @@
#include "OrxonoxPrereqs.h"
+#include "util/Math.h"
+#include "tools/Timer.h"
#include "HUDHealthBar.h"
-#include "tools/Timer.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/overlays/map/Map.cc
===================================================================
--- branches/pch/src/orxonox/overlays/map/Map.cc 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/map/Map.cc 2009-06-10 20:58:53 UTC (rev 3144)
@@ -23,38 +23,39 @@
* Si Sun
*
*/
+
#include "Map.h"
#include <string>
-#include "util/String.h"
+
+#include <OgreBorderPanelOverlayElement.h>
+#include <OgreCamera.h>
+#include <OgreHardwarePixelBuffer.h>
+#include <OgreMaterialManager.h>
+#include <OgreMovablePlane.h>
+#include <OgreOverlay.h>
+#include <OgreOverlayContainer.h>
+#include <OgreOverlayManager.h>
+#include <OgrePass.h>
+#include <OgreRenderTexture.h>
+#include <OgreResourceGroupManager.h>
+#include <OgreRoot.h>
#include <OgreSceneManager.h>
#include <OgreSceneNode.h>
-#include <OgreEntity.h>
-#include <OgreNode.h>
-
-
-#include <OgreRenderWindow.h>
-#include <OgreRenderTexture.h>
+#include <OgreTechnique.h>
#include <OgreTexture.h>
+#include <OgreTextureManager.h>
#include <OgreViewport.h>
-#include <OgreMaterialManager.h>
-#include <OgreRoot.h>
-#include <OgreHardwarePixelBuffer.h>
-#include "objects/worldentities/ControllableEntity.h"
-#include "objects/worldentities/CameraPosition.h"
-
-#include <OgreOverlay.h>
-#include <OgreMovablePlane.h>
-#include <OgreOverlayElement.h>
-#include <OgreOverlayManager.h>
-#include <OgreOverlayContainer.h>
+#include "core/ConsoleCommand.h"
#include "core/CoreIncludes.h"
-#include "core/ConfigValueIncludes.h"
-#include "core/ConsoleCommand.h"
+#include "core/Iterator.h"
+#include "core/XMLPort.h"
#include "objects/Scene.h"
#include "objects/RadarViewable.h"
#include "objects/controllers/HumanController.h"
+#include "objects/worldentities/CameraPosition.h"
+#include "objects/worldentities/ControllableEntity.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/overlays/map/Map.h
===================================================================
--- branches/pch/src/orxonox/overlays/map/Map.h 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/map/Map.h 2009-06-10 20:58:53 UTC (rev 3144)
@@ -24,29 +24,18 @@
*
*/
-#ifndef _MAP_H__
-#define _MAP_H__
+#ifndef _Map_H__
+#define _Map_H__
-#include <string>
#include "OrxonoxPrereqs.h"
-#include <OgrePrerequisites.h>
-#include <OgreSceneManager.h>
-#include <OgreSceneNode.h>
-#include <OgreEntity.h>
-#include <OgreOverlay.h>
-#include <OgreOverlayElement.h>
-#include <OgreOverlayManager.h>
-#include <OgreOverlayContainer.h>
-#include <OgreMovablePlane.h>
-#include <OgreBorderPanelOverlayElement.h>
-#include <OgreTextAreaOverlayElement.h>
+#include <string>
+#include <OgreMaterial.h>
-#include "overlays/OrxonoxOverlay.h"
+#include "util/UtilPrereqs.h"
#include "objects/Tickable.h"
+#include "overlays/OrxonoxOverlay.h"
-
-
namespace orxonox
{
class _OrxonoxExport Map : public OrxonoxOverlay, public Tickable
@@ -54,7 +43,7 @@
public: // functions
Map(BaseObject* creator);
- ~Map();
+ virtual ~Map();
virtual void XMLPort(Element& xmlElement, XMLPort::Mode mode);
virtual void tick(float dt);
@@ -125,4 +114,4 @@
};
}
-#endif /* _MAP_H__ */
+#endif /* _Map_H__ */
Modified: branches/pch/src/orxonox/overlays/notifications/Notification.cc
===================================================================
--- branches/pch/src/orxonox/overlays/notifications/Notification.cc 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/notifications/Notification.cc 2009-06-10 20:58:53 UTC (rev 3144)
@@ -34,8 +34,6 @@
#include "Notification.h"
#include "core/CoreIncludes.h"
-#include "util/Exception.h"
-
#include "NotificationManager.h"
namespace orxonox
@@ -47,6 +45,7 @@
*/
Notification::Notification(BaseObject* creator) : BaseObject(creator)
{
+ RegisterObject(Notification);
this->initialize();
}
@@ -75,8 +74,6 @@
*/
void Notification::initialize(void)
{
- RegisterObject(Notification);
-
this->message_ = "";
this->sender_ = NotificationManager::NONE;
this->sent_ = false;
Modified: branches/pch/src/orxonox/overlays/notifications/Notification.h
===================================================================
--- branches/pch/src/orxonox/overlays/notifications/Notification.h 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/notifications/Notification.h 2009-06-10 20:58:53 UTC (rev 3144)
@@ -37,7 +37,6 @@
#include "OrxonoxPrereqs.h"
#include <string>
-
#include "core/BaseObject.h"
namespace orxonox
Modified: branches/pch/src/orxonox/overlays/notifications/NotificationManager.cc
===================================================================
--- branches/pch/src/orxonox/overlays/notifications/NotificationManager.cc 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/notifications/NotificationManager.cc 2009-06-10 20:58:53 UTC (rev 3144)
@@ -33,10 +33,9 @@
#include "NotificationManager.h"
-#include "core/CoreIncludes.h"
-
#include <set>
+#include "core/CoreIncludes.h"
#include "Notification.h"
#include "NotificationQueue.h"
Modified: branches/pch/src/orxonox/overlays/notifications/NotificationManager.h
===================================================================
--- branches/pch/src/orxonox/overlays/notifications/NotificationManager.h 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/notifications/NotificationManager.h 2009-06-10 20:58:53 UTC (rev 3144)
@@ -36,14 +36,11 @@
#include "OrxonoxPrereqs.h"
-#include "core/OrxonoxClass.h"
-
+#include <ctime>
#include <map>
#include <string>
-#include <ctime>
+#include "core/OrxonoxClass.h"
-#include "NotificationOverlay.h"
-
namespace orxonox
{
Modified: branches/pch/src/orxonox/overlays/notifications/NotificationOverlay.cc
===================================================================
--- branches/pch/src/orxonox/overlays/notifications/NotificationOverlay.cc 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/notifications/NotificationOverlay.cc 2009-06-10 20:58:53 UTC (rev 3144)
@@ -33,13 +33,8 @@
#include "NotificationOverlay.h"
-#include <OgreOverlayManager.h>
-#include <OgreTextAreaOverlayElement.h>
-#include <OgrePanelOverlayElement.h>
-
-#include "core/CoreIncludes.h"
#include "util/Exception.h"
-
+#include "core/CoreIncludes.h"
#include "Notification.h"
#include "NotificationQueue.h"
@@ -52,6 +47,7 @@
*/
NotificationOverlay::NotificationOverlay(BaseObject* creator) : OverlayText(creator)
{
+ RegisterObject(NotificationOverlay);
this->initialize();
}
@@ -86,8 +82,6 @@
*/
void NotificationOverlay::initialize(void)
{
- RegisterObject(NotificationOverlay);
-
this->queue_ = NULL;
}
Modified: branches/pch/src/orxonox/overlays/notifications/NotificationOverlay.h
===================================================================
--- branches/pch/src/orxonox/overlays/notifications/NotificationOverlay.h 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/notifications/NotificationOverlay.h 2009-06-10 20:58:53 UTC (rev 3144)
@@ -37,13 +37,9 @@
#include "OrxonoxPrereqs.h"
+#include <string>
#include "orxonox/overlays/OverlayText.h"
-#include <string>
-#include <set>
-#include <OgrePrerequisites.h>
-#include <OgreTextAreaOverlayElement.h>
-
namespace orxonox
{
Modified: branches/pch/src/orxonox/overlays/notifications/NotificationQueue.cc
===================================================================
--- branches/pch/src/orxonox/overlays/notifications/NotificationQueue.cc 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/notifications/NotificationQueue.cc 2009-06-10 20:58:53 UTC (rev 3144)
@@ -33,17 +33,12 @@
#include "NotificationQueue.h"
-#include <OgreOverlayManager.h>
-#include <OgreTextAreaOverlayElement.h>
-#include <list>
-#include <iostream>
#include <sstream>
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
-
-#include "Notification.h"
#include "NotificationOverlay.h"
+#include "NotificationManager.h"
namespace orxonox
{
@@ -60,6 +55,7 @@
*/
NotificationQueue::NotificationQueue(BaseObject* creator) : OverlayGroup(creator)
{
+ RegisterObject(NotificationQueue);
this->initialize();
}
@@ -80,8 +76,6 @@
*/
void NotificationQueue::initialize(void)
{
- RegisterObject(NotificationQueue);
-
this->size_ = 0;
this->tickTime_ = 0.0;
Modified: branches/pch/src/orxonox/overlays/notifications/NotificationQueue.h
===================================================================
--- branches/pch/src/orxonox/overlays/notifications/NotificationQueue.h 2009-06-10 20:54:43 UTC (rev 3143)
+++ branches/pch/src/orxonox/overlays/notifications/NotificationQueue.h 2009-06-10 20:58:53 UTC (rev 3144)
@@ -36,19 +36,15 @@
#include "OrxonoxPrereqs.h"
-#include <string>
-#include <set>
-#include <OgreOverlayManager.h>
-#include <OgreTextAreaOverlayElement.h>
-#include <OgrePanelOverlayElement.h>
-#include <map>
#include <ctime>
+#include <map>
+#include <set>
+#include <string>
-#include "orxonox/overlays/OverlayGroup.h"
+#include "util/Math.h"
#include "orxonox/objects/Tickable.h"
+#include "orxonox/overlays/OverlayGroup.h"
-#include "NotificationManager.h"
-
namespace orxonox
{
More information about the Orxonox-commit
mailing list