diff --git a/examples/SharedMemory/PhysicsServerCommandProcessor.cpp b/examples/SharedMemory/PhysicsServerCommandProcessor.cpp index 33b788dcc..0c611326f 100644 --- a/examples/SharedMemory/PhysicsServerCommandProcessor.cpp +++ b/examples/SharedMemory/PhysicsServerCommandProcessor.cpp @@ -7483,8 +7483,7 @@ bool PhysicsServerCommandProcessor::processRequestActualStateCommand(const struc body->m_rootLocalInertialFrame.getRotation()[3]; btVector3 center_of_mass(sb->getCenterOfMass()); - sb->updateTransform(); - btTransform tr = sb->getWorldTransform(); + btTransform tr = sb->getRigidTransform(); //base position in world space, cartesian stateDetails->m_actualStateQ[0] = center_of_mass[0]; stateDetails->m_actualStateQ[1] = center_of_mass[1]; diff --git a/src/BulletSoftBody/btSoftBody.cpp b/src/BulletSoftBody/btSoftBody.cpp index 5cbcb427e..1df826b05 100644 --- a/src/BulletSoftBody/btSoftBody.cpp +++ b/src/BulletSoftBody/btSoftBody.cpp @@ -1033,12 +1033,6 @@ void btSoftBody::setAngularVelocity(const btVector3& angVel) } } -// -void btSoftBody::updateTransform() -{ - setWorldTransform(getRigidTransform()); -} - // btTransform btSoftBody::getRigidTransform() { diff --git a/src/BulletSoftBody/btSoftBody.h b/src/BulletSoftBody/btSoftBody.h index 5ea0afecf..3905f5066 100644 --- a/src/BulletSoftBody/btSoftBody.h +++ b/src/BulletSoftBody/btSoftBody.h @@ -163,17 +163,17 @@ public: RVSmask = 0x000f, ///Rigid versus soft mask SDF_RS = 0x0001, ///SDF based rigid vs soft CL_RS = 0x0002, ///Cluster vs convex rigid vs soft - SDF_RD = 0x0004, ///SDF based rigid vs deformable + SDF_RD = 0x0004, ///SDF based rigid vs deformable SVSmask = 0x00f0, ///Rigid versus soft mask VF_SS = 0x00100, ///Vertex vs face soft vs soft handling CL_SS = 0x00200, ///Cluster vs cluster soft vs soft handling CL_SELF = 0x0040, ///Cluster soft body self collision - VF_DD = 0x0080, ///Vertex vs face soft vs soft handling - - RVDFmask = 0x0f00, /// Rigid versus deformable face mask - SDF_RDF = 0x0100, /// SDF based Rigid vs. deformable face - SDF_MDF = 0x0200, /// SDF based Multibody vs. deformable face + VF_DD = 0x0080, ///Vertex vs face soft vs soft handling + + RVDFmask = 0x0f00, /// Rigid versus deformable face mask + SDF_RDF = 0x0100, /// SDF based Rigid vs. deformable face + SDF_MDF = 0x0200, /// SDF based Multibody vs. deformable face /* presets */ Default = SDF_RS, END @@ -967,8 +967,6 @@ public: void setLinearVelocity(const btVector3& linVel); /* Set the angular velocity of the center of mass */ void setAngularVelocity(const btVector3& angVel); - /* Update the world transform to the best fit rigid transform */ - void updateTransform(); /* Get best fit rigid transform */ btTransform getRigidTransform(); /* Transform to given pose */