diff options
author | Erwin Coumans <blender@erwincoumans.com> | 2006-04-07 00:37:38 +0400 |
---|---|---|
committer | Erwin Coumans <blender@erwincoumans.com> | 2006-04-07 00:37:38 +0400 |
commit | 84d27d74cbc0f183cf54bb3b8df213877158c3c6 (patch) | |
tree | b322cae4841e0dd4066cd87e5b9627d57aecc9cd /source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h | |
parent | 2be9d80b5ad01c2c81babfbd1769e0740650d481 (diff) |
added hinge constraint support to Bullet physics
Diffstat (limited to 'source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h')
-rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h index 46a240056fc..311e74eaad8 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h +++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h @@ -8,7 +8,8 @@ class CcdPhysicsController; -class Point2PointConstraint; +class TypedConstraint; + class CollisionDispatcher; class Dispatcher; //#include "BroadphaseInterface.h" @@ -90,12 +91,14 @@ class CcdPhysicsEnvironment : public PHY_IPhysicsEnvironment //complex constraint for vehicles virtual PHY_IVehicle* getVehicleConstraint(int constraintId); #else - virtual PHY_IVehicle* getVehicleConstraint(int constraintId) + virtual class PHY_IVehicle* getVehicleConstraint(int constraintId) { return 0; } #endif //NEW_BULLET_VEHICLE_SUPPORT + TypedConstraint* getConstraintById(int constraintId); + virtual PHY_IPhysicsController* rayTest(PHY_IPhysicsController* ignoreClient, float fromX,float fromY,float fromZ, float toX,float toY,float toZ, float& hitX,float& hitY,float& hitZ,float& normalX,float& normalY,float& normalZ); @@ -137,6 +140,8 @@ class CcdPhysicsEnvironment : public PHY_IPhysicsEnvironment const PersistentManifold* GetManifold(int index) const; + std::vector<TypedConstraint*> m_constraints; + private: @@ -144,7 +149,7 @@ class CcdPhysicsEnvironment : public PHY_IPhysicsEnvironment std::vector<CcdPhysicsController*> m_controllers; - std::vector<Point2PointConstraint*> m_p2pConstraints; + std::vector<WrapperVehicle*> m_wrapperVehicles; |