From 28e81111d746480b3cb349125189fabb9efe947d Mon Sep 17 00:00:00 2001 From: "jiaxin.lai" Date: Fri, 23 Jul 2021 16:14:07 +0800 Subject: [PATCH] support ccd (#3757) --- native/cocos/physics/physx/PhysXRigidBody.cpp | 5 +++++ native/cocos/physics/physx/PhysXRigidBody.h | 1 + native/cocos/physics/sdk/RigidBody.cpp | 4 ++++ native/cocos/physics/sdk/RigidBody.h | 1 + native/cocos/physics/spec/IBody.h | 3 ++- 5 files changed, 13 insertions(+), 1 deletion(-) diff --git a/native/cocos/physics/physx/PhysXRigidBody.cpp b/native/cocos/physics/physx/PhysXRigidBody.cpp index 1619125cc5..e520ee0066 100644 --- a/native/cocos/physics/physx/PhysXRigidBody.cpp +++ b/native/cocos/physics/physx/PhysXRigidBody.cpp @@ -99,6 +99,11 @@ void PhysXRigidBody::useGravity(bool v) { getSharedBody().getImpl().rigidDynamic->setActorFlag(PxActorFlag::eDISABLE_GRAVITY, !v); } +void PhysXRigidBody::useCCD(bool v) { + if (getSharedBody().isStatic()) return; + getSharedBody().getImpl().rigidDynamic->setRigidBodyFlag(physx::PxRigidBodyFlag::eENABLE_CCD, v); +} + void PhysXRigidBody::setLinearFactor(float x, float y, float z) { if (getSharedBody().isStatic()) return; getSharedBody().getImpl().rigidDynamic->setRigidDynamicLockFlag(physx::PxRigidDynamicLockFlag::eLOCK_LINEAR_X, x == 0.); diff --git a/native/cocos/physics/physx/PhysXRigidBody.h b/native/cocos/physics/physx/PhysXRigidBody.h index 9cd763ed6f..9f7d9f5a5d 100644 --- a/native/cocos/physics/physx/PhysXRigidBody.h +++ b/native/cocos/physics/physx/PhysXRigidBody.h @@ -53,6 +53,7 @@ public: void setLinearDamping(float v) override; void setAngularDamping(float v) override; void useGravity(bool v) override; + void useCCD(bool v) override; void setLinearFactor(float x, float y, float z) override; void setAngularFactor(float x, float y, float z) override; void setAllowSleep(bool v) override; diff --git a/native/cocos/physics/sdk/RigidBody.cpp b/native/cocos/physics/sdk/RigidBody.cpp index 698a42df5b..7d1a25046f 100644 --- a/native/cocos/physics/sdk/RigidBody.cpp +++ b/native/cocos/physics/sdk/RigidBody.cpp @@ -82,6 +82,10 @@ void RigidBody::setAngularDamping(float v) { _impl->setAngularDamping(v); } +void RigidBody::useCCD(bool v) { + _impl->useCCD(v); +} + void RigidBody::useGravity(bool v) { _impl->useGravity(v); } diff --git a/native/cocos/physics/sdk/RigidBody.h b/native/cocos/physics/sdk/RigidBody.h index becd1efbd5..d438d2e928 100644 --- a/native/cocos/physics/sdk/RigidBody.h +++ b/native/cocos/physics/sdk/RigidBody.h @@ -48,6 +48,7 @@ public: void setLinearDamping(float v) override; void setAngularDamping(float v) override; void useGravity(bool v) override; + void useCCD(bool v) override; void setLinearFactor(float x, float y, float z) override; void setAngularFactor(float x, float y, float z) override; void setAllowSleep(bool v) override; diff --git a/native/cocos/physics/spec/IBody.h b/native/cocos/physics/spec/IBody.h index 2719a0fc65..4011a46ce1 100644 --- a/native/cocos/physics/spec/IBody.h +++ b/native/cocos/physics/spec/IBody.h @@ -50,7 +50,8 @@ public: virtual void setMass(float v) = 0; virtual void setLinearDamping(float v) = 0; virtual void setAngularDamping(float v) = 0; - virtual void useGravity(bool v) = 0; + virtual void useGravity(bool v) = 0; + virtual void useCCD(bool v) = 0; virtual void setLinearFactor(float x, float y, float z) = 0; virtual void setAngularFactor(float x, float y, float z) = 0; virtual void setAllowSleep(bool v) = 0;