GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Add proper vehicle setup after editing wheel colliders

Browse Source
This commit is contained in:
Wojtek Figat
2021-03-26 17:11:26 +01:00
parent 2ce14b5e9c
commit e21c9d24de
6 changed files with 60 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Source/Engine/Physics/Colliders/Collider.cpp
View File

@@ -170,19 +170,7 @@ bool Collider::ComputePenetration(const Collider* colliderA, const Collider* col
const PxTransform poseA(C2P(colliderA->GetPosition()), C2P(colliderA->GetOrientation()));
const PxTransform poseB(C2P(colliderB->GetPosition()), C2P(colliderB->GetOrientation()));
return PxGeometryQuery::computePenetration(
C2P(direction),
distance,
shapeA->getGeometry().any(),
poseA,
shapeB->getGeometry().any(),
poseB
);
}
bool Collider::IsAttached() const
{
return _shape && _shape->getActor() != nullptr;
return PxGeometryQuery::computePenetration(C2P(direction), distance, shapeA->getGeometry().any(), poseA, shapeB->getGeometry().any(), poseB);
}
bool Collider::CanAttach(RigidBody* rigidBody) const
@@ -442,15 +430,18 @@ void Collider::BeginPlay(SceneBeginData* data)
void Collider::EndPlay()
{
// Base
PhysicsColliderActor::EndPlay();
if (_shape)
{
// Detach from the actor
auto actor = _shape->getActor();
if (actor)
actor->detachShape(*_shape);
// Check if was using a static actor and cleanup it
if (_staticActor)
if (actor && actor->is<PxRigidDynamic>())
static_cast<RigidBody*>(actor->userData)->OnColliderChanged(this);
else if (_staticActor)
{
RemoveStaticActor();
}
@@ -460,9 +451,6 @@ void Collider::EndPlay()
_shape->release();
_shape = nullptr;
}
// Base
PhysicsColliderActor::EndPlay();
}
void Collider::OnActiveInTreeChanged()
@@ -479,11 +467,7 @@ void Collider::OnActiveInTreeChanged()
auto rigidBody = GetAttachedRigidBody();
if (rigidBody)
{
rigidBody->UpdateMass();
// TODO: maybe wake up only if one ore more shapes attached is active?
//if (rigidBody->GetStartAwake())
// rigidBody->WakeUp();
rigidBody->OnColliderChanged(this);
}
}
}
@@ -500,6 +484,8 @@ void Collider::OnParentChanged()
auto actor = _shape->getActor();
if (actor)
actor->detachShape(*_shape);
if (actor && actor->is<PxRigidDynamic>())
static_cast<RigidBody*>(actor->userData)->OnColliderChanged(this);
// Check if the new parent is a rigidbody
const auto rigidBody = dynamic_cast<RigidBody*>(GetParent());