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

Fix build issues

Browse Source
This commit is contained in:
Wojtek Figat
2022-06-13 23:37:11 +02:00
parent 4967b27ff7
commit b815ba51a5
12 changed files with 142 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Engine/Physics/PhysX/PhysicsBackendPhysX.cpp
View File

@@ -1999,7 +1999,10 @@ bool PhysicsBackend::ComputeShapesPenetration(void* shapeA, void* shapeB, const
auto shapeBPhysX = (PxShape*)shapeB;
const PxTransform poseA(C2P(positionA), C2P(orientationA));
const PxTransform poseB(C2P(positionB), C2P(orientationB));
return PxGeometryQuery::computePenetration(C2P(direction), distance, shapeAPhysX->getGeometry().any(), poseA, shapeBPhysX->getGeometry().any(), poseB);
PxVec3 dir = C2P(direction);
const bool result = PxGeometryQuery::computePenetration(dir, distance, shapeAPhysX->getGeometry().any(), poseA, shapeBPhysX->getGeometry().any(), poseB);
direction = P2C(dir);
return result;
}
float PhysicsBackend::ComputeShapeSqrDistanceToPoint(void* shape, const Vector3& position, const Quaternion& orientation, const Vector3& point, Vector3* closestPoint)
@@ -2063,7 +2066,12 @@ void PhysicsBackend::GetJointForce(void* joint, Vector3& linear, Vector3& angula
{
auto jointPhysX = (PxJoint*)joint;
if (jointPhysX->getConstraint())
jointPhysX->getConstraint()->getForce(*(PxVec3*)&linear, *(PxVec3*)&angular);
{
PxVec3 linearPhysX = C2P(linear), angularPhysX = C2P(angular);
jointPhysX->getConstraint()->getForce(linearPhysX, angularPhysX);
linear = P2C(linearPhysX);
angular = P2C(angularPhysX);
}
}
void* PhysicsBackend::CreateFixedJoint(const PhysicsJointDesc& desc)