Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-23 20:54:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup and protect against some interval naughtiness

Browse source
This commit is contained in:
James B. Pollack 2016-07-06 18:30:50 -07:00
parent 5626938fb4
commit 54e0c131a5
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
scripts/system/controllers/teleport.js
View file

@ -16,11 +16,11 @@ var fadeSphereInterval = null;
var FADE_IN_INTERVAL = 50;
var FADE_OUT_INTERVAL = 50;
var NUMBER_OF_STEPS=0;
var SMOOTH_ARRIVAL_SPACING=0;
//slow
// var SMOOTH_ARRIVAL_SPACING = 150;
// var NUMBER_OF_STEPS = 2;
// var NUMBER_OF_STEPS = 0;
// var SMOOTH_ARRIVAL_SPACING = 0;
// slow
var SMOOTH_ARRIVAL_SPACING = 150;
var NUMBER_OF_STEPS = 2;
//medium-slow
// var SMOOTH_ARRIVAL_SPACING = 100;
@ -77,6 +77,7 @@ function Teleporter() {
this.leftOverlayLine = null;
this.targetOverlay = null;
this.updateConnected = null;
this.smoothArrivalInterval=null;
this.initialize = function() {
this.createMappings();
@ -111,6 +112,9 @@ function Teleporter() {
return;
}
if(this.smoothArrivalInterval!==null){
Script.clearInterval(this.smoothArrivalInterval);
}
inTeleportMode = true;
this.teleportHand = hand;
this.initialize();
@ -487,14 +491,17 @@ function Teleporter() {
print(_this.arrivalPoints.length + " arrival points remaining")
if (_this.arrivalPoints.length === 0) {
Script.clearInterval(_this.smoothArrivalInterval);
_this.triggerHaptics();
_this.deleteTargetOverlay();
return;
}
var landingPoint = _this.arrivalPoints.shift();
print('landing at: ' + JSON.stringify(landingPoint))
MyAvatar.position = landingPoint;
if (_this.arrivalPoints.length === 1 || _this.arrivalPoints.length === 0) {
print('clear target overlay')
_this.deleteTargetOverlay();
_this.triggerHaptics();
}
}, SMOOTH_ARRIVAL_SPACING)