Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 18:50:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanups

Browse source
This commit is contained in:
Seth Alves 2017-04-12 07:25:23 -07:00
parent 53cb192af1
commit 9f252f04e7
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -51,12 +51,12 @@ btTypedConstraint* ObjectConstraintHinge::getConstraint() {
btTransform rigidBodyAFrame(btQuaternion(0.0f, 0.0f, 0.0f, 1.0f), glmToBullet(_pivotInA)); btTransform rigidBodyAFrame(btQuaternion(0.0f, 0.0f, 0.0f, 1.0f), glmToBullet(_pivotInA));
btHingeConstraint* constraint = new btHingeConstraint(*rigidBodyA, rigidBodyAFrame, useReferenceFrameA); btHingeConstraint* constraint = new btHingeConstraint(*rigidBodyA, rigidBodyAFrame, useReferenceFrameA);
_constraint = constraint;
// constraint->setAngularOnly(true); // constraint->setAngularOnly(true);
btVector3 axisInA = glmToBullet(_axis); btVector3 axisInA = glmToBullet(_axis);
constraint->setAxis(axisInA); constraint->setAxis(axisInA);
_constraint = constraint;
return constraint; return constraint;
} }
@ -66,7 +66,7 @@ bool ObjectConstraintHinge::updateArguments(QVariantMap arguments) {
glm::vec3 axis; glm::vec3 axis;
bool needUpdate = false; bool needUpdate = false;
bool somethingChanged = ObjectConstraint::updateArguments(arguments); bool somethingChanged = ObjectDynamic::updateArguments(arguments);
withReadLock([&]{ withReadLock([&]{
bool ok = true; bool ok = true;
pivotInA = EntityDynamicInterface::extractVec3Argument("hinge constraint", arguments, "pivot", ok, false); pivotInA = EntityDynamicInterface::extractVec3Argument("hinge constraint", arguments, "pivot", ok, false);
@ -107,7 +107,7 @@ bool ObjectConstraintHinge::updateArguments(QVariantMap arguments) {
} }
QVariantMap ObjectConstraintHinge::getArguments() { QVariantMap ObjectConstraintHinge::getArguments() {
QVariantMap arguments = ObjectConstraint::getArguments(); QVariantMap arguments = ObjectDynamic::getArguments();
withReadLock([&] { withReadLock([&] {
arguments["pivot"] = glmToQMap(_pivotInA); arguments["pivot"] = glmToQMap(_pivotInA);
arguments["axis"] = glmToQMap(_axis); arguments["axis"] = glmToQMap(_axis);