Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 11:45:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove motors from constraints

Browse source
This commit is contained in:
Seth Alves 2017-04-29 15:46:04 -07:00
parent 41f699ec9b
commit 8f2fc24885
3 changed files with 1 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/physics/src/ObjectConstraintHinge.h
View file

@ -67,7 +67,6 @@ protected:
// limits. A low value will make the the limits more spongy.
float _maxImpulse { 1.0f };
float _softness { 0.9f };
float _biasFactor { 0.3f };
float _relaxationFactor { 1.0f };

77
libraries/physics/src/ObjectConstraintSlider.cpp
View file

@ -146,13 +146,6 @@ bool ObjectConstraintSlider::updateArguments(QVariantMap arguments) {
float linearHigh;
float angularLow;
float angularHigh;
float linearTarget;
float linearTimeScale;
bool linearTargetSet;
float angularTarget;
float angularTimeScale;
bool angularTargetSet;
bool needUpdate = false;
bool somethingChanged = ObjectDynamic::updateArguments(arguments);
@ -212,44 +205,6 @@ bool ObjectConstraintSlider::updateArguments(QVariantMap arguments) {
angularHigh = _angularHigh;
}
ok = true;
linearTarget = EntityDynamicInterface::extractFloatArgument("slider constraint", arguments,
"linearTarget", ok, false);
if (!ok) {
linearTarget = _linearTarget;
linearTargetSet = _linearTargetSet;
} else {
linearTargetSet = true;
}
ok = true;
linearTimeScale = EntityDynamicInterface::extractFloatArgument("slider constraint", arguments,
"linearTimeScale", ok, false);
if (!ok) {
linearTimeScale = _linearTimeScale;
}
ok = true;
angularTarget = EntityDynamicInterface::extractFloatArgument("slider constraint", arguments,
"angularTarget", ok, false);
if (!ok) {
angularTarget = _angularTarget;
angularTargetSet = _angularTargetSet;
} else {
angularTargetSet = true;
}
ok = true;
angularTimeScale = EntityDynamicInterface::extractFloatArgument("slider constraint", arguments,
"angularTimeScale", ok, false);
if (!ok) {
angularTimeScale = _angularTimeScale;
}
if (somethingChanged ||
pointInA != _pointInA ||
axisInA != _axisInA ||
@ -259,13 +214,7 @@ bool ObjectConstraintSlider::updateArguments(QVariantMap arguments) {
linearLow != _linearLow ||
linearHigh != _linearHigh ||
angularLow != _angularLow ||
angularHigh != _angularHigh ||
linearTarget != _linearTarget ||
linearTimeScale != _linearTimeScale ||
linearTargetSet != _linearTargetSet ||
angularTarget != _angularTarget ||
angularTimeScale != _angularTimeScale ||
angularTargetSet != _angularTargetSet) {
angularHigh != _angularHigh) {
// something changed
needUpdate = true;
}
@ -282,12 +231,6 @@ bool ObjectConstraintSlider::updateArguments(QVariantMap arguments) {
_linearHigh = linearHigh;
_angularLow = angularLow;
_angularHigh = angularHigh;
_linearTarget = linearTarget;
_linearTimeScale = linearTimeScale;
_linearTargetSet = linearTargetSet;
_angularTarget = angularTarget;
_angularTimeScale = angularTimeScale;
_angularTargetSet = angularTargetSet;
_active = true;
@ -317,12 +260,6 @@ QVariantMap ObjectConstraintSlider::getArguments() {
arguments["linearHigh"] = _linearHigh;
arguments["angularLow"] = _angularLow;
arguments["angularHigh"] = _angularHigh;
arguments["linearTarget"] = _linearTarget;
arguments["linearTimeScale"] = _linearTimeScale;
arguments["linearTargetSet"] = _linearTargetSet;
arguments["angularTarget"] = _angularTarget;
arguments["angularTimeScale"] = _angularTimeScale;
arguments["angularTargetSet"] = _angularTargetSet;
arguments["linearPosition"] = static_cast<btSliderConstraint*>(_constraint)->getLinearPos();
arguments["angularPosition"] = static_cast<btSliderConstraint*>(_constraint)->getAngularPos();
}
@ -351,12 +288,6 @@ QByteArray ObjectConstraintSlider::serialize() const {
dataStream << _linearHigh;
dataStream << _angularLow;
dataStream << _angularHigh;
dataStream << _linearTarget;
dataStream << _linearTimeScale;
dataStream << _linearTargetSet;
dataStream << _angularTarget;
dataStream << _angularTimeScale;
dataStream << _angularTargetSet;
});
return serializedConstraintArguments;
@ -395,12 +326,6 @@ void ObjectConstraintSlider::deserialize(QByteArray serializedArguments) {
dataStream >> _linearHigh;
dataStream >> _angularLow;
dataStream >> _angularHigh;
dataStream >> _linearTarget;
dataStream >> _linearTimeScale;
dataStream >> _linearTargetSet;
dataStream >> _angularTarget;
dataStream >> _angularTimeScale;
dataStream >> _angularTargetSet;
_active = true;
});

9
libraries/physics/src/ObjectConstraintSlider.h
View file

@ -49,15 +49,6 @@ protected:
float _angularLow { -TWO_PI };
float _angularHigh { TWO_PI };
float _linearTarget { 0.0f };
float _linearTimeScale { 0.0f };
bool _linearTargetSet { false };
float _angularTarget { 0.0f };
float _angularTimeScale { 0.0f };
bool _angularTargetSet { false };
};
#endif // hifi_ObjectConstraintSlider_h