Changeset 3176 for code/branches/pch/src/orxonox/objects/collisionshapes

Timestamp:

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

Author:

rgrieder

Message:

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

Location:

code/branches/pch/src/orxonox/objects/collisionshapes

Files:

• BoxCollisionShape.h (modified) (1 diff)
• CollisionShape.cc (modified) (1 diff)
• CompoundCollisionShape.h (modified) (1 diff)
• ConeCollisionShape.cc (modified) (1 diff)
• ConeCollisionShape.h (modified) (1 diff)
• PlaneCollisionShape.h (modified) (1 diff)
• SphereCollisionShape.cc (modified) (1 diff)
• SphereCollisionShape.h (modified) (1 diff)
• WorldEntityCollisionShape.h (modified) (1 diff)

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"