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

cleanups

Browse source
This commit is contained in:
Seth Alves 2015-10-19 16:53:27 -07:00
parent bddbe89c86
commit 41f7ef1e2e
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
examples/controllers/handControllerGrab.js
View file

@ -497,8 +497,7 @@ function MyController(hand, triggerAction) {
timeScale: NEAR_GRABBING_ACTION_TIMEFRAME, timeScale: NEAR_GRABBING_ACTION_TIMEFRAME,
relativePosition: this.offsetPosition, relativePosition: this.offsetPosition,
relativeRotation: this.offsetRotation, relativeRotation: this.offsetRotation,
lifetime: ACTION_LIFETIME, lifetime: ACTION_LIFETIME
// kinematic: true,
}); });
if (this.actionID === NULL_ACTION_ID) { if (this.actionID === NULL_ACTION_ID) {
this.actionID = null; this.actionID = null;
@ -550,8 +549,7 @@ function MyController(hand, triggerAction) {
timeScale: NEAR_GRABBING_ACTION_TIMEFRAME, timeScale: NEAR_GRABBING_ACTION_TIMEFRAME,
relativePosition: this.offsetPosition, relativePosition: this.offsetPosition,
relativeRotation: this.offsetRotation, relativeRotation: this.offsetRotation,
lifetime: ACTION_LIFETIME, lifetime: ACTION_LIFETIME
// kinematic: true
}); });
this.actionTimeout = now + (ACTION_LIFETIME * MSEC_PER_SEC); this.actionTimeout = now + (ACTION_LIFETIME * MSEC_PER_SEC);
} }

2
interface/src/avatar/AvatarActionHold.cpp
View file

@ -175,7 +175,7 @@ bool AvatarActionHold::updateArguments(QVariantMap arguments) {
ok = true; ok = true;
kinematicSetVelocity = EntityActionInterface::extractBooleanArgument("hold", arguments, kinematicSetVelocity = EntityActionInterface::extractBooleanArgument("hold", arguments,
"kinematic-set-velocity", ok, false); "kinematicSetVelocity", ok, false);
if (!ok) { if (!ok) {
_kinematicSetVelocity = false; _kinematicSetVelocity = false;
} }