diff options
| author | Andrea Catania <info@andreacatania.com> | 2018-02-16 19:06:00 +0100 |
|---|---|---|
| committer | Andrea Catania <info@andreacatania.com> | 2018-02-20 12:43:47 +0100 |
| commit | 6ed392f47a1970f7815f6f76b7bacfd0bb51b87c (patch) | |
| tree | e380ae9cc66729978344ba74a62b9546439cbdf7 /modules/bullet/space_bullet.h | |
| parent | da612c324cec8c4f6bfcef9b35406ea215e699f6 (diff) | |
| download | redot-engine-6ed392f47a1970f7815f6f76b7bacfd0bb51b87c.tar.gz | |
Improved kinematic body 2D and 3D, Now can move rigid body
Diffstat (limited to 'modules/bullet/space_bullet.h')
| -rw-r--r-- | modules/bullet/space_bullet.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/bullet/space_bullet.h b/modules/bullet/space_bullet.h index 2b97f0b274..a6c2786878 100644 --- a/modules/bullet/space_bullet.h +++ b/modules/bullet/space_bullet.h @@ -172,7 +172,7 @@ public: void update_gravity(); - bool test_body_motion(RigidBodyBullet *p_body, const Transform &p_from, const Vector3 &p_motion, PhysicsServer::MotionResult *r_result); + bool test_body_motion(RigidBodyBullet *p_body, const Transform &p_from, const Vector3 &p_motion, bool p_infinite_inertia, PhysicsServer::MotionResult *r_result); private: void create_empty_world(bool p_create_soft_world); @@ -199,7 +199,7 @@ private: local_shape_most_recovered(0) {} }; - 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); + bool recover_from_penetration(RigidBodyBullet *p_body, const btTransform &p_body_position, btScalar p_recover_movement_scale, bool p_infinite_inertia, 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_recover_movement_scale, btVector3 &r_delta_recover_movement, RecoverResult *r_recover_result = NULL); |