Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-17 22:08:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix incomplete transition from far-grabbing entity to grabbing tablet

Browse source
This commit is contained in:
David Rowe 2018-06-09 11:32:10 +12:00
parent dc46c2077d
commit 54b96cd602
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scripts/system/controllers/controllerModules/farActionGrabEntity.js
View file

@ -430,10 +430,11 @@ Script.include("/~/system/libraries/Xform.js");
}
if (this.actionID) {
// if we are doing a distance grab and the object gets close enough to the controller,
// if we are doing a distance grab and the object or tablet gets close enough to the controller,
// stop the far-grab so the near-grab or equip can take over.
for (var k = 0; k < nearGrabReadiness.length; k++) {
if (nearGrabReadiness[k].active && nearGrabReadiness[k].targets[0] === this.grabbedThingID) {
if (nearGrabReadiness[k].active && (nearGrabReadiness[k].targets[0] === this.grabbedThingID
|| HMD.tabletID && nearGrabReadiness[k].targets[0] === HMD.tabletID)) {
this.endFarGrabAction();
return makeRunningValues(false, [], []);
}