History

Don't immediately hide occlusion highlights after teleporting

David Rowe committed 8 years ago

Commit 84a06fb1 parent 2f3a9411 file · +5 −8Browse files

Showing the changes to scripts/system/controllers/controllerModules (1 of 1 file). Show all

Unified · Split

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