[Orxonox-commit 644] r3176 - in branches/pch/src/orxonox: objects/collisionshapes objects/controllers objects/worldentities/pawns tools
rgrieder at orxonox.net
rgrieder at orxonox.net
Mon Jun 15 10:48:17 CEST 2009
Author: rgrieder
Date: 2009-06-15 10:48:17 +0200 (Mon, 15 Jun 2009)
New Revision: 3176
Added:
branches/pch/src/orxonox/tools/PawnListener.cc
branches/pch/src/orxonox/tools/PawnListener.h
Modified:
branches/pch/src/orxonox/objects/collisionshapes/BoxCollisionShape.h
branches/pch/src/orxonox/objects/collisionshapes/CollisionShape.cc
branches/pch/src/orxonox/objects/collisionshapes/CompoundCollisionShape.h
branches/pch/src/orxonox/objects/collisionshapes/ConeCollisionShape.cc
branches/pch/src/orxonox/objects/collisionshapes/ConeCollisionShape.h
branches/pch/src/orxonox/objects/collisionshapes/PlaneCollisionShape.h
branches/pch/src/orxonox/objects/collisionshapes/SphereCollisionShape.cc
branches/pch/src/orxonox/objects/collisionshapes/SphereCollisionShape.h
branches/pch/src/orxonox/objects/collisionshapes/WorldEntityCollisionShape.h
branches/pch/src/orxonox/objects/controllers/AIController.cc
branches/pch/src/orxonox/objects/controllers/AIController.h
branches/pch/src/orxonox/objects/controllers/ArtificialController.cc
branches/pch/src/orxonox/objects/controllers/ArtificialController.h
branches/pch/src/orxonox/objects/controllers/Controller.cc
branches/pch/src/orxonox/objects/controllers/Controller.h
branches/pch/src/orxonox/objects/controllers/HumanController.cc
branches/pch/src/orxonox/objects/controllers/HumanController.h
branches/pch/src/orxonox/objects/controllers/PongAI.cc
branches/pch/src/orxonox/objects/controllers/PongAI.h
branches/pch/src/orxonox/objects/controllers/ScriptController.cc
branches/pch/src/orxonox/objects/controllers/ScriptController.h
branches/pch/src/orxonox/objects/controllers/WaypointController.cc
branches/pch/src/orxonox/objects/controllers/WaypointController.h
branches/pch/src/orxonox/objects/controllers/WaypointPatrolController.cc
branches/pch/src/orxonox/objects/controllers/WaypointPatrolController.h
branches/pch/src/orxonox/objects/worldentities/pawns/Pawn.cc
branches/pch/src/orxonox/objects/worldentities/pawns/Pawn.h
branches/pch/src/orxonox/tools/CMakeLists.txt
Log:
Cleanup in collisionshapes and controllers.
(Moved PawnListener to a separate class)
Modified: branches/pch/src/orxonox/objects/collisionshapes/BoxCollisionShape.h
===================================================================
--- branches/pch/src/orxonox/objects/collisionshapes/BoxCollisionShape.h 2009-06-15 08:21:59 UTC (rev 3175)
+++ branches/pch/src/orxonox/objects/collisionshapes/BoxCollisionShape.h 2009-06-15 08:48:17 UTC (rev 3176)
@@ -31,6 +31,7 @@
#include "OrxonoxPrereqs.h"
+#include "util/Math.h"
#include "CollisionShape.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/collisionshapes/CollisionShape.cc
===================================================================
--- branches/pch/src/orxonox/objects/collisionshapes/CollisionShape.cc 2009-06-15 08:21:59 UTC (rev 3175)
+++ branches/pch/src/orxonox/objects/collisionshapes/CollisionShape.cc 2009-06-15 08:48:17 UTC (rev 3176)
@@ -32,8 +32,6 @@
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
-#include "tools/BulletConversions.h"
-
#include "objects/worldentities/WorldEntity.h"
#include "CompoundCollisionShape.h"
#include "WorldEntityCollisionShape.h"
Modified: branches/pch/src/orxonox/objects/collisionshapes/CompoundCollisionShape.h
===================================================================
--- branches/pch/src/orxonox/objects/collisionshapes/CompoundCollisionShape.h 2009-06-15 08:21:59 UTC (rev 3175)
+++ branches/pch/src/orxonox/objects/collisionshapes/CompoundCollisionShape.h 2009-06-15 08:48:17 UTC (rev 3176)
@@ -31,8 +31,8 @@
#include "OrxonoxPrereqs.h"
-#include <vector>
#include <cassert>
+#include <map>
#include "CollisionShape.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/collisionshapes/ConeCollisionShape.cc
===================================================================
--- branches/pch/src/orxonox/objects/collisionshapes/ConeCollisionShape.cc 2009-06-15 08:21:59 UTC (rev 3175)
+++ branches/pch/src/orxonox/objects/collisionshapes/ConeCollisionShape.cc 2009-06-15 08:48:17 UTC (rev 3176)
@@ -32,7 +32,6 @@
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
-#include "tools/BulletConversions.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/collisionshapes/ConeCollisionShape.h
===================================================================
--- branches/pch/src/orxonox/objects/collisionshapes/ConeCollisionShape.h 2009-06-15 08:21:59 UTC (rev 3175)
+++ branches/pch/src/orxonox/objects/collisionshapes/ConeCollisionShape.h 2009-06-15 08:48:17 UTC (rev 3176)
@@ -30,7 +30,6 @@
#define _ConeCollisionShape_H__
#include "OrxonoxPrereqs.h"
-
#include "CollisionShape.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/collisionshapes/PlaneCollisionShape.h
===================================================================
--- branches/pch/src/orxonox/objects/collisionshapes/PlaneCollisionShape.h 2009-06-15 08:21:59 UTC (rev 3175)
+++ branches/pch/src/orxonox/objects/collisionshapes/PlaneCollisionShape.h 2009-06-15 08:48:17 UTC (rev 3176)
@@ -31,6 +31,7 @@
#include "OrxonoxPrereqs.h"
+#include "util/Math.h"
#include "CollisionShape.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/collisionshapes/SphereCollisionShape.cc
===================================================================
--- branches/pch/src/orxonox/objects/collisionshapes/SphereCollisionShape.cc 2009-06-15 08:21:59 UTC (rev 3175)
+++ branches/pch/src/orxonox/objects/collisionshapes/SphereCollisionShape.cc 2009-06-15 08:48:17 UTC (rev 3176)
@@ -32,7 +32,6 @@
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
-#include "tools/BulletConversions.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/collisionshapes/SphereCollisionShape.h
===================================================================
--- branches/pch/src/orxonox/objects/collisionshapes/SphereCollisionShape.h 2009-06-15 08:21:59 UTC (rev 3175)
+++ branches/pch/src/orxonox/objects/collisionshapes/SphereCollisionShape.h 2009-06-15 08:48:17 UTC (rev 3176)
@@ -30,7 +30,6 @@
#define _SphereCollisionShape_H__
#include "OrxonoxPrereqs.h"
-
#include "CollisionShape.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/collisionshapes/WorldEntityCollisionShape.h
===================================================================
--- branches/pch/src/orxonox/objects/collisionshapes/WorldEntityCollisionShape.h 2009-06-15 08:21:59 UTC (rev 3175)
+++ branches/pch/src/orxonox/objects/collisionshapes/WorldEntityCollisionShape.h 2009-06-15 08:48:17 UTC (rev 3176)
@@ -30,7 +30,6 @@
#define _WorldEntityCollisionShape_H__
#include "OrxonoxPrereqs.h"
-
#include "CompoundCollisionShape.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/controllers/AIController.cc
===================================================================
--- branches/pch/src/orxonox/objects/controllers/AIController.cc 2009-06-15 08:21:59 UTC (rev 3175)
+++ branches/pch/src/orxonox/objects/controllers/AIController.cc 2009-06-15 08:48:17 UTC (rev 3176)
@@ -28,6 +28,7 @@
#include "AIController.h"
+#include "util/Math.h"
#include "core/CoreIncludes.h"
#include "core/Executor.h"
#include "objects/worldentities/ControllableEntity.h"
Modified: branches/pch/src/orxonox/objects/controllers/AIController.h
===================================================================
--- branches/pch/src/orxonox/objects/controllers/AIController.h 2009-06-15 08:21:59 UTC (rev 3175)
+++ branches/pch/src/orxonox/objects/controllers/AIController.h 2009-06-15 08:48:17 UTC (rev 3176)
@@ -31,9 +31,9 @@
#include "OrxonoxPrereqs.h"
+#include "tools/Timer.h"
#include "ArtificialController.h"
#include "objects/Tickable.h"
-#include "tools/Timer.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/controllers/ArtificialController.cc
===================================================================
--- branches/pch/src/orxonox/objects/controllers/ArtificialController.cc 2009-06-15 08:21:59 UTC (rev 3175)
+++ branches/pch/src/orxonox/objects/controllers/ArtificialController.cc 2009-06-15 08:48:17 UTC (rev 3176)
@@ -31,10 +31,9 @@
#include "core/CoreIncludes.h"
#include "objects/worldentities/ControllableEntity.h"
#include "objects/worldentities/pawns/Pawn.h"
-
+#include "objects/worldentities/pawns/TeamBaseMatchBase.h"
#include "objects/gametypes/TeamDeathmatch.h"
#include "objects/controllers/WaypointPatrolController.h"
-#include "objects/worldentities/pawns/TeamBaseMatchBase.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/controllers/ArtificialController.h
===================================================================
--- branches/pch/src/orxonox/objects/controllers/ArtificialController.h 2009-06-15 08:21:59 UTC (rev 3175)
+++ branches/pch/src/orxonox/objects/controllers/ArtificialController.h 2009-06-15 08:48:17 UTC (rev 3176)
@@ -31,9 +31,9 @@
#include "OrxonoxPrereqs.h"
+#include "util/Math.h"
#include "Controller.h"
-#include "objects/worldentities/pawns/Pawn.h"
-#include "util/Math.h"
+#include "tools/PawnListener.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/controllers/Controller.cc
===================================================================
--- branches/pch/src/orxonox/objects/controllers/Controller.cc 2009-06-15 08:21:59 UTC (rev 3175)
+++ branches/pch/src/orxonox/objects/controllers/Controller.cc 2009-06-15 08:48:17 UTC (rev 3176)
@@ -27,9 +27,7 @@
*/
#include "Controller.h"
-
#include "core/CoreIncludes.h"
-#include "overlays/OverlayGroup.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/controllers/Controller.h
===================================================================
--- branches/pch/src/orxonox/objects/controllers/Controller.h 2009-06-15 08:21:59 UTC (rev 3175)
+++ branches/pch/src/orxonox/objects/controllers/Controller.h 2009-06-15 08:48:17 UTC (rev 3176)
@@ -30,7 +30,6 @@
#define _Controller_H__
#include "OrxonoxPrereqs.h"
-
#include "core/BaseObject.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/controllers/HumanController.cc
===================================================================
--- branches/pch/src/orxonox/objects/controllers/HumanController.cc 2009-06-15 08:21:59 UTC (rev 3175)
+++ branches/pch/src/orxonox/objects/controllers/HumanController.cc 2009-06-15 08:48:17 UTC (rev 3176)
@@ -191,4 +191,12 @@
if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
HumanController::localController_s->controllableEntity_->dropItems();
}
+
+ Pawn* HumanController::getLocalControllerEntityAsPawn()
+ {
+ if (HumanController::localController_s)
+ return dynamic_cast<Pawn*>(HumanController::localController_s->getControllableEntity());
+ else
+ return NULL;
+ }
}
Modified: branches/pch/src/orxonox/objects/controllers/HumanController.h
===================================================================
--- branches/pch/src/orxonox/objects/controllers/HumanController.h 2009-06-15 08:21:59 UTC (rev 3175)
+++ branches/pch/src/orxonox/objects/controllers/HumanController.h 2009-06-15 08:48:17 UTC (rev 3176)
@@ -30,10 +30,7 @@
#define _HumanController_H__
#include "OrxonoxPrereqs.h"
-
-#include "util/Math.h"
#include "Controller.h"
-#include "objects/worldentities/pawns/Pawn.h"
namespace orxonox
{
@@ -68,15 +65,7 @@
static inline HumanController* getLocalControllerSingleton()
{ return HumanController::localController_s; }
- static inline Pawn* getLocalControllerEntityAsPawn()
- {
- if (HumanController::localController_s) {
- return dynamic_cast<Pawn*>(HumanController::localController_s->getControllableEntity());
- } else {
- return NULL;
- }
- }
-
+ static Pawn* getLocalControllerEntityAsPawn();
//friend class, for mouselook
friend class Map;
Modified: branches/pch/src/orxonox/objects/controllers/PongAI.cc
===================================================================
--- branches/pch/src/orxonox/objects/controllers/PongAI.cc 2009-06-15 08:21:59 UTC (rev 3175)
+++ branches/pch/src/orxonox/objects/controllers/PongAI.cc 2009-06-15 08:48:17 UTC (rev 3176)
@@ -30,9 +30,9 @@
#include "core/CoreIncludes.h"
#include "core/ConfigValueIncludes.h"
+#include "tools/Timer.h"
#include "objects/worldentities/ControllableEntity.h"
#include "objects/worldentities/PongBall.h"
-#include "tools/Timer.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/controllers/PongAI.h
===================================================================
--- branches/pch/src/orxonox/objects/controllers/PongAI.h 2009-06-15 08:21:59 UTC (rev 3175)
+++ branches/pch/src/orxonox/objects/controllers/PongAI.h 2009-06-15 08:48:17 UTC (rev 3176)
@@ -32,10 +32,9 @@
#include "OrxonoxPrereqs.h"
#include <list>
-
+#include "util/Math.h"
#include "Controller.h"
#include "objects/Tickable.h"
-#include "util/Math.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/controllers/ScriptController.cc
===================================================================
--- branches/pch/src/orxonox/objects/controllers/ScriptController.cc 2009-06-15 08:21:59 UTC (rev 3175)
+++ branches/pch/src/orxonox/objects/controllers/ScriptController.cc 2009-06-15 08:48:17 UTC (rev 3176)
@@ -27,7 +27,6 @@
*/
#include "ScriptController.h"
-
#include "core/CoreIncludes.h"
namespace orxonox
@@ -38,8 +37,4 @@
{
RegisterObject(ScriptController);
}
-
- ScriptController::~ScriptController()
- {
- }
}
Modified: branches/pch/src/orxonox/objects/controllers/ScriptController.h
===================================================================
--- branches/pch/src/orxonox/objects/controllers/ScriptController.h 2009-06-15 08:21:59 UTC (rev 3175)
+++ branches/pch/src/orxonox/objects/controllers/ScriptController.h 2009-06-15 08:48:17 UTC (rev 3176)
@@ -30,7 +30,6 @@
#define _ScriptController_H__
#include "OrxonoxPrereqs.h"
-
#include "ArtificialController.h"
namespace orxonox
@@ -39,10 +38,8 @@
{
public:
ScriptController(BaseObject* creator);
- virtual ~ScriptController();
+ virtual ~ScriptController() { }
- protected:
-
private:
};
}
Modified: branches/pch/src/orxonox/objects/controllers/WaypointController.cc
===================================================================
--- branches/pch/src/orxonox/objects/controllers/WaypointController.cc 2009-06-15 08:21:59 UTC (rev 3175)
+++ branches/pch/src/orxonox/objects/controllers/WaypointController.cc 2009-06-15 08:48:17 UTC (rev 3176)
@@ -30,6 +30,7 @@
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
+#include "objects/worldentities/ControllableEntity.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/controllers/WaypointController.h
===================================================================
--- branches/pch/src/orxonox/objects/controllers/WaypointController.h 2009-06-15 08:21:59 UTC (rev 3175)
+++ branches/pch/src/orxonox/objects/controllers/WaypointController.h 2009-06-15 08:48:17 UTC (rev 3176)
@@ -32,7 +32,6 @@
#include "OrxonoxPrereqs.h"
#include <vector>
-
#include "ArtificialController.h"
#include "objects/Tickable.h"
Modified: branches/pch/src/orxonox/objects/controllers/WaypointPatrolController.cc
===================================================================
--- branches/pch/src/orxonox/objects/controllers/WaypointPatrolController.cc 2009-06-15 08:21:59 UTC (rev 3175)
+++ branches/pch/src/orxonox/objects/controllers/WaypointPatrolController.cc 2009-06-15 08:48:17 UTC (rev 3176)
@@ -28,8 +28,11 @@
#include "WaypointPatrolController.h"
+#include "util/Math.h"
#include "core/CoreIncludes.h"
+#include "core/ObjectList.h"
#include "core/XMLPort.h"
+#include "objects/worldentities/pawns/Pawn.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/controllers/WaypointPatrolController.h
===================================================================
--- branches/pch/src/orxonox/objects/controllers/WaypointPatrolController.h 2009-06-15 08:21:59 UTC (rev 3175)
+++ branches/pch/src/orxonox/objects/controllers/WaypointPatrolController.h 2009-06-15 08:48:17 UTC (rev 3176)
@@ -31,8 +31,8 @@
#include "OrxonoxPrereqs.h"
+#include "tools/Timer.h"
#include "WaypointController.h"
-#include "tools/Timer.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:21:59 UTC (rev 3175)
+++ branches/pch/src/orxonox/objects/worldentities/pawns/Pawn.cc 2009-06-15 08:48:17 UTC (rev 3176)
@@ -372,13 +372,4 @@
ControllableEntity::startLocalHumanControl();
this->isHumanShip_ = true;
}
-
-
- ///////////////////
- // Pawn Listener //
- ///////////////////
- PawnListener::PawnListener()
- {
- RegisterRootObject(PawnListener);
- }
}
Modified: branches/pch/src/orxonox/objects/worldentities/pawns/Pawn.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/pawns/Pawn.h 2009-06-15 08:21:59 UTC (rev 3175)
+++ branches/pch/src/orxonox/objects/worldentities/pawns/Pawn.h 2009-06-15 08:48:17 UTC (rev 3176)
@@ -146,15 +146,6 @@
inline void setWeaponSystem(WeaponSystem* weaponsystem)
{ this->weaponSystem_ = weaponsystem; }
};
-
- class _OrxonoxExport PawnListener : virtual public OrxonoxClass
- {
- public:
- PawnListener();
- virtual ~PawnListener() {}
-
- virtual void destroyedPawn(Pawn* pawn) = 0;
- };
}
#endif /* _Pawn_H__ */
Modified: branches/pch/src/orxonox/tools/CMakeLists.txt
===================================================================
--- branches/pch/src/orxonox/tools/CMakeLists.txt 2009-06-15 08:21:59 UTC (rev 3175)
+++ branches/pch/src/orxonox/tools/CMakeLists.txt 2009-06-15 08:48:17 UTC (rev 3176)
@@ -4,6 +4,7 @@
DynamicRenderable.cc
Mesh.cc
ParticleInterface.cc
+ PawnListener.cc
Shader.cc
TextureGenerator.cc
TimeFactorListener.cc
Added: branches/pch/src/orxonox/tools/PawnListener.cc
===================================================================
--- branches/pch/src/orxonox/tools/PawnListener.cc (rev 0)
+++ branches/pch/src/orxonox/tools/PawnListener.cc 2009-06-15 08:48:17 UTC (rev 3176)
@@ -0,0 +1,41 @@
+/*
+ * 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);
+ }
+}
Property changes on: branches/pch/src/orxonox/tools/PawnListener.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Added: branches/pch/src/orxonox/tools/PawnListener.h
===================================================================
--- branches/pch/src/orxonox/tools/PawnListener.h (rev 0)
+++ branches/pch/src/orxonox/tools/PawnListener.h 2009-06-15 08:48:17 UTC (rev 3176)
@@ -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__ */
Property changes on: branches/pch/src/orxonox/tools/PawnListener.h
___________________________________________________________________
Added: svn:eol-style
+ native
More information about the Orxonox-commit
mailing list