diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-05-02 18:03:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-02 18:03:58 +0200 |
| commit | 262924296b08b9065816e68e756a42c3963fa1ed (patch) | |
| tree | 96dc50fe3e12f479142777df354e16504f93f8a3 /modules/bullet/space_bullet.h | |
| parent | a2213bfb601dd104179ec69c6103d735202371a9 (diff) | |
| parent | 6dd65c0d67960b0f0b26a24bd2f10fe8d54aa37a (diff) | |
Merge pull request #27415 from aqnuep/kinematicbody_fixes
KinematicBody performance and quality improvements
Diffstat (limited to 'modules/bullet/space_bullet.h')
| -rw-r--r-- | modules/bullet/space_bullet.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/bullet/space_bullet.h b/modules/bullet/space_bullet.h index 7bf6a216b5..6b3d65edf6 100644 --- a/modules/bullet/space_bullet.h +++ b/modules/bullet/space_bullet.h @@ -212,7 +212,7 @@ private: /// 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_recover_movement_scale, btVector3 &r_delta_recover_movement, RecoverResult *r_recover_result = NULL); - void convert_to_separation_result(PhysicsServer::SeparationResult *r_result, const SpaceBullet::RecoverResult &p_recover_result, int p_shape_id, const btCollisionObject *p_other_object) const; + int add_separation_result(PhysicsServer::SeparationResult *r_results, const SpaceBullet::RecoverResult &p_recover_result, int p_shape_id, const btCollisionObject *p_other_object) const; int recover_from_penetration_ray(RigidBodyBullet *p_body, const btTransform &p_body_position, btScalar p_recover_movement_scale, bool p_infinite_inertia, int p_result_max, btVector3 &r_delta_recover_movement, PhysicsServer::SeparationResult *r_results); }; #endif |