[Orxonox-commit 910] r5633 - in code/branches/libraries/src/orxonox: . gamestates interfaces objects objects/controllers objects/gametypes objects/items objects/pickup objects/worldentities objects/worldentities/triggers overlays overlays/debug overlays/hud overlays/notifications overlays/stats sound tools tools/interfaces
landauf at orxonox.net
landauf at orxonox.net
Wed Aug 12 01:32:31 CEST 2009
Author: landauf
Date: 2009-08-12 01:32:30 +0200 (Wed, 12 Aug 2009)
New Revision: 5633
Added:
code/branches/libraries/src/orxonox/tools/interfaces/
code/branches/libraries/src/orxonox/tools/interfaces/CMakeLists.txt
code/branches/libraries/src/orxonox/tools/interfaces/Tickable.h
code/branches/libraries/src/orxonox/tools/interfaces/TimeFactorListener.h
code/branches/libraries/src/orxonox/tools/interfaces/ToolsInterfaceCompilation.cc
Removed:
code/branches/libraries/src/orxonox/interfaces/Tickable.h
code/branches/libraries/src/orxonox/interfaces/TimeFactorListener.h
Modified:
code/branches/libraries/src/orxonox/CMakeLists.txt
code/branches/libraries/src/orxonox/Map.h
code/branches/libraries/src/orxonox/PawnManager.h
code/branches/libraries/src/orxonox/gamestates/GSLevel.cc
code/branches/libraries/src/orxonox/gamestates/GSRoot.cc
code/branches/libraries/src/orxonox/interfaces/InterfaceCompilation.cc
code/branches/libraries/src/orxonox/objects/Radar.h
code/branches/libraries/src/orxonox/objects/Scene.h
code/branches/libraries/src/orxonox/objects/Test.h
code/branches/libraries/src/orxonox/objects/controllers/AIController.h
code/branches/libraries/src/orxonox/objects/controllers/PongAI.h
code/branches/libraries/src/orxonox/objects/controllers/WaypointController.h
code/branches/libraries/src/orxonox/objects/gametypes/Gametype.h
code/branches/libraries/src/orxonox/objects/items/Engine.h
code/branches/libraries/src/orxonox/objects/pickup/DroppedItem.h
code/branches/libraries/src/orxonox/objects/pickup/PickupSpawner.h
code/branches/libraries/src/orxonox/objects/worldentities/Backlight.h
code/branches/libraries/src/orxonox/objects/worldentities/BlinkingBillboard.h
code/branches/libraries/src/orxonox/objects/worldentities/Camera.h
code/branches/libraries/src/orxonox/objects/worldentities/FadingBillboard.h
code/branches/libraries/src/orxonox/objects/worldentities/ForceField.h
code/branches/libraries/src/orxonox/objects/worldentities/MobileEntity.h
code/branches/libraries/src/orxonox/objects/worldentities/triggers/Trigger.h
code/branches/libraries/src/orxonox/overlays/FadeoutText.h
code/branches/libraries/src/orxonox/overlays/debug/DebugFPSText.h
code/branches/libraries/src/orxonox/overlays/debug/DebugRTRText.h
code/branches/libraries/src/orxonox/overlays/hud/GametypeStatus.h
code/branches/libraries/src/orxonox/overlays/hud/HUDHealthBar.h
code/branches/libraries/src/orxonox/overlays/hud/HUDNavigation.h
code/branches/libraries/src/orxonox/overlays/hud/HUDSpeedBar.h
code/branches/libraries/src/orxonox/overlays/hud/HUDTimer.h
code/branches/libraries/src/orxonox/overlays/hud/PongScore.h
code/branches/libraries/src/orxonox/overlays/hud/TeamBaseMatchScore.h
code/branches/libraries/src/orxonox/overlays/notifications/NotificationQueue.h
code/branches/libraries/src/orxonox/overlays/stats/Scoreboard.h
code/branches/libraries/src/orxonox/overlays/stats/Stats.h
code/branches/libraries/src/orxonox/sound/SoundManager.h
code/branches/libraries/src/orxonox/tools/CMakeLists.txt
code/branches/libraries/src/orxonox/tools/ParticleInterface.h
code/branches/libraries/src/orxonox/tools/Shader.h
code/branches/libraries/src/orxonox/tools/Timer.h
Log:
Put all tools into a new library called tools (phear my naming skillz!)
I had to move Tickable.h and TimeFactorListener.h to tools/interfaces
Theoretically one could move the other interfaces as well (except RadarViewable), but I don't think they belong to "tools" (just because you CAN, it doesn't mean you HAVE to).
Modified: code/branches/libraries/src/orxonox/CMakeLists.txt
===================================================================
--- code/branches/libraries/src/orxonox/CMakeLists.txt 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/CMakeLists.txt 2009-08-11 23:32:30 UTC (rev 5633)
@@ -69,6 +69,7 @@
util
core
network
+ tools
SOURCE_FILES ${ORXONOX_SRC_FILES}
)
Modified: code/branches/libraries/src/orxonox/Map.h
===================================================================
--- code/branches/libraries/src/orxonox/Map.h 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/Map.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -32,7 +32,7 @@
#include <OgreMaterial.h>
#include "util/UtilPrereqs.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
#include "overlays/OrxonoxOverlay.h"
namespace orxonox
Modified: code/branches/libraries/src/orxonox/PawnManager.h
===================================================================
--- code/branches/libraries/src/orxonox/PawnManager.h 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/PawnManager.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -32,7 +32,7 @@
#include "OrxonoxPrereqs.h"
#include "util/Singleton.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
namespace orxonox
{
Modified: code/branches/libraries/src/orxonox/gamestates/GSLevel.cc
===================================================================
--- code/branches/libraries/src/orxonox/gamestates/GSLevel.cc 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/gamestates/GSLevel.cc 2009-08-11 23:32:30 UTC (rev 5633)
@@ -44,7 +44,7 @@
#include "core/Loader.h"
#include "core/XMLFile.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
#include "objects/Radar.h"
#include "objects/quest/QuestManager.h"
#include "objects/quest/notifications/NotificationManager.h"
Modified: code/branches/libraries/src/orxonox/gamestates/GSRoot.cc
===================================================================
--- code/branches/libraries/src/orxonox/gamestates/GSRoot.cc 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/gamestates/GSRoot.cc 2009-08-11 23:32:30 UTC (rev 5633)
@@ -37,8 +37,8 @@
#include "ToluaBindCore.h"
#include "ToluaBindOrxonox.h"
#include "tools/Timer.h"
-#include "interfaces/TimeFactorListener.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/TimeFactorListener.h"
+#include "tools/interfaces/Tickable.h"
#include "LevelManager.h"
namespace orxonox
Modified: code/branches/libraries/src/orxonox/interfaces/InterfaceCompilation.cc
===================================================================
--- code/branches/libraries/src/orxonox/interfaces/InterfaceCompilation.cc 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/interfaces/InterfaceCompilation.cc 2009-08-11 23:32:30 UTC (rev 5633)
@@ -29,7 +29,7 @@
/**
@file
@brief
- Compiles all the interfaces (except RadarViewable) with mostly just a constructor.
+ Compiles all the interfaces in the orxonox library with mostly just a constructor.
*/
#include "GametypeMessageListener.h"
@@ -37,8 +37,6 @@
#include "RadarListener.h"
#include "Rewardable.h"
#include "TeamColourable.h"
-#include "Tickable.h"
-#include "TimeFactorListener.h"
#include "NotificationListener.h"
#include "core/CoreIncludes.h"
@@ -81,27 +79,6 @@
}
//----------------------------
- // TimeFactorListener
- //----------------------------
- float TimeFactorListener::timefactor_s = 1.0f;
-
- TimeFactorListener::TimeFactorListener()
- {
- RegisterRootObject(TimeFactorListener);
- }
-
- //----------------------------
- // Tickable
- //----------------------------
- /**
- @brief Constructor: Registers the object in the Tickable-list
- */
- Tickable::Tickable()
- {
- RegisterRootObject(Tickable);
- }
-
- //----------------------------
// Rewardable
//----------------------------
Rewardable::Rewardable()
Deleted: code/branches/libraries/src/orxonox/interfaces/Tickable.h
===================================================================
--- code/branches/libraries/src/orxonox/interfaces/Tickable.h 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/interfaces/Tickable.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -1,68 +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:
- * Fabian 'x3n' Landau
- * Co-authors:
- * ...
- *
- */
-
-/*!
- @file
- @brief Declaration of the Tickable interface.
-
- The Tickable interface provides a tick(dt) function, that gets called every frame.
- float dt is the time since the last frame in seconds.
-
- Attention:
- Classes derived from a Tickable that want to have a tick(dt) function on their part, MUST call the
- parent::tick(dt) function explicitly in their implementation of tick(dt) because it's a virtual function.
-*/
-
-#ifndef _Tickable_H__
-#define _Tickable_H__
-
-#include "OrxonoxPrereqs.h"
-
-#include "core/OrxonoxClass.h"
-#include "core/Super.h"
-
-namespace orxonox
-{
- //! The Tickable interface provides a tick(dt) function, that gets called every frame.
- class _OrxonoxExport Tickable : virtual public OrxonoxClass
- {
- public:
- /**
- @brief Gets called every frame.
- @param dt The time since the last frame in seconds
- */
- virtual void tick(float dt) { }
-
- protected:
- Tickable();
- };
-
- SUPER_FUNCTION(1, Tickable, tick, true);
-}
-
-#endif /* _Tickable_H__ */
Deleted: code/branches/libraries/src/orxonox/interfaces/TimeFactorListener.h
===================================================================
--- code/branches/libraries/src/orxonox/interfaces/TimeFactorListener.h 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/interfaces/TimeFactorListener.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -1,55 +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 _TimeFactorListener_H__
-#define _TimeFactorListener_H__
-
-#include "OrxonoxPrereqs.h"
-#include "core/OrxonoxClass.h"
-
-namespace orxonox
-{
- class _OrxonoxExport TimeFactorListener : virtual public OrxonoxClass
- {
- friend class GSRoot;
-
- public:
- TimeFactorListener();
- virtual ~TimeFactorListener() {}
-
- protected:
- virtual void changedTimeFactor(float factor_new, float factor_old) {}
- inline float getTimeFactor() const
- { return TimeFactorListener::timefactor_s; }
-
- private:
- static float timefactor_s;
- };
-}
-
-#endif /* _TimeFactorListener_H__ */
Modified: code/branches/libraries/src/orxonox/objects/Radar.h
===================================================================
--- code/branches/libraries/src/orxonox/objects/Radar.h 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/objects/Radar.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -41,7 +41,7 @@
#include "core/ObjectListIterator.h"
#include "interfaces/RadarViewable.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
namespace orxonox
{
Modified: code/branches/libraries/src/orxonox/objects/Scene.h
===================================================================
--- code/branches/libraries/src/orxonox/objects/Scene.h 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/objects/Scene.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -40,7 +40,7 @@
#include "util/OgreForwardRefs.h"
#include "core/BaseObject.h"
#include "network/synchronisable/Synchronisable.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
namespace orxonox
{
Modified: code/branches/libraries/src/orxonox/objects/Test.h
===================================================================
--- code/branches/libraries/src/orxonox/objects/Test.h 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/objects/Test.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -32,7 +32,7 @@
#include "OrxonoxPrereqs.h"
#include "core/BaseObject.h"
#include "network/synchronisable/Synchronisable.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
typedef int TYPE;
@@ -49,7 +49,7 @@
void setConfigValues();
void registerVariables();
-
+
static void call(unsigned int clientID);
void call2(unsigned int clientID, std::string s1, std::string s2, std::string s3, std::string s4);
virtual void tick(float dt);
@@ -64,7 +64,7 @@
void checkU2();
void checkU3();
void checkU4();
-
+
//signed functions
void setS1(TYPE value){ s1 = value; }
void setS2(TYPE value){ s2 = value; }
@@ -74,12 +74,12 @@
void checkS2();
void checkS3();
void checkS4();
-
+
static void printV1(){ instance_->checkU1(); }
static void printV2(){ instance_->checkU2(); }
static void printV3(){ instance_->checkU3(); }
static void printV4(){ instance_->checkU4(); }
-
+
void printBlaBla(std::string s1, std::string s2, std::string s3, std::string s4, std::string s5);
private:
@@ -87,12 +87,12 @@
UTYPE u2;
UTYPE u3;
UTYPE u4;
-
+
TYPE s1;
TYPE s2;
TYPE s3;
TYPE s4;
-
+
static Test* instance_;
};
}
Modified: code/branches/libraries/src/orxonox/objects/controllers/AIController.h
===================================================================
--- code/branches/libraries/src/orxonox/objects/controllers/AIController.h 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/objects/controllers/AIController.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -32,7 +32,7 @@
#include "OrxonoxPrereqs.h"
#include "tools/Timer.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
#include "ArtificialController.h"
namespace orxonox
Modified: code/branches/libraries/src/orxonox/objects/controllers/PongAI.h
===================================================================
--- code/branches/libraries/src/orxonox/objects/controllers/PongAI.h 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/objects/controllers/PongAI.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -33,7 +33,7 @@
#include <list>
#include "util/Math.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
#include "Controller.h"
namespace orxonox
Modified: code/branches/libraries/src/orxonox/objects/controllers/WaypointController.h
===================================================================
--- code/branches/libraries/src/orxonox/objects/controllers/WaypointController.h 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/objects/controllers/WaypointController.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -32,7 +32,7 @@
#include "OrxonoxPrereqs.h"
#include <vector>
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
#include "ArtificialController.h"
namespace orxonox
Modified: code/branches/libraries/src/orxonox/objects/gametypes/Gametype.h
===================================================================
--- code/branches/libraries/src/orxonox/objects/gametypes/Gametype.h 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/objects/gametypes/Gametype.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -37,7 +37,7 @@
#include "core/BaseObject.h"
#include "core/Identifier.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
#include "objects/infos/GametypeInfo.h"
namespace orxonox
@@ -132,7 +132,7 @@
virtual void removeTime(float t);
inline void startTimer()
- {
+ {
this->time_ = this->timeLimit_;
this->timerIsActive_ = true;
}
Modified: code/branches/libraries/src/orxonox/objects/items/Engine.h
===================================================================
--- code/branches/libraries/src/orxonox/objects/items/Engine.h 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/objects/items/Engine.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -31,7 +31,7 @@
#include "OrxonoxPrereqs.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
#include "Item.h"
namespace orxonox
Modified: code/branches/libraries/src/orxonox/objects/pickup/DroppedItem.h
===================================================================
--- code/branches/libraries/src/orxonox/objects/pickup/DroppedItem.h 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/objects/pickup/DroppedItem.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -37,7 +37,7 @@
#include "OrxonoxPrereqs.h"
#include "tools/Timer.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
#include "objects/worldentities/StaticEntity.h"
namespace orxonox
Modified: code/branches/libraries/src/orxonox/objects/pickup/PickupSpawner.h
===================================================================
--- code/branches/libraries/src/orxonox/objects/pickup/PickupSpawner.h 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/objects/pickup/PickupSpawner.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -38,7 +38,7 @@
#include <string>
#include "tools/Timer.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
#include "objects/worldentities/StaticEntity.h"
namespace orxonox
Modified: code/branches/libraries/src/orxonox/objects/worldentities/Backlight.h
===================================================================
--- code/branches/libraries/src/orxonox/objects/worldentities/Backlight.h 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/objects/worldentities/Backlight.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -32,7 +32,7 @@
#include "OrxonoxPrereqs.h"
#include <string>
-#include "interfaces/TimeFactorListener.h"
+#include "tools/interfaces/TimeFactorListener.h"
#include "FadingBillboard.h"
namespace orxonox
Modified: code/branches/libraries/src/orxonox/objects/worldentities/BlinkingBillboard.h
===================================================================
--- code/branches/libraries/src/orxonox/objects/worldentities/BlinkingBillboard.h 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/objects/worldentities/BlinkingBillboard.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -32,7 +32,7 @@
#include "OrxonoxPrereqs.h"
#include "util/Math.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
#include "Billboard.h"
namespace orxonox
Modified: code/branches/libraries/src/orxonox/objects/worldentities/Camera.h
===================================================================
--- code/branches/libraries/src/orxonox/objects/worldentities/Camera.h 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/objects/worldentities/Camera.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -32,7 +32,7 @@
#include "OrxonoxPrereqs.h"
#include "util/OgreForwardRefs.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
#include "objects/worldentities/StaticEntity.h"
namespace orxonox
Modified: code/branches/libraries/src/orxonox/objects/worldentities/FadingBillboard.h
===================================================================
--- code/branches/libraries/src/orxonox/objects/worldentities/FadingBillboard.h 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/objects/worldentities/FadingBillboard.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -33,7 +33,7 @@
#include "util/Math.h"
#include "tools/Timer.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
#include "Billboard.h"
namespace orxonox
Modified: code/branches/libraries/src/orxonox/objects/worldentities/ForceField.h
===================================================================
--- code/branches/libraries/src/orxonox/objects/worldentities/ForceField.h 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/objects/worldentities/ForceField.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -32,7 +32,7 @@
#include "OrxonoxPrereqs.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
#include "StaticEntity.h"
namespace orxonox
@@ -47,16 +47,16 @@
inline void setVelocity(float vel)
{ this->velocity_ = vel; }
-
+
inline float getVelocity()
{ return velocity_; }
-
+
inline void setDiameter(float diam)
{ this->diameter_ = diam; }
inline float getDiameter()
{ return diameter_; }
-
+
inline void setLength(float l)
{ this->length_ = l; }
Modified: code/branches/libraries/src/orxonox/objects/worldentities/MobileEntity.h
===================================================================
--- code/branches/libraries/src/orxonox/objects/worldentities/MobileEntity.h 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/objects/worldentities/MobileEntity.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -32,7 +32,7 @@
#include "OrxonoxPrereqs.h"
#include "util/Math.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
#include "WorldEntity.h"
namespace orxonox
Modified: code/branches/libraries/src/orxonox/objects/worldentities/triggers/Trigger.h
===================================================================
--- code/branches/libraries/src/orxonox/objects/worldentities/triggers/Trigger.h 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/objects/worldentities/triggers/Trigger.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -35,7 +35,7 @@
#include <queue>
#include "tools/BillboardSet.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
#include "objects/worldentities/StaticEntity.h"
namespace orxonox
Modified: code/branches/libraries/src/orxonox/overlays/FadeoutText.h
===================================================================
--- code/branches/libraries/src/orxonox/overlays/FadeoutText.h 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/overlays/FadeoutText.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -32,7 +32,7 @@
#include "overlays/OverlaysPrereqs.h"
#include "tools/Timer.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
#include "overlays/OverlayText.h"
namespace orxonox
Modified: code/branches/libraries/src/orxonox/overlays/debug/DebugFPSText.h
===================================================================
--- code/branches/libraries/src/orxonox/overlays/debug/DebugFPSText.h 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/overlays/debug/DebugFPSText.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -31,7 +31,7 @@
#include "overlays/OverlaysPrereqs.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
#include "overlays/OverlayText.h"
namespace orxonox
Modified: code/branches/libraries/src/orxonox/overlays/debug/DebugRTRText.h
===================================================================
--- code/branches/libraries/src/orxonox/overlays/debug/DebugRTRText.h 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/overlays/debug/DebugRTRText.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -31,7 +31,7 @@
#include "overlays/OverlaysPrereqs.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
#include "overlays/OverlayText.h"
namespace orxonox
Modified: code/branches/libraries/src/orxonox/overlays/hud/GametypeStatus.h
===================================================================
--- code/branches/libraries/src/orxonox/overlays/hud/GametypeStatus.h 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/overlays/hud/GametypeStatus.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -31,7 +31,7 @@
#include "overlays/OverlaysPrereqs.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
#include "overlays/OverlayText.h"
namespace orxonox
Modified: code/branches/libraries/src/orxonox/overlays/hud/HUDHealthBar.h
===================================================================
--- code/branches/libraries/src/orxonox/overlays/hud/HUDHealthBar.h 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/overlays/hud/HUDHealthBar.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -32,7 +32,7 @@
#include "overlays/OverlaysPrereqs.h"
#include "util/Math.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
#include "overlays/OverlayText.h"
#include "HUDBar.h"
Modified: code/branches/libraries/src/orxonox/overlays/hud/HUDNavigation.h
===================================================================
--- code/branches/libraries/src/orxonox/overlays/hud/HUDNavigation.h 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/overlays/hud/HUDNavigation.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -32,7 +32,7 @@
#include "overlays/OverlaysPrereqs.h"
#include "util/OgreForwardRefs.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
#include "overlays/OrxonoxOverlay.h"
namespace orxonox
Modified: code/branches/libraries/src/orxonox/overlays/hud/HUDSpeedBar.h
===================================================================
--- code/branches/libraries/src/orxonox/overlays/hud/HUDSpeedBar.h 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/overlays/hud/HUDSpeedBar.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -32,7 +32,7 @@
#include "overlays/OverlaysPrereqs.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
#include "HUDBar.h"
namespace orxonox
Modified: code/branches/libraries/src/orxonox/overlays/hud/HUDTimer.h
===================================================================
--- code/branches/libraries/src/orxonox/overlays/hud/HUDTimer.h 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/overlays/hud/HUDTimer.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -31,7 +31,7 @@
#include "overlays/OverlaysPrereqs.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
#include "overlays/OverlayText.h"
namespace orxonox
Modified: code/branches/libraries/src/orxonox/overlays/hud/PongScore.h
===================================================================
--- code/branches/libraries/src/orxonox/overlays/hud/PongScore.h 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/overlays/hud/PongScore.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -31,7 +31,7 @@
#include "overlays/OverlaysPrereqs.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
#include "overlays/OverlayText.h"
namespace orxonox
Modified: code/branches/libraries/src/orxonox/overlays/hud/TeamBaseMatchScore.h
===================================================================
--- code/branches/libraries/src/orxonox/overlays/hud/TeamBaseMatchScore.h 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/overlays/hud/TeamBaseMatchScore.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -31,7 +31,7 @@
#include "overlays/OverlaysPrereqs.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
#include "overlays/OverlayText.h"
namespace orxonox
Modified: code/branches/libraries/src/orxonox/overlays/notifications/NotificationQueue.h
===================================================================
--- code/branches/libraries/src/orxonox/overlays/notifications/NotificationQueue.h 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/overlays/notifications/NotificationQueue.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -42,7 +42,7 @@
#include <string>
#include "util/Math.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
#include "overlays/OverlayGroup.h"
#include "interfaces/NotificationListener.h"
Modified: code/branches/libraries/src/orxonox/overlays/stats/Scoreboard.h
===================================================================
--- code/branches/libraries/src/orxonox/overlays/stats/Scoreboard.h 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/overlays/stats/Scoreboard.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -32,7 +32,7 @@
#include <string>
#include <vector>
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
#include "overlays/OrxonoxOverlay.h"
namespace orxonox
Modified: code/branches/libraries/src/orxonox/overlays/stats/Stats.h
===================================================================
--- code/branches/libraries/src/orxonox/overlays/stats/Stats.h 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/overlays/stats/Stats.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -32,7 +32,7 @@
#include "overlays/OverlaysPrereqs.h"
#include "util/OgreForwardRefs.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
#include "overlays/OrxonoxOverlay.h"
namespace orxonox
Modified: code/branches/libraries/src/orxonox/sound/SoundManager.h
===================================================================
--- code/branches/libraries/src/orxonox/sound/SoundManager.h 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/sound/SoundManager.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -32,7 +32,7 @@
#include <cassert>
#include <list>
#include "util/Singleton.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
namespace orxonox
{
Modified: code/branches/libraries/src/orxonox/tools/CMakeLists.txt
===================================================================
--- code/branches/libraries/src/orxonox/tools/CMakeLists.txt 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/tools/CMakeLists.txt 2009-08-11 23:32:30 UTC (rev 5633)
@@ -1,4 +1,4 @@
-ADD_SOURCE_FILES(ORXONOX_SRC_FILES
+ADD_SOURCE_FILES(TOOLS_SRC_FILES
BillboardSet.cc
DynamicLines.cc
DynamicRenderable.cc
@@ -8,3 +8,13 @@
TextureGenerator.cc
Timer.cc
)
+ADD_SUBDIRECTORY(interfaces)
+
+ORXONOX_ADD_LIBRARY(tools
+# FIND_HEADER_FILES
+ DEFINE_SYMBOL
+ "TOOLS_SHARED_BUILD"
+ LINK_LIBRARIES
+ core
+ SOURCE_FILES ${TOOLS_SRC_FILES}
+)
Modified: code/branches/libraries/src/orxonox/tools/ParticleInterface.h
===================================================================
--- code/branches/libraries/src/orxonox/tools/ParticleInterface.h 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/tools/ParticleInterface.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -32,7 +32,7 @@
#include "OrxonoxPrereqs.h"
#include "util/OgreForwardRefs.h"
-#include "interfaces/TimeFactorListener.h"
+#include "tools/interfaces/TimeFactorListener.h"
#define getAllEmitters() \
storeThisAsCurrentParticleInterface(); \
Modified: code/branches/libraries/src/orxonox/tools/Shader.h
===================================================================
--- code/branches/libraries/src/orxonox/tools/Shader.h 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/tools/Shader.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -36,7 +36,7 @@
#include <vector>
#include "util/OgreForwardRefs.h"
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
namespace orxonox
{
Modified: code/branches/libraries/src/orxonox/tools/Timer.h
===================================================================
--- code/branches/libraries/src/orxonox/tools/Timer.h 2009-08-11 23:07:31 UTC (rev 5632)
+++ code/branches/libraries/src/orxonox/tools/Timer.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -64,7 +64,7 @@
#include "core/Executor.h"
#include "core/OrxonoxClass.h"
-#include "interfaces/TimeFactorListener.h"
+#include "tools/interfaces/TimeFactorListener.h"
namespace orxonox
{
Added: code/branches/libraries/src/orxonox/tools/interfaces/CMakeLists.txt
===================================================================
--- code/branches/libraries/src/orxonox/tools/interfaces/CMakeLists.txt (rev 0)
+++ code/branches/libraries/src/orxonox/tools/interfaces/CMakeLists.txt 2009-08-11 23:32:30 UTC (rev 5633)
@@ -0,0 +1,3 @@
+ADD_SOURCE_FILES(TOOLS_SRC_FILES
+ ToolsInterfaceCompilation.cc
+)
Property changes on: code/branches/libraries/src/orxonox/tools/interfaces/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
+ native
Copied: code/branches/libraries/src/orxonox/tools/interfaces/Tickable.h (from rev 5628, code/branches/libraries/src/orxonox/interfaces/Tickable.h)
===================================================================
--- code/branches/libraries/src/orxonox/tools/interfaces/Tickable.h (rev 0)
+++ code/branches/libraries/src/orxonox/tools/interfaces/Tickable.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -0,0 +1,68 @@
+/*
+ * 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:
+ * Fabian 'x3n' Landau
+ * Co-authors:
+ * ...
+ *
+ */
+
+/*!
+ @file
+ @brief Declaration of the Tickable interface.
+
+ The Tickable interface provides a tick(dt) function, that gets called every frame.
+ float dt is the time since the last frame in seconds.
+
+ Attention:
+ Classes derived from a Tickable that want to have a tick(dt) function on their part, MUST call the
+ parent::tick(dt) function explicitly in their implementation of tick(dt) because it's a virtual function.
+*/
+
+#ifndef _Tickable_H__
+#define _Tickable_H__
+
+#include "OrxonoxPrereqs.h"
+
+#include "core/OrxonoxClass.h"
+#include "core/Super.h"
+
+namespace orxonox
+{
+ //! The Tickable interface provides a tick(dt) function, that gets called every frame.
+ class _OrxonoxExport Tickable : virtual public OrxonoxClass
+ {
+ public:
+ /**
+ @brief Gets called every frame.
+ @param dt The time since the last frame in seconds
+ */
+ virtual void tick(float dt) { }
+
+ protected:
+ Tickable();
+ };
+
+ SUPER_FUNCTION(1, Tickable, tick, true);
+}
+
+#endif /* _Tickable_H__ */
Copied: code/branches/libraries/src/orxonox/tools/interfaces/TimeFactorListener.h (from rev 5628, code/branches/libraries/src/orxonox/interfaces/TimeFactorListener.h)
===================================================================
--- code/branches/libraries/src/orxonox/tools/interfaces/TimeFactorListener.h (rev 0)
+++ code/branches/libraries/src/orxonox/tools/interfaces/TimeFactorListener.h 2009-08-11 23:32:30 UTC (rev 5633)
@@ -0,0 +1,55 @@
+/*
+ * 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 _TimeFactorListener_H__
+#define _TimeFactorListener_H__
+
+#include "OrxonoxPrereqs.h"
+#include "core/OrxonoxClass.h"
+
+namespace orxonox
+{
+ class _OrxonoxExport TimeFactorListener : virtual public OrxonoxClass
+ {
+ friend class GSRoot;
+
+ public:
+ TimeFactorListener();
+ virtual ~TimeFactorListener() {}
+
+ protected:
+ virtual void changedTimeFactor(float factor_new, float factor_old) {}
+ inline float getTimeFactor() const
+ { return TimeFactorListener::timefactor_s; }
+
+ private:
+ static float timefactor_s;
+ };
+}
+
+#endif /* _TimeFactorListener_H__ */
Copied: code/branches/libraries/src/orxonox/tools/interfaces/ToolsInterfaceCompilation.cc (from rev 5628, code/branches/libraries/src/orxonox/interfaces/InterfaceCompilation.cc)
===================================================================
--- code/branches/libraries/src/orxonox/tools/interfaces/ToolsInterfaceCompilation.cc (rev 0)
+++ code/branches/libraries/src/orxonox/tools/interfaces/ToolsInterfaceCompilation.cc 2009-08-11 23:32:30 UTC (rev 5633)
@@ -0,0 +1,62 @@
+/*
+ * 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:
+ * ...
+ *
+ */
+
+/**
+ at file
+ at brief
+ Compiles all the interfaces in the tools library with mostly just a constructor.
+*/
+
+#include "Tickable.h"
+#include "TimeFactorListener.h"
+
+#include "core/CoreIncludes.h"
+
+namespace orxonox
+{
+ //----------------------------
+ // TimeFactorListener
+ //----------------------------
+ float TimeFactorListener::timefactor_s = 1.0f;
+
+ TimeFactorListener::TimeFactorListener()
+ {
+ RegisterRootObject(TimeFactorListener);
+ }
+
+ //----------------------------
+ // Tickable
+ //----------------------------
+ /**
+ @brief Constructor: Registers the object in the Tickable-list
+ */
+ Tickable::Tickable()
+ {
+ RegisterRootObject(Tickable);
+ }
+}
More information about the Orxonox-commit
mailing list