diff options
| author | Paolo Perkovic | 2018-02-01 09:57:10 +0100 |
|---|---|---|
| committer | Paolo Perkovic | 2018-02-01 16:47:20 +0100 |
| commit | 08d4bfacafa8abe435d51a6afecb276030a23280 (patch) | |
| tree | e0d37560439f599958a99dd191b2802039591956 /modules/bullet/space_bullet.h | |
| parent | 2459eebc1d0d679efb546aa5a95ddd493290a7aa (diff) | |
| download | godot-08d4bfacafa8abe435d51a6afecb276030a23280.tar.gz godot-08d4bfacafa8abe435d51a6afecb276030a23280.tar.zst godot-08d4bfacafa8abe435d51a6afecb276030a23280.zip | |
Diffstat (limited to 'modules/bullet/space_bullet.h')
| -rw-r--r-- | modules/bullet/space_bullet.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/bullet/space_bullet.h b/modules/bullet/space_bullet.h index 0aeb407dc..2b97f0b27 100644 --- a/modules/bullet/space_bullet.h +++ b/modules/bullet/space_bullet.h @@ -199,12 +199,12 @@ private: local_shape_most_recovered(0) {} }; - bool recover_from_penetration(RigidBodyBullet *p_body, const btTransform &p_from, btScalar p_recover_movement_scale, btVector3 &r_delta_recover_movement, RecoverResult *r_recover_result = NULL); + bool recover_from_penetration(RigidBodyBullet *p_body, const btTransform &p_body_position, btScalar p_recover_movement_scale, btVector3 &r_delta_recover_movement, RecoverResult *r_recover_result = NULL); /// This is an API that recover a kinematic object from penetration /// This allow only Convex Convex test and it always use GJK algorithm, With this API we don't benefit of Bullet special accelerated functions - bool RFP_convex_convex_test(const btConvexShape *p_shapeA, const btConvexShape *p_shapeB, btCollisionObject *p_objectB, int p_shapeId_B, const btTransform &p_transformA, const btTransform &p_transformB, btScalar p_movement_scale, btVector3 &r_delta_recover_movement, RecoverResult *r_recover_result = NULL); + bool RFP_convex_convex_test(const btConvexShape *p_shapeA, const btConvexShape *p_shapeB, btCollisionObject *p_objectB, int p_shapeId_B, const btTransform &p_transformA, const btTransform &p_transformB, btScalar p_recover_movement_scale, btVector3 &r_delta_recover_movement, RecoverResult *r_recover_result = NULL); /// This is an API that recover a kinematic object from penetration /// Using this we leave Bullet to select the best algorithm, For example GJK in case we have Convex Convex, or a Bullet accelerated algorithm - bool RFP_convex_world_test(const btConvexShape *p_shapeA, const btCollisionShape *p_shapeB, btCollisionObject *p_objectA, btCollisionObject *p_objectB, int p_shapeId_A, int p_shapeId_B, const btTransform &p_transformA, const btTransform &p_transformB, btScalar p_movement_scale, btVector3 &r_delta_recover_movement, RecoverResult *r_recover_result = NULL); + bool RFP_convex_world_test(const btConvexShape *p_shapeA, const btCollisionShape *p_shapeB, btCollisionObject *p_objectA, btCollisionObject *p_objectB, int p_shapeId_A, int p_shapeId_B, const btTransform &p_transformA, const btTransform &p_transformB, btScalar p_recover_movement_scale, btVector3 &r_delta_recover_movement, RecoverResult *r_recover_result = NULL); }; #endif |
