Changeset 5730 for code/branches/libraries2/src/modules/objects/collisionshapes

Timestamp:

Aug 31, 2009, 10:38:48 PM (15 years ago)

Author:

landauf

Message:

Added CMakeLists, ObjectsPrereqs.h and _ObjectsExport
Changed Paths in the files of the objects module
Compiles now again

Btw, I had to link the objects module into the weaponsystem module because the projectile is hardcoded at the moment and therefore needs a collision shape. This will be changed somewhen in the future.

Location:

code/branches/libraries2/src/modules/objects/collisionshapes

Files:

• BoxCollisionShape.h (modified) (1 diff)
• CMakeLists.txt (added)
• ConeCollisionShape.h (modified) (1 diff)
• PlaneCollisionShape.h (modified) (1 diff)
• SphereCollisionShape.h (modified) (1 diff)

code/branches/libraries2/src/modules/objects/collisionshapes/BoxCollisionShape.h

@@ -30 +30 @@
 #define _BoxCollisionShape_H__
 
-#include "OrxonoxPrereqs.h"
+#include "objects/ObjectsPrereqs.h"
 
 #include "util/Math.h"
-#include "CollisionShape.h"
+#include "objects/collisionshapes/CollisionShape.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport BoxCollisionShape : public CollisionShape
+    class _ObjectsExport BoxCollisionShape : public CollisionShape
     {
         public:

code/branches/libraries2/src/modules/objects/collisionshapes/ConeCollisionShape.h

@@ -30 +30 @@
 #define _ConeCollisionShape_H__
 
-#include "OrxonoxPrereqs.h"
-#include "CollisionShape.h"
+#include "objects/ObjectsPrereqs.h"
+#include "objects/collisionshapes/CollisionShape.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport ConeCollisionShape : public CollisionShape
+    class _ObjectsExport ConeCollisionShape : public CollisionShape
     {
         public:

code/branches/libraries2/src/modules/objects/collisionshapes/PlaneCollisionShape.h

@@ -30 +30 @@
 #define _PlaneCollisionShape_H__
 
-#include "OrxonoxPrereqs.h"
+#include "objects/ObjectsPrereqs.h"
 
 #include "util/Math.h"
-#include "CollisionShape.h"
+#include "objects/collisionshapes/CollisionShape.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport PlaneCollisionShape : public CollisionShape
+    class _ObjectsExport PlaneCollisionShape : public CollisionShape
     {
         public:

code/branches/libraries2/src/modules/objects/collisionshapes/SphereCollisionShape.h

@@ -30 +30 @@
 #define _SphereCollisionShape_H__
 
-#include "OrxonoxPrereqs.h"
-#include "CollisionShape.h"
+#include "objects/ObjectsPrereqs.h"
+#include "objects/collisionshapes/CollisionShape.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport SphereCollisionShape : public CollisionShape
+    class _ObjectsExport SphereCollisionShape : public CollisionShape
     {
         public: