[Orxonox-commit 608] r3140 - branches/pch/src/orxonox/overlays/stats
rgrieder at orxonox.net
rgrieder at orxonox.net
Wed Jun 10 22:42:42 CEST 2009
Author: rgrieder
Date: 2009-06-10 22:42:42 +0200 (Wed, 10 Jun 2009)
New Revision: 3140
Removed:
branches/pch/src/orxonox/overlays/stats/StatsTest.cc
branches/pch/src/orxonox/overlays/stats/StatsTest.h
Modified:
branches/pch/src/orxonox/overlays/stats/CMakeLists.txt
branches/pch/src/orxonox/overlays/stats/CreateLines.cc
branches/pch/src/orxonox/overlays/stats/CreateLines.h
branches/pch/src/orxonox/overlays/stats/Scoreboard.cc
branches/pch/src/orxonox/overlays/stats/Scoreboard.h
branches/pch/src/orxonox/overlays/stats/Stats.cc
branches/pch/src/orxonox/overlays/stats/Stats.h
Log:
Removed 'empty' file and cleaned out header section of statics overlay (doesn't change the fact that it is still a big hack though...)
Modified: branches/pch/src/orxonox/overlays/stats/CMakeLists.txt
===================================================================
--- branches/pch/src/orxonox/overlays/stats/CMakeLists.txt 2009-06-10 14:04:42 UTC (rev 3139)
+++ branches/pch/src/orxonox/overlays/stats/CMakeLists.txt 2009-06-10 20:42:42 UTC (rev 3140)
@@ -2,5 +2,4 @@
CreateLines.cc
Scoreboard.cc
Stats.cc
- StatsTest.cc
)
Modified: branches/pch/src/orxonox/overlays/stats/CreateLines.cc
===================================================================
--- branches/pch/src/orxonox/overlays/stats/CreateLines.cc 2009-06-10 14:04:42 UTC (rev 3139)
+++ branches/pch/src/orxonox/overlays/stats/CreateLines.cc 2009-06-10 20:42:42 UTC (rev 3140)
@@ -26,17 +26,6 @@
#include "CreateLines.h"
-#include <string>
-#include <OgreOverlay.h>
-#include <OgreOverlayElement.h>
-#include <OgreOverlayManager.h>
-#include <OgreOverlayContainer.h>
-
-#include "util/Convert.h"
-#include "util/Debug.h"
-#include "core/CoreIncludes.h"
-#include "core/ConfigValueIncludes.h"
-
#include "overlays/OverlayText.h"
#include "overlays/stats/Stats.h"
Modified: branches/pch/src/orxonox/overlays/stats/CreateLines.h
===================================================================
--- branches/pch/src/orxonox/overlays/stats/CreateLines.h 2009-06-10 14:04:42 UTC (rev 3139)
+++ branches/pch/src/orxonox/overlays/stats/CreateLines.h 2009-06-10 20:42:42 UTC (rev 3140)
@@ -27,16 +27,9 @@
#ifndef _CreateLines_H__
#define _CreateLines_H__
-
#include "OrxonoxPrereqs.h"
-#include <OgrePrerequisites.h>
-#include <OgreBorderPanelOverlayElement.h>
-#include <OgreTextAreaOverlayElement.h>
+#include <string>
-#include "overlays/OrxonoxOverlay.h"
-#include "objects/Tickable.h"
-
-
namespace orxonox
{
class _OrxonoxExport CreateLines
Modified: branches/pch/src/orxonox/overlays/stats/Scoreboard.cc
===================================================================
--- branches/pch/src/orxonox/overlays/stats/Scoreboard.cc 2009-06-10 14:04:42 UTC (rev 3139)
+++ branches/pch/src/orxonox/overlays/stats/Scoreboard.cc 2009-06-10 20:42:42 UTC (rev 3140)
@@ -26,16 +26,8 @@
#include "Scoreboard.h"
-#include <string>
-#include <OgreOverlay.h>
-#include <OgreOverlayElement.h>
-#include <OgreOverlayManager.h>
-#include <OgreOverlayContainer.h>
-
#include "util/Convert.h"
-#include "util/Debug.h"
#include "core/CoreIncludes.h"
-#include "core/ConfigValueIncludes.h"
#include "objects/gametypes/Gametype.h"
#include "objects/infos/PlayerInfo.h"
#include "CreateLines.h"
Modified: branches/pch/src/orxonox/overlays/stats/Scoreboard.h
===================================================================
--- branches/pch/src/orxonox/overlays/stats/Scoreboard.h 2009-06-10 14:04:42 UTC (rev 3139)
+++ branches/pch/src/orxonox/overlays/stats/Scoreboard.h 2009-06-10 20:42:42 UTC (rev 3140)
@@ -29,19 +29,16 @@
#include "OrxonoxPrereqs.h"
-#include <OgrePrerequisites.h>
-#include <OgreBorderPanelOverlayElement.h>
-#include <OgreTextAreaOverlayElement.h>
+#include <string>
+#include <vector>
#include "overlays/OrxonoxOverlay.h"
#include "objects/Tickable.h"
-
namespace orxonox
{
class _OrxonoxExport Scoreboard : public OrxonoxOverlay, public Tickable
{
-
public: // functions
Scoreboard(BaseObject* creator);
virtual ~Scoreboard() {}
Modified: branches/pch/src/orxonox/overlays/stats/Stats.cc
===================================================================
--- branches/pch/src/orxonox/overlays/stats/Stats.cc 2009-06-10 14:04:42 UTC (rev 3139)
+++ branches/pch/src/orxonox/overlays/stats/Stats.cc 2009-06-10 20:42:42 UTC (rev 3140)
@@ -29,13 +29,10 @@
#include "Stats.h"
#include <string>
-#include <OgreOverlay.h>
-#include <OgreOverlayElement.h>
#include <OgreOverlayManager.h>
-#include <OgreOverlayContainer.h>
+#include <OgreBorderPanelOverlayElement.h>
-#include "util/Convert.h"
-#include "util/Debug.h"
+#include "util/String.h"
#include "core/CoreIncludes.h"
#include "core/ConfigValueIncludes.h"
Modified: branches/pch/src/orxonox/overlays/stats/Stats.h
===================================================================
--- branches/pch/src/orxonox/overlays/stats/Stats.h 2009-06-10 14:04:42 UTC (rev 3139)
+++ branches/pch/src/orxonox/overlays/stats/Stats.h 2009-06-10 20:42:42 UTC (rev 3140)
@@ -29,16 +29,11 @@
#ifndef _Stats_H__
#define _Stats_H__
-
#include "OrxonoxPrereqs.h"
-#include <OgrePrerequisites.h>
-#include <OgreBorderPanelOverlayElement.h>
-#include <OgreTextAreaOverlayElement.h>
#include "overlays/OrxonoxOverlay.h"
#include "objects/Tickable.h"
-
namespace orxonox
{
class _OrxonoxExport Stats : public OrxonoxOverlay, public Tickable
Deleted: branches/pch/src/orxonox/overlays/stats/StatsTest.cc
===================================================================
--- branches/pch/src/orxonox/overlays/stats/StatsTest.cc 2009-06-10 14:04:42 UTC (rev 3139)
+++ branches/pch/src/orxonox/overlays/stats/StatsTest.cc 2009-06-10 20:42:42 UTC (rev 3140)
@@ -1,51 +0,0 @@
-/*
- * 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:
- * Reto Grieder
- * Co-authors:
- * ...
- *
- */
-
-#include "StatsTest.h"
-
-#include <OgreTextAreaOverlayElement.h>
-#include "core/CoreIncludes.h"
-
-namespace orxonox
-{
- CreateFactory(StatsTest);
-
- StatsTest::StatsTest(BaseObject* creator)
- : OrxonoxOverlay(creator)
- {
- RegisterObject(StatsTest);
- }
-
- StatsTest::~StatsTest()
- {
- }
-
- void StatsTest::tick(float dt)
- {
- }
-}
Deleted: branches/pch/src/orxonox/overlays/stats/StatsTest.h
===================================================================
--- branches/pch/src/orxonox/overlays/stats/StatsTest.h 2009-06-10 14:04:42 UTC (rev 3139)
+++ branches/pch/src/orxonox/overlays/stats/StatsTest.h 2009-06-10 20:42:42 UTC (rev 3140)
@@ -1,48 +0,0 @@
-/*
- * 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:
- * Reto Grieder
- * Co-authors:
- * ...
- *
- */
-
-#ifndef _StatsTest_H__
-#define _StatsTest_H__
-
-#include "OrxonoxPrereqs.h"
-
-#include "overlays/OrxonoxOverlay.h"
-#include "objects/Tickable.h"
-
-namespace orxonox
-{
- class _OrxonoxExport StatsTest : public OrxonoxOverlay, public Tickable
- {
- public:
- StatsTest(BaseObject* creator);
- ~StatsTest();
-
- virtual void tick(float dt);
- };
-}
-#endif /* _StatsTest_H__ */
More information about the Orxonox-commit
mailing list