Showing the changes to scripts/system/controllers/controllerModules (1 of 1 file). Show all
Unified · Split
| @@ -427,7 +427,6 @@ Script.include("/~/system/libraries/controllers.js"); · 426 unmodified lines | ||
| 427 | 427 | dimensions: _this.PLAY_AREA_SENSOR_OVERLAY_DIMENSIONS, |
| 428 | 428 | parentID: _this.playAreaOverlay, |
| 429 | 429 | localRotation: _this.PLAY_AREA_SENSOR_OVERLAY_ROTATION, |
| 430 | − solid: true, | |
| 431 | 430 | drawInFront: false, |
| 432 | 431 | visible: false |
| 433 | 432 | }); |
| @@ -581,6 +580,7 @@ Script.include("/~/system/libraries/controllers.js"); · 147 unmodified lines | ||
| 581 | 580 | } |
| 582 | 581 | } |
| 583 | 582 | _this.teleportedFadeTimer = null; |
| 583 | + Selection.disableListHighlight(this.teleporterSelectionName); | |
| 584 | 584 | } |
| 585 | 585 | }; |
| 586 | 586 | |
| @@ -619,6 +619,7 @@ Script.include("/~/system/libraries/controllers.js"); · 32 unmodified lines | ||
| 619 | 619 | this.teleportScaleStart = Date.now(); |
| 620 | 620 | this.teleportScaleFactor = 0; |
| 621 | 621 | this.scaleInTeleport(); |
| 622 | + Selection.enableListHighlight(this.teleporterSelectionName, this.TELEPORTER_SELECTION_STYLE); | |
| 622 | 623 | } else { |
| 623 | 624 | if (this.teleportScaleTimer !== null) { |
| 624 | 625 | Script.clearTimeout(this.teleportScaleTimer); |
| @@ -644,6 +645,8 @@ Script.include("/~/system/libraries/controllers.js"); · 19 unmodified lines | ||
| 644 | 645 | this.teleportedFadeDelayFactor = 1.0; |
| 645 | 646 | this.teleportedFadeFactor = 1.0; |
| 646 | 647 | this.teleportedFadeTimer = Script.setTimeout(this.fadeOutTeleport, this.TELEPORTED_FADE_DELAY); |
| 648 | + } else { | |
| 649 | + Selection.disableListHighlight(this.teleporterSelectionName); | |
| 647 | 650 | } |
| 648 | 651 | } |
| 649 | 652 | |
| @@ -798,7 +801,6 @@ Script.include("/~/system/libraries/controllers.js"); · 148 unmodified lines | ||
| 798 | 801 | this.disableLasers = function() { |
| 799 | 802 | this.setPlayAreaVisible(false, null, true); |
| 800 | 803 | this.setTeleportVisible(false, null, true); |
| 801 | − Selection.disableListHighlight(this.teleporterSelectionName); | |
| 802 | 804 | Pointers.disablePointer(_this.teleportParabolaHandVisuals); |
| 803 | 805 | Pointers.disablePointer(_this.teleportParabolaHandCollisions); |
| 804 | 806 | Pointers.disablePointer(_this.teleportParabolaHeadVisuals); |
| @@ -816,12 +818,6 @@ Script.include("/~/system/libraries/controllers.js"); · 11 unmodified lines | ||
| 816 | 818 | } |
| 817 | 819 | this.teleportState = teleportState; |
| 818 | 820 | |
| 819 | − var visible = visibleState === "teleport"; | |
| 820 | − if (visible) { | |
| 821 | − Selection.enableListHighlight(this.teleporterSelectionName, this.TELEPORTER_SELECTION_STYLE); | |
| 822 | − } else { | |
| 823 | − Selection.disableListHighlight(this.teleporterSelectionName); | |
| 824 | − } | |
| 825 | 821 | var pointerID; |
| 826 | 822 | if (mode === 'head') { |
| 827 | 823 | Pointers.setRenderState(_this.teleportParabolaHeadVisuals, visibleState); |
| @@ -832,6 +828,7 @@ Script.include("/~/system/libraries/controllers.js"); · 4 unmodified lines | ||
| 832 | 828 | Pointers.setRenderState(_this.teleportParabolaHandCollisions, invisibleState); |
| 833 | 829 | pointerID = _this.teleportParabolaHandVisuals; |
| 834 | 830 | } |
| 831 | + var visible = visibleState === "teleport"; | |
| 835 | 832 | this.setPlayAreaVisible(visible && MyAvatar.showPlayArea, |
| 836 | 833 | Pointers.getPointerProperties(pointerID).renderStates.teleport.end, false); |
| 837 | 834 | this.setTeleportVisible(visible, mode, false); |