From 74b64a27f8e07b1b0b47b809b1a060518fa11a97 Mon Sep 17 00:00:00 2001 From: Bryan Galdrikian Date: Fri, 3 May 2019 00:25:46 -0700 Subject: Blast SDK 1.1.5 prerelease #1 --- .../physx/source/physics/NvBlastExtPxStressSolverImpl.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'sdk/extensions/physx/source/physics/NvBlastExtPxStressSolverImpl.cpp') diff --git a/sdk/extensions/physx/source/physics/NvBlastExtPxStressSolverImpl.cpp b/sdk/extensions/physx/source/physics/NvBlastExtPxStressSolverImpl.cpp index b18df25..308c4ae 100755 --- a/sdk/extensions/physx/source/physics/NvBlastExtPxStressSolverImpl.cpp +++ b/sdk/extensions/physx/source/physics/NvBlastExtPxStressSolverImpl.cpp @@ -37,6 +37,8 @@ #include "NvBlastTkActor.h" #include "NvBlastTkFamily.h" +#include "NvBlastPxSharedHelpers.h" + #include "PxScene.h" #include "PxRigidDynamic.h" @@ -130,7 +132,7 @@ ExtPxStressSolverImpl::ExtPxStressSolverImpl(ExtPxFamily& family, ExtStressSolve localPos = PxVec3(PxZero); isChunkStatic = true; } - m_solver->setNodeInfo(node0, mass, volume, localPos, isChunkStatic); + m_solver->setNodeInfo(node0, mass, volume, fromPxShared(localPos), isChunkStatic); } #else m_solver->setAllNodesInfoFromLL(); @@ -182,13 +184,13 @@ void ExtPxStressSolverImpl::update(bool doDamage) PxVec3 gravity = rigidDynamic.getScene()->getGravity(); PxVec3 localGravity = rigidDynamic.getGlobalPose().rotateInv(gravity); - m_solver->addGravityForce(*actor->getTkActor().getActorLL(), localGravity); + m_solver->addGravityForce(*actor->getTkActor().getActorLL(), fromPxShared(localGravity)); } else { PxVec3 localCenterMass = rigidDynamic.getCMassLocalPose().p; PxVec3 localAngularVelocity = rigidDynamic.getGlobalPose().rotateInv(rigidDynamic.getAngularVelocity()); - m_solver->addAngularVelocity(*actor->getTkActor().getActorLL(), localCenterMass, localAngularVelocity); + m_solver->addAngularVelocity(*actor->getTkActor().getActorLL(), fromPxShared(localCenterMass), fromPxShared(localAngularVelocity)); } } -- cgit v1.2.3