Showing the changes to scripts/system/controllers/controllerModules (1 of 1 file). Show all
Unified · Split
| @@ -282,7 +282,7 @@ Script.include("/~/system/libraries/Xform.js"); · 281 unmodified lines | |||
| 282 | this.previousRoomControllerPosition = roomControllerPosition; | 282 | this.previousRoomControllerPosition = roomControllerPosition; |
| 283 | }; | 283 | }; |
| 284 | 284 | ||
| 285 | this.endNearGrabAction = function () { | 285 | this.endFarGrabAction = function () { |
| 286 | ensureDynamic(this.grabbedThingID); | 286 | ensureDynamic(this.grabbedThingID); |
| 287 | this.distanceHolding = false; | 287 | this.distanceHolding = false; |
| 288 | this.distanceRotating = false; | 288 | this.distanceRotating = false; |
| @@ -402,7 +402,7 @@ Script.include("/~/system/libraries/Xform.js"); · 113 unmodified lines | |||
| 402 | this.run = function (controllerData) { | 402 | this.run = function (controllerData) { |
| 403 | if (controllerData.triggerValues[this.hand] < TRIGGER_OFF_VALUE || | 403 | if (controllerData.triggerValues[this.hand] < TRIGGER_OFF_VALUE || |
| 404 | this.notPointingAtEntity(controllerData) || this.targetIsNull()) { | 404 | this.notPointingAtEntity(controllerData) || this.targetIsNull()) { |
| 405 | this.endNearGrabAction(); | 405 | this.endFarGrabAction(); |
| 406 | Selection.removeFromSelectedItemsList(DISPATCHER_HOVERING_LIST, "entity", | 406 | Selection.removeFromSelectedItemsList(DISPATCHER_HOVERING_LIST, "entity", |
| 407 | this.highlightedEntity); | 407 | this.highlightedEntity); |
| 408 | this.highlightedEntity = null; | 408 | this.highlightedEntity = null; |
| @@ -434,7 +434,7 @@ Script.include("/~/system/libraries/Xform.js"); · 25 unmodified lines | |||
| 434 | // stop the far-grab so the near-grab or equip can take over. | 434 | // stop the far-grab so the near-grab or equip can take over. |
| 435 | for (var k = 0; k < nearGrabReadiness.length; k++) { | 435 | for (var k = 0; k < nearGrabReadiness.length; k++) { |
| 436 | if (nearGrabReadiness[k].active && nearGrabReadiness[k].targets[0] === this.grabbedThingID) { | 436 | if (nearGrabReadiness[k].active && nearGrabReadiness[k].targets[0] === this.grabbedThingID) { |
| 437 | this.endNearGrabAction(); | 437 | this.endFarGrabAction(); |
| 438 | return makeRunningValues(false, [], []); | 438 | return makeRunningValues(false, [], []); |
| 439 | } | 439 | } |
| 440 | } | 440 | } |
| @@ -445,7 +445,7 @@ Script.include("/~/system/libraries/Xform.js"); · 4 unmodified lines | |||
| 445 | // where it could near-grab something, stop searching. | 445 | // where it could near-grab something, stop searching. |
| 446 | for (var j = 0; j < nearGrabReadiness.length; j++) { | 446 | for (var j = 0; j < nearGrabReadiness.length; j++) { |
| 447 | if (nearGrabReadiness[j].active) { | 447 | if (nearGrabReadiness[j].active) { |
| 448 | this.endNearGrabAction(); | 448 | this.endFarGrabAction(); |
| 449 | return makeRunningValues(false, [], []); | 449 | return makeRunningValues(false, [], []); |
| 450 | } | 450 | } |
| 451 | } | 451 | } |
| @@ -577,7 +577,7 @@ Script.include("/~/system/libraries/Xform.js"); · 125 unmodified lines | |||
| 577 | var disableModule = getEnabledModuleByName(moduleName); | 577 | var disableModule = getEnabledModuleByName(moduleName); |
| 578 | if (disableModule) { | 578 | if (disableModule) { |
| 579 | if (disableModule.disableModules) { | 579 | if (disableModule.disableModules) { |
| 580 | this.endNearGrabAction(); | 580 | this.endFarGrabAction(); |
| 581 | Selection.removeFromSelectedItemsList(DISPATCHER_HOVERING_LIST, "entity", | 581 | Selection.removeFromSelectedItemsList(DISPATCHER_HOVERING_LIST, "entity", |
| 582 | this.highlightedEntity); | 582 | this.highlightedEntity); |
| 583 | this.highlightedEntity = null; | 583 | this.highlightedEntity = null; |