[Orxonox-commit 645] r3177 - in branches/pch/src/orxonox: . gamestates interfaces objects objects/controllers objects/gametypes objects/infos objects/items objects/pickup objects/weaponsystem/projectiles objects/worldentities objects/worldentities/pawns objects/worldentities/triggers overlays overlays/console overlays/debug overlays/hud overlays/map overlays/notifications overlays/stats sound tools
rgrieder at orxonox.net
rgrieder at orxonox.net
Mon Jun 15 11:52:14 CEST 2009
Author: rgrieder
Date: 2009-06-15 11:52:13 +0200 (Mon, 15 Jun 2009)
New Revision: 3177
Added:
branches/pch/src/orxonox/interfaces/
branches/pch/src/orxonox/interfaces/CMakeLists.txt
branches/pch/src/orxonox/interfaces/GametypeMessageListener.h
branches/pch/src/orxonox/interfaces/InterfaceCompilation.cc
branches/pch/src/orxonox/interfaces/PawnListener.h
branches/pch/src/orxonox/interfaces/RadarListener.h
branches/pch/src/orxonox/interfaces/RadarViewable.cc
branches/pch/src/orxonox/interfaces/RadarViewable.h
branches/pch/src/orxonox/interfaces/Teamcolourable.h
branches/pch/src/orxonox/interfaces/Tickable.h
branches/pch/src/orxonox/interfaces/TimeFactorListener.h
branches/pch/src/orxonox/interfaces/WindowEventListener.h
Removed:
branches/pch/src/orxonox/objects/GametypeMessageListener.cc
branches/pch/src/orxonox/objects/GametypeMessageListener.h
branches/pch/src/orxonox/objects/RadarListener.cc
branches/pch/src/orxonox/objects/RadarListener.h
branches/pch/src/orxonox/objects/RadarViewable.cc
branches/pch/src/orxonox/objects/RadarViewable.h
branches/pch/src/orxonox/objects/Teamcolourable.cc
branches/pch/src/orxonox/objects/Teamcolourable.h
branches/pch/src/orxonox/objects/Tickable.cc
branches/pch/src/orxonox/objects/Tickable.h
branches/pch/src/orxonox/tools/PawnListener.cc
branches/pch/src/orxonox/tools/PawnListener.h
branches/pch/src/orxonox/tools/TimeFactorListener.cc
branches/pch/src/orxonox/tools/TimeFactorListener.h
branches/pch/src/orxonox/tools/WindowEventListener.cc
branches/pch/src/orxonox/tools/WindowEventListener.h
Modified:
branches/pch/src/orxonox/CMakeLists.txt
branches/pch/src/orxonox/GraphicsManager.cc
branches/pch/src/orxonox/PawnManager.h
branches/pch/src/orxonox/gamestates/GSGraphics.h
branches/pch/src/orxonox/gamestates/GSLevel.cc
branches/pch/src/orxonox/gamestates/GSRoot.cc
branches/pch/src/orxonox/objects/CMakeLists.txt
branches/pch/src/orxonox/objects/Radar.cc
branches/pch/src/orxonox/objects/Radar.h
branches/pch/src/orxonox/objects/Scene.h
branches/pch/src/orxonox/objects/Test.h
branches/pch/src/orxonox/objects/controllers/AIController.h
branches/pch/src/orxonox/objects/controllers/ArtificialController.h
branches/pch/src/orxonox/objects/controllers/PongAI.h
branches/pch/src/orxonox/objects/controllers/WaypointController.h
branches/pch/src/orxonox/objects/gametypes/Gametype.h
branches/pch/src/orxonox/objects/gametypes/TeamDeathmatch.cc
branches/pch/src/orxonox/objects/gametypes/UnderAttack.h
branches/pch/src/orxonox/objects/infos/GametypeInfo.cc
branches/pch/src/orxonox/objects/items/Engine.h
branches/pch/src/orxonox/objects/pickup/DroppedItem.h
branches/pch/src/orxonox/objects/pickup/PickupSpawner.h
branches/pch/src/orxonox/objects/weaponsystem/projectiles/Projectile.h
branches/pch/src/orxonox/objects/worldentities/Backlight.h
branches/pch/src/orxonox/objects/worldentities/Billboard.h
branches/pch/src/orxonox/objects/worldentities/BlinkingBillboard.h
branches/pch/src/orxonox/objects/worldentities/Camera.h
branches/pch/src/orxonox/objects/worldentities/FadingBillboard.h
branches/pch/src/orxonox/objects/worldentities/ForceField.h
branches/pch/src/orxonox/objects/worldentities/Light.h
branches/pch/src/orxonox/objects/worldentities/MobileEntity.h
branches/pch/src/orxonox/objects/worldentities/Planet.h
branches/pch/src/orxonox/objects/worldentities/pawns/Pawn.cc
branches/pch/src/orxonox/objects/worldentities/pawns/Pawn.h
branches/pch/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc
branches/pch/src/orxonox/objects/worldentities/triggers/CheckPoint.h
branches/pch/src/orxonox/objects/worldentities/triggers/Trigger.h
branches/pch/src/orxonox/overlays/FadeoutText.h
branches/pch/src/orxonox/overlays/OrxonoxOverlay.h
branches/pch/src/orxonox/overlays/console/InGameConsole.h
branches/pch/src/orxonox/overlays/debug/DebugFPSText.h
branches/pch/src/orxonox/overlays/debug/DebugRTRText.h
branches/pch/src/orxonox/overlays/hud/AnnounceMessage.h
branches/pch/src/orxonox/overlays/hud/DeathMessage.h
branches/pch/src/orxonox/overlays/hud/GametypeStatus.h
branches/pch/src/orxonox/overlays/hud/HUDHealthBar.h
branches/pch/src/orxonox/overlays/hud/HUDNavigation.h
branches/pch/src/orxonox/overlays/hud/HUDRadar.h
branches/pch/src/orxonox/overlays/hud/HUDSpeedBar.h
branches/pch/src/orxonox/overlays/hud/HUDTimer.h
branches/pch/src/orxonox/overlays/hud/KillMessage.h
branches/pch/src/orxonox/overlays/hud/PongScore.h
branches/pch/src/orxonox/overlays/hud/TeamBaseMatchScore.h
branches/pch/src/orxonox/overlays/map/Map.cc
branches/pch/src/orxonox/overlays/map/Map.h
branches/pch/src/orxonox/overlays/notifications/NotificationQueue.h
branches/pch/src/orxonox/overlays/stats/Scoreboard.h
branches/pch/src/orxonox/overlays/stats/Stats.h
branches/pch/src/orxonox/sound/SoundManager.h
branches/pch/src/orxonox/tools/CMakeLists.txt
branches/pch/src/orxonox/tools/ParticleInterface.h
branches/pch/src/orxonox/tools/Shader.h
branches/pch/src/orxonox/tools/Timer.h
Log:
Moved interface classes to orxonox/interfaces.
This resolves certain identity problems, for instance Tickable technically isn't an object.
Furthermore this saves the compilation of 6 files by using InterfaceCompilation.cc ;)
Modified: branches/pch/src/orxonox/CMakeLists.txt
===================================================================
--- branches/pch/src/orxonox/CMakeLists.txt 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/CMakeLists.txt 2009-06-15 09:52:13 UTC (rev 3177)
@@ -27,6 +27,7 @@
)
ADD_SUBDIRECTORY(gamestates)
ADD_SUBDIRECTORY(gui)
+ADD_SUBDIRECTORY(interfaces)
ADD_SUBDIRECTORY(objects)
ADD_SUBDIRECTORY(overlays)
ADD_SUBDIRECTORY(sound)
Modified: branches/pch/src/orxonox/GraphicsManager.cc
===================================================================
--- branches/pch/src/orxonox/GraphicsManager.cc 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/GraphicsManager.cc 2009-06-15 09:52:13 UTC (rev 3177)
@@ -62,8 +62,8 @@
#include "core/Core.h"
#include "core/Game.h"
#include "core/GameMode.h"
-#include "tools/WindowEventListener.h"
#include "tools/ParticleInterface.h"
+#include "interfaces/WindowEventListener.h"
// HACK!
#include "overlays/map/Map.h"
Modified: branches/pch/src/orxonox/PawnManager.h
===================================================================
--- branches/pch/src/orxonox/PawnManager.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/PawnManager.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -30,7 +30,7 @@
#define _PawnManager_H__
#include "OrxonoxPrereqs.h"
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/gamestates/GSGraphics.h
===================================================================
--- branches/pch/src/orxonox/gamestates/GSGraphics.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/gamestates/GSGraphics.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -38,7 +38,7 @@
#include "OrxonoxPrereqs.h"
#include "core/GameState.h"
-#include "tools/WindowEventListener.h"
+#include "interfaces/WindowEventListener.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/gamestates/GSLevel.cc
===================================================================
--- branches/pch/src/orxonox/gamestates/GSLevel.cc 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/gamestates/GSLevel.cc 2009-06-15 09:52:13 UTC (rev 3177)
@@ -43,8 +43,8 @@
#include "core/ObjectList.h"
#include "core/XMLFile.h"
+#include "interfaces/Tickable.h"
#include "objects/Radar.h"
-#include "objects/Tickable.h"
#include "objects/quest/QuestManager.h"
#include "overlays/notifications/NotificationManager.h"
#include "gui/GUIManager.h"
Modified: branches/pch/src/orxonox/gamestates/GSRoot.cc
===================================================================
--- branches/pch/src/orxonox/gamestates/GSRoot.cc 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/gamestates/GSRoot.cc 2009-06-15 09:52:13 UTC (rev 3177)
@@ -33,9 +33,9 @@
#include "core/ConsoleCommand.h"
#include "core/Game.h"
#include "core/GameMode.h"
-#include "tools/TimeFactorListener.h"
#include "tools/Timer.h"
-#include "objects/Tickable.h"
+#include "interfaces/TimeFactorListener.h"
+#include "interfaces/Tickable.h"
namespace orxonox
{
Added: branches/pch/src/orxonox/interfaces/CMakeLists.txt
===================================================================
--- branches/pch/src/orxonox/interfaces/CMakeLists.txt (rev 0)
+++ branches/pch/src/orxonox/interfaces/CMakeLists.txt 2009-06-15 09:52:13 UTC (rev 3177)
@@ -0,0 +1,4 @@
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
+ InterfaceCompilation.cc
+ RadarViewable.cc
+)
Property changes on: branches/pch/src/orxonox/interfaces/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
+ native
Copied: branches/pch/src/orxonox/interfaces/GametypeMessageListener.h (from rev 3174, branches/pch/src/orxonox/objects/GametypeMessageListener.h)
===================================================================
--- branches/pch/src/orxonox/interfaces/GametypeMessageListener.h (rev 0)
+++ branches/pch/src/orxonox/interfaces/GametypeMessageListener.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -0,0 +1,49 @@
+/*
+ * 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:
+ * ...
+ *
+ */
+
+#ifndef _GametypeMessageListener_H__
+#define _GametypeMessageListener_H__
+
+#include "OrxonoxPrereqs.h"
+#include "core/OrxonoxClass.h"
+
+namespace orxonox
+{
+ class _OrxonoxExport GametypeMessageListener : virtual public OrxonoxClass
+ {
+ public:
+ GametypeMessageListener();
+ virtual ~GametypeMessageListener() {}
+
+ virtual void announcemessage(const GametypeInfo* gtinfo, const std::string& message) {}
+ virtual void killmessage(const GametypeInfo* gtinfo, const std::string& message) {}
+ virtual void deathmessage(const GametypeInfo* gtinfo, const std::string& message) {}
+ };
+}
+
+#endif /* _GametypeMessageListener_H__ */
Copied: branches/pch/src/orxonox/interfaces/InterfaceCompilation.cc (from rev 3167, branches/pch/src/orxonox/tools/WindowEventListener.cc)
===================================================================
--- branches/pch/src/orxonox/interfaces/InterfaceCompilation.cc (rev 0)
+++ branches/pch/src/orxonox/interfaces/InterfaceCompilation.cc 2009-06-15 09:52:13 UTC (rev 3177)
@@ -0,0 +1,113 @@
+/*
+ * 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 (except RadarViewable) with mostly just a constructor.
+*/
+
+#include "GametypeMessageListener.h"
+#include "PawnListener.h"
+#include "RadarListener.h"
+#include "Teamcolourable.h"
+#include "Tickable.h"
+#include "TimeFactorListener.h"
+#include "WindowEventListener.h"
+
+#include "core/CoreIncludes.h"
+
+namespace orxonox
+{
+ //----------------------------
+ // GametypeMessageListener
+ //----------------------------
+ GametypeMessageListener::GametypeMessageListener()
+ {
+ RegisterRootObject(GametypeMessageListener);
+ }
+
+ //----------------------------
+ // PawnListener
+ //----------------------------
+ /**
+ @brief Constructor for the PawnListener.
+ */
+ PawnListener::PawnListener()
+ {
+ RegisterRootObject(PawnListener);
+ }
+
+ //----------------------------
+ // RadarListener
+ //----------------------------
+ RadarListener::RadarListener()
+ {
+ RegisterRootObject(RadarListener);
+ }
+
+ //----------------------------
+ // Teamcolourable
+ //----------------------------
+ Teamcolourable::Teamcolourable()
+ {
+ RegisterRootObject(Teamcolourable);
+ }
+
+ //----------------------------
+ // 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);
+ }
+
+ //----------------------------
+ // WindowEventListener
+ //----------------------------
+ /**
+ @brief Constructor for the WindowEventListener.
+ */
+ WindowEventListener::WindowEventListener()
+ {
+ RegisterRootObject(WindowEventListener);
+ }
+}
Copied: branches/pch/src/orxonox/interfaces/PawnListener.h (from rev 3176, branches/pch/src/orxonox/tools/PawnListener.h)
===================================================================
--- branches/pch/src/orxonox/interfaces/PawnListener.h (rev 0)
+++ branches/pch/src/orxonox/interfaces/PawnListener.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -0,0 +1,47 @@
+/*
+ * 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:
+ * ...
+ *
+ */
+
+#ifndef _PawnListener_H__
+#define _PawnListener_H__
+
+#include "OrxonoxPrereqs.h"
+#include "core/OrxonoxClass.h"
+
+namespace orxonox
+{
+ class _OrxonoxExport PawnListener : virtual public OrxonoxClass
+ {
+ public:
+ PawnListener();
+ virtual ~PawnListener() {}
+
+ virtual void destroyedPawn(Pawn* pawn) = 0;
+ };
+}
+
+#endif /* _PawnListener_H__ */
Copied: branches/pch/src/orxonox/interfaces/RadarListener.h (from rev 3167, branches/pch/src/orxonox/objects/RadarListener.h)
===================================================================
--- branches/pch/src/orxonox/interfaces/RadarListener.h (rev 0)
+++ branches/pch/src/orxonox/interfaces/RadarListener.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -0,0 +1,49 @@
+/*
+ * 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 _RadarListener_H__
+#define _RadarListener_H__
+
+#include "OrxonoxPrereqs.h"
+#include "core/OrxonoxClass.h"
+
+namespace orxonox
+{
+ class _OrxonoxExport RadarListener : virtual public OrxonoxClass
+ {
+ public:
+ RadarListener();
+ virtual ~RadarListener() { }
+
+ virtual void displayObject(RadarViewable* viewable, bool bIsMarked) = 0;
+ virtual float getRadarSensitivity() const = 0;
+ virtual void radarTick(float dt) = 0;
+ };
+}
+
+#endif /* _RadarListener_H__ */
Copied: branches/pch/src/orxonox/interfaces/RadarViewable.cc (from rev 3174, branches/pch/src/orxonox/objects/RadarViewable.cc)
===================================================================
--- branches/pch/src/orxonox/interfaces/RadarViewable.cc (rev 0)
+++ branches/pch/src/orxonox/interfaces/RadarViewable.cc 2009-06-15 09:52:13 UTC (rev 3177)
@@ -0,0 +1,161 @@
+/*
+ * 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 "RadarViewable.h"
+
+#include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreEntity.h>
+
+#include "util/Debug.h"
+#include "util/String.h"
+#include "core/CoreIncludes.h"
+#include "tools/DynamicLines.h"
+#include "objects/worldentities/WorldEntity.h"
+#include "objects/Radar.h"
+#include "overlays/map/Map.h"
+
+namespace orxonox
+{
+ /**
+ @brief Constructor.
+ */
+ RadarViewable::RadarViewable()
+ : MapNode_(NULL)
+ , MapEntity_(NULL)
+ , line_(NULL)
+ , LineNode_(NULL)
+ , radarObjectCamouflage_(0.0f)
+ , radarObjectShape_(Dot)
+ , radarObjectDescription_("staticObject")
+ {
+ RegisterRootObject(RadarViewable);
+
+ this->bVisibility_ = true;
+ this->isHumanShip_ = false;
+
+ this->uniqueId_=getUniqueNumberString();
+/*
+ if(Map::getSingletonPtr() && Map::getSingletonPtr()->getMapSceneManagerPtr())
+ {
+ this->addEntity();
+ }
+
+ */
+ }
+
+
+ RadarViewable::~RadarViewable()
+ {
+ if (this->isHumanShip_ && MapNode_)
+ MapNode_->removeAllChildren();
+
+ if (MapNode_)
+ delete MapNode_;
+
+ if (MapEntity_)
+ delete MapEntity_;
+
+ if (line_)
+ delete line_;
+
+ if (LineNode_)
+ delete LineNode_;
+ }
+
+ void RadarViewable::addMapEntity()
+ { //TODO Check shape and add accordantly
+ if( this->MapNode_ && !this->MapEntity_ && Map::getSingletonPtr() && Map::getSingletonPtr()->getMapSceneManagerPtr() )
+ {
+ COUT(0) << "Adding " << this->uniqueId_ << " to Map.\n";
+ this->MapEntity_ = Map::getSingletonPtr()->getMapSceneManagerPtr()->createEntity( this->uniqueId_, "drone.mesh");
+ /*this->line_ = Map::getSingletonPtr()->getMapSceneManagerPtr()->createManualObject(this->uniqueId_ + "_l");
+ this->line_->begin("Map/line_", Ogre::RenderOperation::OT_LINE_STRIP);
+ //line_->position(0, -it->getRVWorldPosition().y, 0);
+ //this->line_->position(0, -20, 0);
+ this->line_->position(0, 0, -10); //Front Arrow
+ this->line_->position(0, 0, 0);
+
+ this->line_->end(); */
+ this->line_ = new Ogre::DynamicLines(Ogre::RenderOperation::OT_LINE_LIST);
+ this->line_->addPoint( Vector3(0,0,0) );
+ this->line_->addPoint( Vector3(0,0,0) );
+
+ this->MapNode_->attachObject( this->MapEntity_ );
+
+ this->LineNode_ = this->MapNode_->createChildSceneNode();
+ this->LineNode_->attachObject( this->line_ );
+ }
+ else
+ {
+ COUT(0) << "Unable to load " << this->uniqueId_ << " to Map.\n";
+ }
+ }
+
+ void RadarViewable::updateMapPosition()
+ {
+ if( this->MapNode_ )
+ {
+ this->MapNode_->setPosition( this->getRVWorldPosition() );
+ this->MapNode_->translate( this->getRVOrientedVelocity(), (Ogre::Node::TransformSpace)3 );
+ this->MapNode_->setOrientation( this->getWorldEntity()->getOrientation() );
+//Vector3 v = this->getRVWorldPosition();
+ //this->line_->setPoint(1, Vector3(0,v.y,0) );
+ this->line_->setPoint(1, Vector3( 0, (int) -Map::getSingletonPtr()->movablePlane_->getDistance( this->getRVWorldPosition() ) ,0 ));
+ this->line_->update();
+ if( Map::getSingletonPtr()->playerShipNode_ )
+ this->LineNode_->setDirection( Map::getSingletonPtr()->playerShipNode_->getLocalAxes().GetColumn(1) ,Ogre::Node::TS_WORLD,Vector3::UNIT_Y);
+ }
+ }
+
+ void RadarViewable::setRadarObjectDescription(const std::string& str)
+ {
+ Radar* radar = Radar::getInstancePtr();
+ if (radar)
+ this->radarObjectShape_ = radar->addObjectDescription(str);
+ else
+ {
+ CCOUT(2) << "Attempting to access the radar, but the radar is non existent." << std::endl;
+ }
+ this->radarObjectDescription_ = str;
+ }
+
+ const Vector3& RadarViewable::getRVWorldPosition() const
+ {
+ const WorldEntity* object = this->getWorldEntity();
+ validate(object);
+ return object->getWorldPosition();
+ }
+
+ Vector3 RadarViewable::getRVOrientedVelocity() const
+ {
+ const WorldEntity* object = this->getWorldEntity();
+ validate(object);
+ return object->getWorldOrientation() * object->getVelocity();
+ }
+}
Copied: branches/pch/src/orxonox/interfaces/RadarViewable.h (from rev 3174, branches/pch/src/orxonox/objects/RadarViewable.h)
===================================================================
--- branches/pch/src/orxonox/interfaces/RadarViewable.h (rev 0)
+++ branches/pch/src/orxonox/interfaces/RadarViewable.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -0,0 +1,139 @@
+/*
+ * 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 _RadarViewable_H__
+#define _RadarViewable_H__
+
+#include "OrxonoxPrereqs.h"
+
+#include <string>
+#include <cassert>
+#include <OgrePrerequisites.h>
+
+#include "util/Math.h"
+#include "util/Debug.h"
+#include "core/OrxonoxClass.h"
+
+namespace orxonox
+{
+ /**
+ @brief Interface for receiving window events.
+ */
+ class _OrxonoxExport RadarViewable : virtual public OrxonoxClass
+ {
+ public:
+ enum Shape
+ {
+ Square,
+ Dot,
+ Triangle
+ };
+
+
+ public:
+ RadarViewable();
+ virtual ~RadarViewable();
+
+ inline void setRadarObjectCamouflage(float camouflage)
+ { this->radarObjectCamouflage_ = camouflage; }
+ inline float getRadarObjectCamouflage() const
+ { return this->radarObjectCamouflage_; }
+
+ inline void setRadarObjectColour(const ColourValue& colour)
+ { this->radarObjectColour_ = colour; }
+ inline const ColourValue& getRadarObjectColour() const
+ { return this->radarObjectColour_; }
+
+ void setRadarObjectDescription(const std::string& str);
+ inline const std::string& getRadarObjectDescription() const
+ { return this->radarObjectDescription_; }
+
+ inline void setRadarVisibility(bool b)
+ { this->bVisibility_ = b; }
+ inline bool getRadarVisibility() const
+ { return this->bVisibility_; }
+
+ virtual const WorldEntity* getWorldEntity() const = 0;
+
+ const Vector3& getRVWorldPosition() const;
+ Vector3 getRVOrientedVelocity() const;
+
+ inline void setRadarObjectShape(Shape shape)
+ { this->radarObjectShape_ = shape; }
+ inline Shape getRadarObjectShape() const
+ { return this->radarObjectShape_; }
+
+/*
+ inline void setMapNode(Ogre::SceneNode * node)
+ { this->MapNode_ = node; }
+ inline Ogre::SceneNode * getMapNode() const
+ { return this->MapNode_; }
+ inline void setMapEntity(Ogre::Entity * ent)
+ { this->MapEntity_ = ent; }
+ inline Ogre::Entity * getMapEntity() const
+ { return this->MapEntity_; }
+*/
+ //Used for Map
+ Ogre::SceneNode * MapNode_;
+ Ogre::Entity * MapEntity_;
+ Ogre::DynamicLines* line_;
+ Ogre::SceneNode * LineNode_;
+ void addMapEntity();
+ void updateMapPosition();
+ bool isHumanShip_;
+ inline const std::string& getUniqueId()
+ {
+ return this->uniqueId_;
+ }
+ //friend class Map;
+
+ private:
+ void validate(const WorldEntity* object) const
+ {
+ if (!object)
+ {
+ COUT(1) << "Assertation: Every RadarViewable has to be assigned a WorldEntity pointer!" << std::endl;
+ assert(0);
+ }
+ }
+
+ bool bVisibility_;
+ //Map
+ std::string uniqueId_;
+
+
+ //Radar
+ float radarObjectCamouflage_;
+ Shape radarObjectShape_;
+ std::string radarObjectDescription_;
+ ColourValue radarObjectColour_;
+
+ };
+}
+
+#endif /* _RadarViewable_H__ */
Copied: branches/pch/src/orxonox/interfaces/Teamcolourable.h (from rev 3174, branches/pch/src/orxonox/objects/Teamcolourable.h)
===================================================================
--- branches/pch/src/orxonox/interfaces/Teamcolourable.h (rev 0)
+++ branches/pch/src/orxonox/interfaces/Teamcolourable.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -0,0 +1,49 @@
+/*
+ * 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:
+ * ...
+ *
+ */
+
+#ifndef _Teamcolourable_H__
+#define _Teamcolourable_H__
+
+#include "OrxonoxPrereqs.h"
+
+#include "util/UtilPrereqs.h"
+#include "core/OrxonoxClass.h"
+
+namespace orxonox
+{
+ class _OrxonoxExport Teamcolourable : virtual public OrxonoxClass
+ {
+ public:
+ virtual void setTeamColour(const ColourValue& colour) = 0;
+
+ protected:
+ Teamcolourable();
+ };
+}
+
+#endif /* _Teamcolourable_H__ */
Copied: branches/pch/src/orxonox/interfaces/Tickable.h (from rev 3167, branches/pch/src/orxonox/objects/Tickable.h)
===================================================================
--- branches/pch/src/orxonox/interfaces/Tickable.h (rev 0)
+++ branches/pch/src/orxonox/interfaces/Tickable.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -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) = 0;
+
+ protected:
+ Tickable();
+ };
+
+ SUPER_FUNCTION(1, Tickable, tick, true);
+}
+
+#endif /* _Tickable_H__ */
Copied: branches/pch/src/orxonox/interfaces/TimeFactorListener.h (from rev 3167, branches/pch/src/orxonox/tools/TimeFactorListener.h)
===================================================================
--- branches/pch/src/orxonox/interfaces/TimeFactorListener.h (rev 0)
+++ branches/pch/src/orxonox/interfaces/TimeFactorListener.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -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: branches/pch/src/orxonox/interfaces/WindowEventListener.h (from rev 3167, branches/pch/src/orxonox/tools/WindowEventListener.h)
===================================================================
--- branches/pch/src/orxonox/interfaces/WindowEventListener.h (rev 0)
+++ branches/pch/src/orxonox/interfaces/WindowEventListener.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -0,0 +1,57 @@
+/*
+ * 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 _WindowEventListener_H__
+#define _WindowEventListener_H__
+
+#include "OrxonoxPrereqs.h"
+#include "core/OrxonoxClass.h"
+
+namespace orxonox
+{
+ /**
+ @brief Interface for receiving window events.
+ */
+ class _OrxonoxExport WindowEventListener : virtual public OrxonoxClass
+ {
+ public:
+ WindowEventListener();
+ virtual ~WindowEventListener() { }
+
+ /** Window has moved position */
+ virtual void windowMoved() { }
+
+ /** Window has resized */
+ virtual void windowResized(unsigned int newWidth, unsigned int newHeight) { }
+
+ /** Window has lost/gained focus */
+ virtual void windowFocusChanged() { }
+ };
+}
+
+#endif /* _WindowEventListener_H__ */
Modified: branches/pch/src/orxonox/objects/CMakeLists.txt
===================================================================
--- branches/pch/src/orxonox/objects/CMakeLists.txt 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/CMakeLists.txt 2009-06-15 09:52:13 UTC (rev 3177)
@@ -2,14 +2,9 @@
EventListener.cc
EventDispatcher.cc
EventTarget.cc
- GametypeMessageListener.cc
GlobalShader.cc
Level.cc
Radar.cc
- RadarListener.cc
- RadarViewable.cc
- Teamcolourable.cc
- Tickable.cc
Scene.cc
Script.cc
)
Deleted: branches/pch/src/orxonox/objects/GametypeMessageListener.cc
===================================================================
--- branches/pch/src/orxonox/objects/GametypeMessageListener.cc 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/GametypeMessageListener.cc 2009-06-15 09:52:13 UTC (rev 3177)
@@ -1,40 +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:
- * ...
- *
- */
-
-#include "GametypeMessageListener.h"
-#include "core/CoreIncludes.h"
-
-namespace orxonox
-{
- GametypeMessageListener::GametypeMessageListener()
- {
- RegisterRootObject(GametypeMessageListener);
- }
-}
-
-
Deleted: branches/pch/src/orxonox/objects/GametypeMessageListener.h
===================================================================
--- branches/pch/src/orxonox/objects/GametypeMessageListener.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/GametypeMessageListener.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -1,49 +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:
- * ...
- *
- */
-
-#ifndef _GametypeMessageListener_H__
-#define _GametypeMessageListener_H__
-
-#include "OrxonoxPrereqs.h"
-#include "core/OrxonoxClass.h"
-
-namespace orxonox
-{
- class _OrxonoxExport GametypeMessageListener : virtual public OrxonoxClass
- {
- public:
- GametypeMessageListener();
- virtual ~GametypeMessageListener() {}
-
- virtual void announcemessage(const GametypeInfo* gtinfo, const std::string& message) {}
- virtual void killmessage(const GametypeInfo* gtinfo, const std::string& message) {}
- virtual void deathmessage(const GametypeInfo* gtinfo, const std::string& message) {}
- };
-}
-
-#endif /* _GametypeMessageListener_H__ */
Modified: branches/pch/src/orxonox/objects/Radar.cc
===================================================================
--- branches/pch/src/orxonox/objects/Radar.cc 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/Radar.cc 2009-06-15 09:52:13 UTC (rev 3177)
@@ -38,7 +38,7 @@
//#include "util/Math.h"
#include "core/ConsoleCommand.h"
#include "core/ObjectList.h"
-#include "RadarListener.h"
+#include "interfaces/RadarListener.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/Radar.h
===================================================================
--- branches/pch/src/orxonox/objects/Radar.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/Radar.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -40,8 +40,8 @@
#include <string>
#include "core/ObjectListIterator.h"
-#include "objects/Tickable.h"
-#include "RadarViewable.h"
+#include "interfaces/RadarViewable.h"
+#include "interfaces/Tickable.h"
namespace orxonox
{
Deleted: branches/pch/src/orxonox/objects/RadarListener.cc
===================================================================
--- branches/pch/src/orxonox/objects/RadarListener.cc 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/RadarListener.cc 2009-06-15 09:52:13 UTC (rev 3177)
@@ -1,38 +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 "RadarListener.h"
-#include "core/CoreIncludes.h"
-
-namespace orxonox
-{
- RadarListener::RadarListener()
- {
- RegisterRootObject(RadarListener);
- }
-}
Deleted: branches/pch/src/orxonox/objects/RadarListener.h
===================================================================
--- branches/pch/src/orxonox/objects/RadarListener.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/RadarListener.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -1,49 +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 _RadarListener_H__
-#define _RadarListener_H__
-
-#include "OrxonoxPrereqs.h"
-#include "core/OrxonoxClass.h"
-
-namespace orxonox
-{
- class _OrxonoxExport RadarListener : virtual public OrxonoxClass
- {
- public:
- RadarListener();
- virtual ~RadarListener() { }
-
- virtual void displayObject(RadarViewable* viewable, bool bIsMarked) = 0;
- virtual float getRadarSensitivity() const = 0;
- virtual void radarTick(float dt) = 0;
- };
-}
-
-#endif /* _RadarListener_H__ */
Deleted: branches/pch/src/orxonox/objects/RadarViewable.cc
===================================================================
--- branches/pch/src/orxonox/objects/RadarViewable.cc 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/RadarViewable.cc 2009-06-15 09:52:13 UTC (rev 3177)
@@ -1,161 +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 "RadarViewable.h"
-
-#include <OgreSceneManager.h>
-#include <OgreSceneNode.h>
-#include <OgreEntity.h>
-
-#include "util/Debug.h"
-#include "util/String.h"
-#include "core/CoreIncludes.h"
-#include "tools/DynamicLines.h"
-#include "objects/worldentities/WorldEntity.h"
-#include "objects/Radar.h"
-#include "overlays/map/Map.h"
-
-namespace orxonox
-{
- /**
- @brief Constructor.
- */
- RadarViewable::RadarViewable()
- : MapNode_(NULL)
- , MapEntity_(NULL)
- , line_(NULL)
- , LineNode_(NULL)
- , radarObjectCamouflage_(0.0f)
- , radarObjectShape_(Dot)
- , radarObjectDescription_("staticObject")
- {
- RegisterRootObject(RadarViewable);
-
- this->bVisibility_ = true;
- this->isHumanShip_ = false;
-
- this->uniqueId_=getUniqueNumberString();
-/*
- if(Map::getSingletonPtr() && Map::getSingletonPtr()->getMapSceneManagerPtr())
- {
- this->addEntity();
- }
-
- */
- }
-
-
- RadarViewable::~RadarViewable()
- {
- if (this->isHumanShip_ && MapNode_)
- MapNode_->removeAllChildren();
-
- if (MapNode_)
- delete MapNode_;
-
- if (MapEntity_)
- delete MapEntity_;
-
- if (line_)
- delete line_;
-
- if (LineNode_)
- delete LineNode_;
- }
-
- void RadarViewable::addMapEntity()
- { //TODO Check shape and add accordantly
- if( this->MapNode_ && !this->MapEntity_ && Map::getSingletonPtr() && Map::getSingletonPtr()->getMapSceneManagerPtr() )
- {
- COUT(0) << "Adding " << this->uniqueId_ << " to Map.\n";
- this->MapEntity_ = Map::getSingletonPtr()->getMapSceneManagerPtr()->createEntity( this->uniqueId_, "drone.mesh");
- /*this->line_ = Map::getSingletonPtr()->getMapSceneManagerPtr()->createManualObject(this->uniqueId_ + "_l");
- this->line_->begin("Map/line_", Ogre::RenderOperation::OT_LINE_STRIP);
- //line_->position(0, -it->getRVWorldPosition().y, 0);
- //this->line_->position(0, -20, 0);
- this->line_->position(0, 0, -10); //Front Arrow
- this->line_->position(0, 0, 0);
-
- this->line_->end(); */
- this->line_ = new Ogre::DynamicLines(Ogre::RenderOperation::OT_LINE_LIST);
- this->line_->addPoint( Vector3(0,0,0) );
- this->line_->addPoint( Vector3(0,0,0) );
-
- this->MapNode_->attachObject( this->MapEntity_ );
-
- this->LineNode_ = this->MapNode_->createChildSceneNode();
- this->LineNode_->attachObject( this->line_ );
- }
- else
- {
- COUT(0) << "Unable to load " << this->uniqueId_ << " to Map.\n";
- }
- }
-
- void RadarViewable::updateMapPosition()
- {
- if( this->MapNode_ )
- {
- this->MapNode_->setPosition( this->getRVWorldPosition() );
- this->MapNode_->translate( this->getRVOrientedVelocity(), (Ogre::Node::TransformSpace)3 );
- this->MapNode_->setOrientation( this->getWorldEntity()->getOrientation() );
-//Vector3 v = this->getRVWorldPosition();
- //this->line_->setPoint(1, Vector3(0,v.y,0) );
- this->line_->setPoint(1, Vector3( 0, (int) -Map::getSingletonPtr()->movablePlane_->getDistance( this->getRVWorldPosition() ) ,0 ));
- this->line_->update();
- if( Map::getSingletonPtr()->playerShipNode_ )
- this->LineNode_->setDirection( Map::getSingletonPtr()->playerShipNode_->getLocalAxes().GetColumn(1) ,Ogre::Node::TS_WORLD,Vector3::UNIT_Y);
- }
- }
-
- void RadarViewable::setRadarObjectDescription(const std::string& str)
- {
- Radar* radar = Radar::getInstancePtr();
- if (radar)
- this->radarObjectShape_ = radar->addObjectDescription(str);
- else
- {
- CCOUT(2) << "Attempting to access the radar, but the radar is non existent." << std::endl;
- }
- this->radarObjectDescription_ = str;
- }
-
- const Vector3& RadarViewable::getRVWorldPosition() const
- {
- const WorldEntity* object = this->getWorldEntity();
- validate(object);
- return object->getWorldPosition();
- }
-
- Vector3 RadarViewable::getRVOrientedVelocity() const
- {
- const WorldEntity* object = this->getWorldEntity();
- validate(object);
- return object->getWorldOrientation() * object->getVelocity();
- }
-}
Deleted: branches/pch/src/orxonox/objects/RadarViewable.h
===================================================================
--- branches/pch/src/orxonox/objects/RadarViewable.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/RadarViewable.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -1,139 +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 _RadarViewable_H__
-#define _RadarViewable_H__
-
-#include "OrxonoxPrereqs.h"
-
-#include <string>
-#include <cassert>
-#include <OgrePrerequisites.h>
-
-#include "util/Math.h"
-#include "util/Debug.h"
-#include "core/OrxonoxClass.h"
-
-namespace orxonox
-{
- /**
- @brief Interface for receiving window events.
- */
- class _OrxonoxExport RadarViewable : virtual public OrxonoxClass
- {
- public:
- enum Shape
- {
- Square,
- Dot,
- Triangle
- };
-
-
- public:
- RadarViewable();
- virtual ~RadarViewable();
-
- inline void setRadarObjectCamouflage(float camouflage)
- { this->radarObjectCamouflage_ = camouflage; }
- inline float getRadarObjectCamouflage() const
- { return this->radarObjectCamouflage_; }
-
- inline void setRadarObjectColour(const ColourValue& colour)
- { this->radarObjectColour_ = colour; }
- inline const ColourValue& getRadarObjectColour() const
- { return this->radarObjectColour_; }
-
- void setRadarObjectDescription(const std::string& str);
- inline const std::string& getRadarObjectDescription() const
- { return this->radarObjectDescription_; }
-
- inline void setRadarVisibility(bool b)
- { this->bVisibility_ = b; }
- inline bool getRadarVisibility() const
- { return this->bVisibility_; }
-
- virtual const WorldEntity* getWorldEntity() const = 0;
-
- const Vector3& getRVWorldPosition() const;
- Vector3 getRVOrientedVelocity() const;
-
- inline void setRadarObjectShape(Shape shape)
- { this->radarObjectShape_ = shape; }
- inline Shape getRadarObjectShape() const
- { return this->radarObjectShape_; }
-
-/*
- inline void setMapNode(Ogre::SceneNode * node)
- { this->MapNode_ = node; }
- inline Ogre::SceneNode * getMapNode() const
- { return this->MapNode_; }
- inline void setMapEntity(Ogre::Entity * ent)
- { this->MapEntity_ = ent; }
- inline Ogre::Entity * getMapEntity() const
- { return this->MapEntity_; }
-*/
- //Used for Map
- Ogre::SceneNode * MapNode_;
- Ogre::Entity * MapEntity_;
- Ogre::DynamicLines* line_;
- Ogre::SceneNode * LineNode_;
- void addMapEntity();
- void updateMapPosition();
- bool isHumanShip_;
- inline const std::string& getUniqueId()
- {
- return this->uniqueId_;
- }
- //friend class Map;
-
- private:
- void validate(const WorldEntity* object) const
- {
- if (!object)
- {
- COUT(1) << "Assertation: Every RadarViewable has to be assigned a WorldEntity pointer!" << std::endl;
- assert(0);
- }
- }
-
- bool bVisibility_;
- //Map
- std::string uniqueId_;
-
-
- //Radar
- float radarObjectCamouflage_;
- Shape radarObjectShape_;
- std::string radarObjectDescription_;
- ColourValue radarObjectColour_;
-
- };
-}
-
-#endif /* _RadarViewable_H__ */
Modified: branches/pch/src/orxonox/objects/Scene.h
===================================================================
--- branches/pch/src/orxonox/objects/Scene.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/Scene.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -40,7 +40,7 @@
#include "util/Math.h"
#include "core/BaseObject.h"
#include "network/synchronisable/Synchronisable.h"
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
namespace orxonox
{
Deleted: branches/pch/src/orxonox/objects/Teamcolourable.cc
===================================================================
--- branches/pch/src/orxonox/objects/Teamcolourable.cc 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/Teamcolourable.cc 2009-06-15 09:52:13 UTC (rev 3177)
@@ -1,38 +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:
- * ...
- *
- */
-
-#include "Teamcolourable.h"
-#include "core/CoreIncludes.h"
-
-namespace orxonox
-{
- Teamcolourable::Teamcolourable()
- {
- RegisterRootObject(Teamcolourable);
- }
-}
Deleted: branches/pch/src/orxonox/objects/Teamcolourable.h
===================================================================
--- branches/pch/src/orxonox/objects/Teamcolourable.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/Teamcolourable.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -1,49 +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:
- * ...
- *
- */
-
-#ifndef _Teamcolourable_H__
-#define _Teamcolourable_H__
-
-#include "OrxonoxPrereqs.h"
-
-#include "util/UtilPrereqs.h"
-#include "core/OrxonoxClass.h"
-
-namespace orxonox
-{
- class _OrxonoxExport Teamcolourable : virtual public OrxonoxClass
- {
- public:
- virtual void setTeamColour(const ColourValue& colour) = 0;
-
- protected:
- Teamcolourable();
- };
-}
-
-#endif /* _Teamcolourable_H__ */
Modified: branches/pch/src/orxonox/objects/Test.h
===================================================================
--- branches/pch/src/orxonox/objects/Test.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/Test.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -32,7 +32,7 @@
#include "OrxonoxPrereqs.h"
#include "core/BaseObject.h"
#include "network/synchronisable/Synchronisable.h"
-#include "Tickable.h"
+#include "interfaces/Tickable.h"
typedef int TYPE;
Deleted: branches/pch/src/orxonox/objects/Tickable.cc
===================================================================
--- branches/pch/src/orxonox/objects/Tickable.cc 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/Tickable.cc 2009-06-15 09:52:13 UTC (rev 3177)
@@ -1,41 +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:
- * ...
- *
- */
-
-#include "Tickable.h"
-#include "core/CoreIncludes.h"
-
-namespace orxonox
-{
- /**
- @brief Constructor: Registers the object in the Tickable-list
- */
- Tickable::Tickable()
- {
- RegisterRootObject(Tickable);
- }
-}
Deleted: branches/pch/src/orxonox/objects/Tickable.h
===================================================================
--- branches/pch/src/orxonox/objects/Tickable.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/Tickable.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -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) = 0;
-
- protected:
- Tickable();
- };
-
- SUPER_FUNCTION(1, Tickable, tick, true);
-}
-
-#endif /* _Tickable_H__ */
Modified: branches/pch/src/orxonox/objects/controllers/AIController.h
===================================================================
--- branches/pch/src/orxonox/objects/controllers/AIController.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/controllers/AIController.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -32,8 +32,8 @@
#include "OrxonoxPrereqs.h"
#include "tools/Timer.h"
+#include "interfaces/Tickable.h"
#include "ArtificialController.h"
-#include "objects/Tickable.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/controllers/ArtificialController.h
===================================================================
--- branches/pch/src/orxonox/objects/controllers/ArtificialController.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/controllers/ArtificialController.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -32,8 +32,8 @@
#include "OrxonoxPrereqs.h"
#include "util/Math.h"
+#include "interfaces/PawnListener.h"
#include "Controller.h"
-#include "tools/PawnListener.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/controllers/PongAI.h
===================================================================
--- branches/pch/src/orxonox/objects/controllers/PongAI.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/controllers/PongAI.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -33,8 +33,8 @@
#include <list>
#include "util/Math.h"
+#include "interfaces/Tickable.h"
#include "Controller.h"
-#include "objects/Tickable.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/controllers/WaypointController.h
===================================================================
--- branches/pch/src/orxonox/objects/controllers/WaypointController.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/controllers/WaypointController.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -32,8 +32,8 @@
#include "OrxonoxPrereqs.h"
#include <vector>
+#include "interfaces/Tickable.h"
#include "ArtificialController.h"
-#include "objects/Tickable.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/gametypes/Gametype.h
===================================================================
--- branches/pch/src/orxonox/objects/gametypes/Gametype.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/gametypes/Gametype.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -36,7 +36,7 @@
#include "core/BaseObject.h"
#include "core/Identifier.h"
#include "objects/worldentities/ControllableEntity.h"
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
#include "objects/infos/GametypeInfo.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/gametypes/TeamDeathmatch.cc
===================================================================
--- branches/pch/src/orxonox/objects/gametypes/TeamDeathmatch.cc 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/gametypes/TeamDeathmatch.cc 2009-06-15 09:52:13 UTC (rev 3177)
@@ -30,7 +30,7 @@
#include "core/CoreIncludes.h"
#include "core/ConfigValueIncludes.h"
-#include "objects/Teamcolourable.h"
+#include "interfaces/Teamcolourable.h"
#include "objects/worldentities/TeamSpawnPoint.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/gametypes/UnderAttack.h
===================================================================
--- branches/pch/src/orxonox/objects/gametypes/UnderAttack.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/gametypes/UnderAttack.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -32,7 +32,7 @@
#include "OrxonoxPrereqs.h"
#include "TeamDeathmatch.h"
-#include "objects/worldentities/pawns/Pawn.h"
+#include "interfaces/PawnListener.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/infos/GametypeInfo.cc
===================================================================
--- branches/pch/src/orxonox/objects/infos/GametypeInfo.cc 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/infos/GametypeInfo.cc 2009-06-15 09:52:13 UTC (rev 3177)
@@ -32,7 +32,7 @@
#include "core/GameMode.h"
#include "network/NetworkFunction.h"
#include "network/Host.h"
-#include "objects/GametypeMessageListener.h"
+#include "interfaces/GametypeMessageListener.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/items/Engine.h
===================================================================
--- branches/pch/src/orxonox/objects/items/Engine.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/items/Engine.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -32,7 +32,7 @@
#include "OrxonoxPrereqs.h"
#include "Item.h"
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
#include "util/Math.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/pickup/DroppedItem.h
===================================================================
--- branches/pch/src/orxonox/objects/pickup/DroppedItem.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/pickup/DroppedItem.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -36,7 +36,7 @@
#include "OrxonoxPrereqs.h"
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
#include "objects/worldentities/StaticEntity.h"
#include "tools/Timer.h"
Modified: branches/pch/src/orxonox/objects/pickup/PickupSpawner.h
===================================================================
--- branches/pch/src/orxonox/objects/pickup/PickupSpawner.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/pickup/PickupSpawner.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -36,7 +36,7 @@
#include "OrxonoxPrereqs.h"
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
#include "objects/worldentities/StaticEntity.h"
#include "tools/Timer.h"
Modified: branches/pch/src/orxonox/objects/weaponsystem/projectiles/Projectile.h
===================================================================
--- branches/pch/src/orxonox/objects/weaponsystem/projectiles/Projectile.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/weaponsystem/projectiles/Projectile.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -31,6 +31,7 @@
#include "OrxonoxPrereqs.h"
+#include "interfaces/PawnListener.h"
#include "objects/worldentities/MovableEntity.h"
#include "objects/worldentities/pawns/Pawn.h"
#include "tools/Timer.h"
Modified: branches/pch/src/orxonox/objects/worldentities/Backlight.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/Backlight.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/worldentities/Backlight.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -31,7 +31,7 @@
#include "OrxonoxPrereqs.h"
#include "FadingBillboard.h"
-#include "tools/TimeFactorListener.h"
+#include "interfaces/TimeFactorListener.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/worldentities/Billboard.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/Billboard.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/worldentities/Billboard.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -33,7 +33,7 @@
#include "StaticEntity.h"
#include "util/Math.h"
#include "tools/BillboardSet.h"
-#include "objects/Teamcolourable.h"
+#include "interfaces/Teamcolourable.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/worldentities/BlinkingBillboard.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/BlinkingBillboard.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/worldentities/BlinkingBillboard.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -31,7 +31,7 @@
#include "OrxonoxPrereqs.h"
#include "Billboard.h"
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/worldentities/Camera.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/Camera.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/worldentities/Camera.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -33,7 +33,7 @@
#include <OgrePrerequisites.h>
#include "objects/worldentities/StaticEntity.h"
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/worldentities/FadingBillboard.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/FadingBillboard.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/worldentities/FadingBillboard.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -31,7 +31,7 @@
#include "OrxonoxPrereqs.h"
#include "Billboard.h"
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
#include "tools/Timer.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/worldentities/ForceField.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/ForceField.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/worldentities/ForceField.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -31,7 +31,7 @@
#define _ForceField_H__
#include "StaticEntity.h"
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/worldentities/Light.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/Light.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/worldentities/Light.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -36,7 +36,7 @@
#include <OgreLight.h>
#include "util/Math.h"
-#include "objects/Teamcolourable.h"
+#include "interfaces/Teamcolourable.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/worldentities/MobileEntity.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/MobileEntity.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/worldentities/MobileEntity.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -32,7 +32,7 @@
#include "OrxonoxPrereqs.h"
#include "WorldEntity.h"
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/worldentities/Planet.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/Planet.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/worldentities/Planet.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -36,7 +36,7 @@
#include "tools/BillboardSet.h"
#include "tools/Mesh.h"
#include "MovableEntity.h"
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/worldentities/pawns/Pawn.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/pawns/Pawn.cc 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/worldentities/pawns/Pawn.cc 2009-06-15 09:52:13 UTC (rev 3177)
@@ -33,6 +33,7 @@
#include "core/XMLPort.h"
#include "util/Math.h"
#include "PawnManager.h"
+#include "interfaces/PawnListener.h"
#include "objects/infos/PlayerInfo.h"
#include "objects/gametypes/Gametype.h"
#include "objects/worldentities/ParticleSpawner.h"
Modified: branches/pch/src/orxonox/objects/worldentities/pawns/Pawn.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/pawns/Pawn.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/worldentities/pawns/Pawn.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -31,7 +31,7 @@
#include "OrxonoxPrereqs.h"
#include "objects/worldentities/ControllableEntity.h"
-#include "objects/RadarViewable.h"
+#include "interfaces/RadarViewable.h"
#include "objects/pickup/PickupCollection.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc 2009-06-15 09:52:13 UTC (rev 3177)
@@ -30,7 +30,8 @@
#include "TeamBaseMatchBase.h"
#include "core/CoreIncludes.h"
#include "objects/gametypes/TeamBaseMatch.h"
-#include "objects/Teamcolourable.h"
+#include "interfaces/Teamcolourable.h"
+#include "interfaces/PawnListener.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/worldentities/triggers/CheckPoint.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/triggers/CheckPoint.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/worldentities/triggers/CheckPoint.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -35,7 +35,7 @@
#define _CheckPoint_H__
#include "DistanceTrigger.h"
-#include "objects/RadarViewable.h"
+#include "interfaces/RadarViewable.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/worldentities/triggers/Trigger.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/triggers/Trigger.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/objects/worldentities/triggers/Trigger.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -34,7 +34,7 @@
#include "OrxonoxPrereqs.h"
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
#include "objects/worldentities/StaticEntity.h"
#include "tools/BillboardSet.h"
Modified: branches/pch/src/orxonox/overlays/FadeoutText.h
===================================================================
--- branches/pch/src/orxonox/overlays/FadeoutText.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/overlays/FadeoutText.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -32,7 +32,7 @@
#include "OrxonoxPrereqs.h"
#include "tools/Timer.h"
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
#include "overlays/OverlayText.h"
namespace orxonox
Modified: branches/pch/src/orxonox/overlays/OrxonoxOverlay.h
===================================================================
--- branches/pch/src/orxonox/overlays/OrxonoxOverlay.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/overlays/OrxonoxOverlay.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -41,7 +41,7 @@
#include "util/Math.h"
#include "core/BaseObject.h"
-#include "tools/WindowEventListener.h"
+#include "interfaces/WindowEventListener.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/overlays/console/InGameConsole.h
===================================================================
--- branches/pch/src/orxonox/overlays/console/InGameConsole.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/overlays/console/InGameConsole.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -34,7 +34,7 @@
#include <string>
#include "core/Shell.h"
-#include "tools/WindowEventListener.h"
+#include "interfaces/WindowEventListener.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/overlays/debug/DebugFPSText.h
===================================================================
--- branches/pch/src/orxonox/overlays/debug/DebugFPSText.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/overlays/debug/DebugFPSText.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -31,7 +31,7 @@
#include "OrxonoxPrereqs.h"
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
#include "overlays/OverlayText.h"
namespace orxonox
Modified: branches/pch/src/orxonox/overlays/debug/DebugRTRText.h
===================================================================
--- branches/pch/src/orxonox/overlays/debug/DebugRTRText.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/overlays/debug/DebugRTRText.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -31,7 +31,7 @@
#include "OrxonoxPrereqs.h"
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
#include "overlays/OverlayText.h"
namespace orxonox
Modified: branches/pch/src/orxonox/overlays/hud/AnnounceMessage.h
===================================================================
--- branches/pch/src/orxonox/overlays/hud/AnnounceMessage.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/overlays/hud/AnnounceMessage.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -31,7 +31,7 @@
#include "OrxonoxPrereqs.h"
-#include "objects/GametypeMessageListener.h"
+#include "interfaces/GametypeMessageListener.h"
#include "overlays/FadeoutText.h"
namespace orxonox
Modified: branches/pch/src/orxonox/overlays/hud/DeathMessage.h
===================================================================
--- branches/pch/src/orxonox/overlays/hud/DeathMessage.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/overlays/hud/DeathMessage.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -31,7 +31,7 @@
#include "OrxonoxPrereqs.h"
-#include "objects/GametypeMessageListener.h"
+#include "interfaces/GametypeMessageListener.h"
#include "overlays/FadeoutText.h"
namespace orxonox
Modified: branches/pch/src/orxonox/overlays/hud/GametypeStatus.h
===================================================================
--- branches/pch/src/orxonox/overlays/hud/GametypeStatus.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/overlays/hud/GametypeStatus.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -31,7 +31,7 @@
#include "OrxonoxPrereqs.h"
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
#include "overlays/OverlayText.h"
namespace orxonox
Modified: branches/pch/src/orxonox/overlays/hud/HUDHealthBar.h
===================================================================
--- branches/pch/src/orxonox/overlays/hud/HUDHealthBar.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/overlays/hud/HUDHealthBar.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -32,7 +32,7 @@
#include "OrxonoxPrereqs.h"
#include "util/Math.h"
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
#include "overlays/OverlayText.h"
#include "HUDBar.h"
Modified: branches/pch/src/orxonox/overlays/hud/HUDNavigation.h
===================================================================
--- branches/pch/src/orxonox/overlays/hud/HUDNavigation.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/overlays/hud/HUDNavigation.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -32,7 +32,7 @@
#include "OrxonoxPrereqs.h"
#include <OgrePrerequisites.h>
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
#include "overlays/OrxonoxOverlay.h"
namespace orxonox
Modified: branches/pch/src/orxonox/overlays/hud/HUDRadar.h
===================================================================
--- branches/pch/src/orxonox/overlays/hud/HUDRadar.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/overlays/hud/HUDRadar.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -36,9 +36,9 @@
#include <vector>
#include <OgrePrerequisites.h>
+#include "interfaces/RadarListener.h"
+#include "interfaces/RadarViewable.h"
#include "overlays/OrxonoxOverlay.h"
-#include "objects/RadarListener.h"
-#include "objects/RadarViewable.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/overlays/hud/HUDSpeedBar.h
===================================================================
--- branches/pch/src/orxonox/overlays/hud/HUDSpeedBar.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/overlays/hud/HUDSpeedBar.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -32,7 +32,7 @@
#include "OrxonoxPrereqs.h"
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
#include "HUDBar.h"
namespace orxonox
Modified: branches/pch/src/orxonox/overlays/hud/HUDTimer.h
===================================================================
--- branches/pch/src/orxonox/overlays/hud/HUDTimer.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/overlays/hud/HUDTimer.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -31,7 +31,7 @@
#include "OrxonoxPrereqs.h"
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
#include "overlays/OverlayText.h"
namespace orxonox
Modified: branches/pch/src/orxonox/overlays/hud/KillMessage.h
===================================================================
--- branches/pch/src/orxonox/overlays/hud/KillMessage.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/overlays/hud/KillMessage.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -31,7 +31,7 @@
#include "OrxonoxPrereqs.h"
-#include "objects/GametypeMessageListener.h"
+#include "interfaces/GametypeMessageListener.h"
#include "overlays/FadeoutText.h"
namespace orxonox
Modified: branches/pch/src/orxonox/overlays/hud/PongScore.h
===================================================================
--- branches/pch/src/orxonox/overlays/hud/PongScore.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/overlays/hud/PongScore.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -31,7 +31,7 @@
#include "OrxonoxPrereqs.h"
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
#include "overlays/OverlayText.h"
namespace orxonox
Modified: branches/pch/src/orxonox/overlays/hud/TeamBaseMatchScore.h
===================================================================
--- branches/pch/src/orxonox/overlays/hud/TeamBaseMatchScore.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/overlays/hud/TeamBaseMatchScore.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -31,7 +31,7 @@
#include "OrxonoxPrereqs.h"
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
#include "overlays/OverlayText.h"
namespace orxonox
Modified: branches/pch/src/orxonox/overlays/map/Map.cc
===================================================================
--- branches/pch/src/orxonox/overlays/map/Map.cc 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/overlays/map/Map.cc 2009-06-15 09:52:13 UTC (rev 3177)
@@ -52,8 +52,8 @@
#include "core/CoreIncludes.h"
#include "core/ObjectList.h"
#include "core/XMLPort.h"
+#include "interfaces/RadarViewable.h"
#include "objects/Scene.h"
-#include "objects/RadarViewable.h"
#include "objects/controllers/HumanController.h"
#include "objects/worldentities/CameraPosition.h"
#include "objects/worldentities/ControllableEntity.h"
Modified: branches/pch/src/orxonox/overlays/map/Map.h
===================================================================
--- branches/pch/src/orxonox/overlays/map/Map.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/overlays/map/Map.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -32,7 +32,7 @@
#include <OgreMaterial.h>
#include "util/UtilPrereqs.h"
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
#include "overlays/OrxonoxOverlay.h"
namespace orxonox
Modified: branches/pch/src/orxonox/overlays/notifications/NotificationQueue.h
===================================================================
--- branches/pch/src/orxonox/overlays/notifications/NotificationQueue.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/overlays/notifications/NotificationQueue.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -42,8 +42,8 @@
#include <string>
#include "util/Math.h"
-#include "orxonox/objects/Tickable.h"
-#include "orxonox/overlays/OverlayGroup.h"
+#include "interfaces/Tickable.h"
+#include "overlays/OverlayGroup.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/overlays/stats/Scoreboard.h
===================================================================
--- branches/pch/src/orxonox/overlays/stats/Scoreboard.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/overlays/stats/Scoreboard.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -32,8 +32,8 @@
#include <string>
#include <vector>
+#include "interfaces/Tickable.h"
#include "overlays/OrxonoxOverlay.h"
-#include "objects/Tickable.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/overlays/stats/Stats.h
===================================================================
--- branches/pch/src/orxonox/overlays/stats/Stats.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/overlays/stats/Stats.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -31,8 +31,8 @@
#include "OrxonoxPrereqs.h"
+#include "interfaces/Tickable.h"
#include "overlays/OrxonoxOverlay.h"
-#include "objects/Tickable.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/sound/SoundManager.h
===================================================================
--- branches/pch/src/orxonox/sound/SoundManager.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/sound/SoundManager.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -30,7 +30,7 @@
#include "OrxonoxPrereqs.h"
#include <list>
-#include "orxonox/objects/Tickable.h"
+#include "interfaces/Tickable.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/tools/CMakeLists.txt
===================================================================
--- branches/pch/src/orxonox/tools/CMakeLists.txt 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/tools/CMakeLists.txt 2009-06-15 09:52:13 UTC (rev 3177)
@@ -4,10 +4,7 @@
DynamicRenderable.cc
Mesh.cc
ParticleInterface.cc
- PawnListener.cc
Shader.cc
TextureGenerator.cc
- TimeFactorListener.cc
Timer.cc
- WindowEventListener.cc
)
Modified: branches/pch/src/orxonox/tools/ParticleInterface.h
===================================================================
--- branches/pch/src/orxonox/tools/ParticleInterface.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/tools/ParticleInterface.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -32,7 +32,7 @@
#include "OrxonoxPrereqs.h"
#include <OgrePrerequisites.h>
-#include "tools/TimeFactorListener.h"
+#include "interfaces/TimeFactorListener.h"
#define getAllEmitters() \
storeThisAsCurrentParticleInterface(); \
Deleted: branches/pch/src/orxonox/tools/PawnListener.cc
===================================================================
--- branches/pch/src/orxonox/tools/PawnListener.cc 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/tools/PawnListener.cc 2009-06-15 09:52:13 UTC (rev 3177)
@@ -1,41 +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:
- * ...
- *
- */
-
-#include "PawnListener.h"
-#include "core/CoreIncludes.h"
-
-namespace orxonox
-{
- /**
- @brief Constructor for the PawnListener.
- */
- PawnListener::PawnListener()
- {
- RegisterRootObject(PawnListener);
- }
-}
Deleted: branches/pch/src/orxonox/tools/PawnListener.h
===================================================================
--- branches/pch/src/orxonox/tools/PawnListener.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/tools/PawnListener.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -1,47 +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:
- * ...
- *
- */
-
-#ifndef _PawnListener_H__
-#define _PawnListener_H__
-
-#include "OrxonoxPrereqs.h"
-#include "core/OrxonoxClass.h"
-
-namespace orxonox
-{
- class _OrxonoxExport PawnListener : virtual public OrxonoxClass
- {
- public:
- PawnListener();
- virtual ~PawnListener() {}
-
- virtual void destroyedPawn(Pawn* pawn) = 0;
- };
-}
-
-#endif /* _PawnListener_H__ */
Modified: branches/pch/src/orxonox/tools/Shader.h
===================================================================
--- branches/pch/src/orxonox/tools/Shader.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/tools/Shader.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -36,7 +36,7 @@
#include <vector>
#include <OgrePrerequisites.h>
-#include "objects/Tickable.h"
+#include "interfaces/Tickable.h"
namespace orxonox
{
Deleted: branches/pch/src/orxonox/tools/TimeFactorListener.cc
===================================================================
--- branches/pch/src/orxonox/tools/TimeFactorListener.cc 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/tools/TimeFactorListener.cc 2009-06-15 09:52:13 UTC (rev 3177)
@@ -1,40 +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 "TimeFactorListener.h"
-#include "core/CoreIncludes.h"
-
-namespace orxonox
-{
- float TimeFactorListener::timefactor_s = 1.0f;
-
- TimeFactorListener::TimeFactorListener()
- {
- RegisterRootObject(TimeFactorListener);
- }
-}
Deleted: branches/pch/src/orxonox/tools/TimeFactorListener.h
===================================================================
--- branches/pch/src/orxonox/tools/TimeFactorListener.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/tools/TimeFactorListener.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -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: branches/pch/src/orxonox/tools/Timer.h
===================================================================
--- branches/pch/src/orxonox/tools/Timer.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/tools/Timer.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -64,7 +64,7 @@
#include "core/Executor.h"
#include "core/OrxonoxClass.h"
-#include "tools/TimeFactorListener.h"
+#include "interfaces/TimeFactorListener.h"
namespace orxonox
{
Deleted: branches/pch/src/orxonox/tools/WindowEventListener.cc
===================================================================
--- branches/pch/src/orxonox/tools/WindowEventListener.cc 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/tools/WindowEventListener.cc 2009-06-15 09:52:13 UTC (rev 3177)
@@ -1,41 +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 "WindowEventListener.h"
-#include "core/CoreIncludes.h"
-
-namespace orxonox
-{
- /**
- @brief Constructor for the WindowEventListener.
- */
- WindowEventListener::WindowEventListener()
- {
- RegisterRootObject(WindowEventListener);
- }
-}
Deleted: branches/pch/src/orxonox/tools/WindowEventListener.h
===================================================================
--- branches/pch/src/orxonox/tools/WindowEventListener.h 2009-06-15 08:48:17 UTC (rev 3176)
+++ branches/pch/src/orxonox/tools/WindowEventListener.h 2009-06-15 09:52:13 UTC (rev 3177)
@@ -1,57 +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 _WindowEventListener_H__
-#define _WindowEventListener_H__
-
-#include "OrxonoxPrereqs.h"
-#include "core/OrxonoxClass.h"
-
-namespace orxonox
-{
- /**
- @brief Interface for receiving window events.
- */
- class _OrxonoxExport WindowEventListener : virtual public OrxonoxClass
- {
- public:
- WindowEventListener();
- virtual ~WindowEventListener() { }
-
- /** Window has moved position */
- virtual void windowMoved() { }
-
- /** Window has resized */
- virtual void windowResized(unsigned int newWidth, unsigned int newHeight) { }
-
- /** Window has lost/gained focus */
- virtual void windowFocusChanged() { }
- };
-}
-
-#endif /* _WindowEventListener_H__ */
More information about the Orxonox-commit
mailing list