Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 14:29:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add instant mode

Browse source
This commit is contained in:
James B. Pollack 2016-07-06 18:13:42 -07:00
parent 1728878982
commit 5626938fb4
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -16,22 +16,23 @@ var fadeSphereInterval = null;
var FADE_IN_INTERVAL = 50; var FADE_IN_INTERVAL = 50;
var FADE_OUT_INTERVAL = 50; var FADE_OUT_INTERVAL = 50;
var NUMBER_OF_STEPS=0;
var SMOOTH_ARRIVAL_SPACING=0;
//slow //slow
var SMOOTH_ARRIVAL_SPACING = 150; // var SMOOTH_ARRIVAL_SPACING = 150;
var NUMBER_OF_STEPS = 2; // var NUMBER_OF_STEPS = 2;
//medium-slow //medium-slow
var SMOOTH_ARRIVAL_SPACING = 100; // var SMOOTH_ARRIVAL_SPACING = 100;
var NUMBER_OF_STEPS = 4; // var NUMBER_OF_STEPS = 4;
//medium-fast // //medium-fast
var SMOOTH_ARRIVAL_SPACING = 33; // var SMOOTH_ARRIVAL_SPACING = 33;
var NUMBER_OF_STEPS = 6; // var NUMBER_OF_STEPS = 6;
//fast // //fast
var SMOOTH_ARRIVAL_SPACING = 10; // var SMOOTH_ARRIVAL_SPACING = 10;
var NUMBER_OF_STEPS = 20; // var NUMBER_OF_STEPS = 20;
var TARGET_MODEL_URL = 'http://hifi-content.s3.amazonaws.com/james/teleporter/Tele-destiny.fbx'; var TARGET_MODEL_URL = 'http://hifi-content.s3.amazonaws.com/james/teleporter/Tele-destiny.fbx';
var TARGET_MODEL_DIMENSIONS = { var TARGET_MODEL_DIMENSIONS = {
@ -449,9 +450,9 @@ function Teleporter() {
var offset = getAvatarFootOffset(); var offset = getAvatarFootOffset();
_this.intersection.intersection.y += offset; _this.intersection.intersection.y += offset;
// MyAvatar.position = _this.intersection.intersection; // MyAvatar.position = _this.intersection.intersection;
this.exitTeleportMode(); this.exitTeleportMode();
this.smoothArrival(); this.smoothArrival();
} }
}; };
@ -483,7 +484,7 @@ function Teleporter() {
print('ARRIVAL POINTS: ' + JSON.stringify(_this.arrivalPoints)); print('ARRIVAL POINTS: ' + JSON.stringify(_this.arrivalPoints));
print('end point: ' + JSON.stringify(_this.intersection.intersection)) print('end point: ' + JSON.stringify(_this.intersection.intersection))
_this.smoothArrivalInterval = Script.setInterval(function() { _this.smoothArrivalInterval = Script.setInterval(function() {
print(_this.arrivalPoints.length+" arrival points remaining") print(_this.arrivalPoints.length + " arrival points remaining")
if (_this.arrivalPoints.length === 0) { if (_this.arrivalPoints.length === 0) {
Script.clearInterval(_this.smoothArrivalInterval); Script.clearInterval(_this.smoothArrivalInterval);
_this.triggerHaptics(); _this.triggerHaptics();
@ -493,7 +494,7 @@ function Teleporter() {
var landingPoint = _this.arrivalPoints.shift(); var landingPoint = _this.arrivalPoints.shift();
print('landing at: ' + JSON.stringify(landingPoint)) print('landing at: ' + JSON.stringify(landingPoint))
MyAvatar.position =landingPoint; MyAvatar.position = landingPoint;
}, SMOOTH_ARRIVAL_SPACING) }, SMOOTH_ARRIVAL_SPACING)