Changeset 2445 for code/branches/physics_merge/src

Timestamp:

Dec 14, 2008, 7:06:12 PM (16 years ago)

Author:

rgrieder

Message:

Small adjustments due to the merge.

Location:

code/branches/physics_merge/src/orxonox

Files:

• OrxonoxPrereqs.h (modified) (1 diff)
• OrxonoxStableHeaders.h (modified) (2 diffs)
• objects/collisionshapes/CollisionShape.cc (modified) (1 diff)
• objects/collisionshapes/CollisionShape.h (modified) (1 diff)
• objects/collisionshapes/CompoundCollisionShape.cc (modified) (1 diff)
• objects/collisionshapes/PlaneCollisionShape.cc (modified) (1 diff)
• objects/collisionshapes/PlaneCollisionShape.h (modified) (1 diff)

code/branches/physics_merge/src/orxonox/OrxonoxPrereqs.h

@@ -232 +232 @@
 
 class btDiscreteDynamicsWorld;
+class bt32BitAxisSweep3;
+class btDefaultCollisionConfiguration;
+class btCollisionDispatcher;
+class btSequentialImpulseConstraintSolver;
 
 // lua

code/branches/physics_merge/src/orxonox/OrxonoxStableHeaders.h

@@ -47 +47 @@
 #include <Ogre.h>
 #include <CEGUI.h>
-#include "ois/OIS.h"
-//#include "btBulletCollisionCommon.h"
-//#include "btBulletDynamicsCommon.h"
 #include <boost/thread/recursive_mutex.hpp>
 //#include <boost/thread/mutex.hpp>
@@ -55 +52 @@
 //#include <boost/thread/thread.hpp>
 #include <boost/static_assert.hpp>
+
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include "ois/OIS.h"
 #include "tinyxml/ticpp.h"
 #include "tinyxml/tinyxml.h"

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

@@ -50 +50 @@
 
         this->parent_ = 0;
-        this->parentID_ = (unsigned int)-1;
+        this->parentID_ = OBJECTID_UNKNOWN;
         this->collisionShape_ = 0;
         this->position_ = Vector3::ZERO;

code/branches/physics_merge/src/orxonox/objects/collisionshapes/CollisionShape.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
-#include "LinearMath/btVector3.h"
 #include "util/Math.h"
 #include "core/BaseObject.h"

code/branches/physics_merge/src/orxonox/objects/collisionshapes/CompoundCollisionShape.cc

@@ -94 +94 @@
         if (this->childShapes_.find(shape) != this->childShapes_.end())
         {
-            shape->setParent(0, (unsigned int)-1);
+            shape->setParent(0, OBJECTID_UNKNOWN);
             this->childShapes_.erase(shape);
             if (shape->getCollisionShape())

code/branches/physics_merge/src/orxonox/objects/collisionshapes/PlaneCollisionShape.cc

@@ -29 +29 @@
 #include "OrxonoxStableHeaders.h"
 #include "PlaneCollisionShape.h"
+
+#include "BulletCollision/CollisionShapes/btStaticPlaneShape.h"
 
 #include "core/CoreIncludes.h"

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

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
-#include "BulletCollision/CollisionShapes/btStaticPlaneShape.h"
 #include "CollisionShape.h"