diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2018-02-20 15:41:10 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-20 15:41:10 +0100 |
commit | 497a4e9e25fb8cc9d3a95bc79b605aca79603648 (patch) | |
tree | 510a2147ed95a8aa8b322d8587b23fcece12e4a0 /modules/bullet/godot_result_callbacks.h | |
parent | ae8e8b2bc21ebd678a7513c7b413d8e9c57680d8 (diff) | |
parent | 6ed392f47a1970f7815f6f76b7bacfd0bb51b87c (diff) |
Merge pull request #16757 from AndreaCatania/kinpush
Improved kinematic body, Now can move rigid body
Diffstat (limited to 'modules/bullet/godot_result_callbacks.h')
-rw-r--r-- | modules/bullet/godot_result_callbacks.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/bullet/godot_result_callbacks.h b/modules/bullet/godot_result_callbacks.h index e1b0b1b421..ed6d4b7d6d 100644 --- a/modules/bullet/godot_result_callbacks.h +++ b/modules/bullet/godot_result_callbacks.h @@ -93,12 +93,12 @@ public: struct GodotKinClosestConvexResultCallback : public btCollisionWorld::ClosestConvexResultCallback { public: const RigidBodyBullet *m_self_object; - const bool m_ignore_areas; + const bool m_infinite_inertia; - GodotKinClosestConvexResultCallback(const btVector3 &convexFromWorld, const btVector3 &convexToWorld, const RigidBodyBullet *p_self_object, bool p_ignore_areas) : + GodotKinClosestConvexResultCallback(const btVector3 &convexFromWorld, const btVector3 &convexToWorld, const RigidBodyBullet *p_self_object, bool p_infinite_inertia) : btCollisionWorld::ClosestConvexResultCallback(convexFromWorld, convexToWorld), m_self_object(p_self_object), - m_ignore_areas(p_ignore_areas) {} + m_infinite_inertia(p_infinite_inertia) {} virtual bool needsCollision(btBroadphaseProxy *proxy0) const; }; |