Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 12:29:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

make sure new constraint data gets transmitted over network

Browse source
This commit is contained in:
Seth Alves 2017-04-14 16:25:27 -07:00
parent 708008d8a5
commit f08fecbfa7
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/physics/src/ObjectConstraintHinge.cpp
View file

@ -115,6 +115,10 @@ btTypedConstraint* ObjectConstraintHinge::getConstraint() {
_constraint = constraint; _constraint = constraint;
}); });
// if we don't wake up rigidBodyA, we may not send the dynamicData property over the network
forceBodyNonStatic();
activateBody();
return constraint; return constraint;
} }

3
libraries/physics/src/PhysicsEngine.cpp
View file

@ -625,6 +625,9 @@ bool PhysicsEngine::addDynamic(EntityDynamicPointer dynamic) {
void PhysicsEngine::removeDynamic(const QUuid dynamicID) { void PhysicsEngine::removeDynamic(const QUuid dynamicID) {
if (_objectDynamics.contains(dynamicID)) { if (_objectDynamics.contains(dynamicID)) {
ObjectDynamicPointer dynamic = std::static_pointer_cast<ObjectDynamic>(_objectDynamics[dynamicID]); ObjectDynamicPointer dynamic = std::static_pointer_cast<ObjectDynamic>(_objectDynamics[dynamicID]);
if (!dynamic) {
return;
}
QList<btRigidBody*> rigidBodies = dynamic->getRigidBodies(); QList<btRigidBody*> rigidBodies = dynamic->getRigidBodies();
if (dynamic->isAction()) { if (dynamic->isAction()) {
ObjectAction* objectAction = static_cast<ObjectAction*>(dynamic.get()); ObjectAction* objectAction = static_cast<ObjectAction*>(dynamic.get());