Changeset 3176

Timestamp:

Jun 15, 2009, 10:48:17 AM (15 years ago)

Author:

rgrieder

Message:

Cleanup in collisionshapes and controllers.
(Moved PawnListener to a separate class)

Location:

code/branches/pch/src/orxonox

Files:

• objects/collisionshapes/BoxCollisionShape.h (modified) (1 diff)
• objects/collisionshapes/CollisionShape.cc (modified) (1 diff)
• objects/collisionshapes/CompoundCollisionShape.h (modified) (1 diff)
• objects/collisionshapes/ConeCollisionShape.cc (modified) (1 diff)
• objects/collisionshapes/ConeCollisionShape.h (modified) (1 diff)
• objects/collisionshapes/PlaneCollisionShape.h (modified) (1 diff)
• objects/collisionshapes/SphereCollisionShape.cc (modified) (1 diff)
• objects/collisionshapes/SphereCollisionShape.h (modified) (1 diff)
• objects/collisionshapes/WorldEntityCollisionShape.h (modified) (1 diff)
• objects/controllers/AIController.cc (modified) (1 diff)
• objects/controllers/AIController.h (modified) (1 diff)
• objects/controllers/ArtificialController.cc (modified) (1 diff)
• objects/controllers/ArtificialController.h (modified) (1 diff)
• objects/controllers/Controller.cc (modified) (1 diff)
• objects/controllers/Controller.h (modified) (1 diff)
• objects/controllers/HumanController.cc (modified) (1 diff)
• objects/controllers/HumanController.h (modified) (2 diffs)
• objects/controllers/PongAI.cc (modified) (1 diff)
• objects/controllers/PongAI.h (modified) (1 diff)
• objects/controllers/ScriptController.cc (modified) (2 diffs)
• objects/controllers/ScriptController.h (modified) (2 diffs)
• objects/controllers/WaypointController.cc (modified) (1 diff)
• objects/controllers/WaypointController.h (modified) (1 diff)
• objects/controllers/WaypointPatrolController.cc (modified) (1 diff)
• objects/controllers/WaypointPatrolController.h (modified) (1 diff)
• objects/worldentities/pawns/Pawn.cc (modified) (1 diff)
• objects/worldentities/pawns/Pawn.h (modified) (1 diff)
• tools/CMakeLists.txt (modified) (1 diff)
• tools/PawnListener.cc (added)
• tools/PawnListener.h (added)

code/branches/pch/src/orxonox/objects/collisionshapes/BoxCollisionShape.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
+#include "util/Math.h"
 #include "CollisionShape.h"
 

code/branches/pch/src/orxonox/objects/collisionshapes/CollisionShape.cc

@@ -33 +33 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "tools/BulletConversions.h"
-
 #include "objects/worldentities/WorldEntity.h"
 #include "CompoundCollisionShape.h"

code/branches/pch/src/orxonox/objects/collisionshapes/CompoundCollisionShape.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
-#include <vector>
 #include <cassert>
+#include <map>
 #include "CollisionShape.h"
 

code/branches/pch/src/orxonox/objects/collisionshapes/ConeCollisionShape.cc

@@ -33 +33 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "tools/BulletConversions.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/collisionshapes/ConeCollisionShape.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
-
 #include "CollisionShape.h"
 

code/branches/pch/src/orxonox/objects/collisionshapes/PlaneCollisionShape.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
+#include "util/Math.h"
 #include "CollisionShape.h"
 

code/branches/pch/src/orxonox/objects/collisionshapes/SphereCollisionShape.cc

@@ -33 +33 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "tools/BulletConversions.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/collisionshapes/SphereCollisionShape.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
-
 #include "CollisionShape.h"
 

code/branches/pch/src/orxonox/objects/collisionshapes/WorldEntityCollisionShape.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
-
 #include "CompoundCollisionShape.h"
 

code/branches/pch/src/orxonox/objects/controllers/AIController.cc

@@ -29 +29 @@
 #include "AIController.h"
 
+#include "util/Math.h"
 #include "core/CoreIncludes.h"
 #include "core/Executor.h"

code/branches/pch/src/orxonox/objects/controllers/AIController.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
+#include "tools/Timer.h"
 #include "ArtificialController.h"
 #include "objects/Tickable.h"
-#include "tools/Timer.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/controllers/ArtificialController.cc

@@ -32 +32 @@
 #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

code/branches/pch/src/orxonox/objects/controllers/ArtificialController.h

@@ -32 +32 @@
 #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

code/branches/pch/src/orxonox/objects/controllers/Controller.cc

@@ -28 +28 @@
 
 #include "Controller.h"
-
 #include "core/CoreIncludes.h"
-#include "overlays/OverlayGroup.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/controllers/Controller.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
-
 #include "core/BaseObject.h"
 

code/branches/pch/src/orxonox/objects/controllers/HumanController.cc

@@ -192 +192 @@
             HumanController::localController_s->controllableEntity_->dropItems();
     }
+
+    Pawn* HumanController::getLocalControllerEntityAsPawn()
+    {
+        if (HumanController::localController_s)
+            return dynamic_cast<Pawn*>(HumanController::localController_s->getControllableEntity());
+        else
+            return NULL;
+    }
 }

code/branches/pch/src/orxonox/objects/controllers/HumanController.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
-
-#include "util/Math.h"
 #include "Controller.h"
-#include "objects/worldentities/pawns/Pawn.h"
 
 namespace orxonox
@@ -69 +66 @@
             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;

code/branches/pch/src/orxonox/objects/controllers/PongAI.cc

@@ -31 +31 @@
 #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

code/branches/pch/src/orxonox/objects/controllers/PongAI.h

@@ -33 +33 @@
 
 #include <list>
-
+#include "util/Math.h"
 #include "Controller.h"
 #include "objects/Tickable.h"
-#include "util/Math.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/controllers/ScriptController.cc

@@ -28 +28 @@
 
 #include "ScriptController.h"
-
 #include "core/CoreIncludes.h"
 
@@ -39 +38 @@
         RegisterObject(ScriptController);
     }
-
-    ScriptController::~ScriptController()
-    {
-    }
 }

code/branches/pch/src/orxonox/objects/controllers/ScriptController.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
-
 #include "ArtificialController.h"
 
@@ -40 +39 @@
         public:
             ScriptController(BaseObject* creator);
-            virtual ~ScriptController();
-
-        protected:
+            virtual ~ScriptController() { }
 
         private:

code/branches/pch/src/orxonox/objects/controllers/WaypointController.cc

@@ -31 +31 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
+#include "objects/worldentities/ControllableEntity.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/controllers/WaypointController.h

@@ -33 +33 @@
 
 #include <vector>
-
 #include "ArtificialController.h"
 #include "objects/Tickable.h"

code/branches/pch/src/orxonox/objects/controllers/WaypointPatrolController.cc

@@ -29 +29 @@
 #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

code/branches/pch/src/orxonox/objects/controllers/WaypointPatrolController.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
+#include "tools/Timer.h"
 #include "WaypointController.h"
-#include "tools/Timer.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -373 +373 @@
         this->isHumanShip_ = true;
     }
-
-
-    ///////////////////
-    // Pawn Listener //
-    ///////////////////
-    PawnListener::PawnListener()
-    {
-        RegisterRootObject(PawnListener);
-    }
 }

code/branches/pch/src/orxonox/objects/worldentities/pawns/Pawn.h

@@ -147 +147 @@
                 { this->weaponSystem_ = weaponsystem; }
     };
-
-    class _OrxonoxExport PawnListener : virtual public OrxonoxClass
-    {
-        public:
-            PawnListener();
-            virtual ~PawnListener() {}
-
-            virtual void destroyedPawn(Pawn* pawn) = 0;
-    };
 }
 

code/branches/pch/src/orxonox/tools/CMakeLists.txt

@@ -5 +5 @@
   Mesh.cc
   ParticleInterface.cc
+  PawnListener.cc
   Shader.cc
   TextureGenerator.cc