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

make thumb and trigger mode an option

Browse source
This commit is contained in:
James B. Pollack 2016-07-07 12:39:11 -07:00
parent 93081e73d8
commit be770c8177
1 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -36,6 +36,8 @@ var SMOOTH_ARRIVAL_SPACING = 0;
// var SMOOTH_ARRIVAL_SPACING = 10;
// var NUMBER_OF_STEPS = 20;
var USE_THUMB_AND_TRIGGER_MODE = true;
var TARGET_MODEL_URL = 'http://hifi-content.s3.amazonaws.com/james/teleporter/Tele-destiny.fbx';
var TARGET_MODEL_DIMENSIONS = {
x: 1.15,
@ -121,8 +123,12 @@ function Teleporter() {
this.teleportHand = hand;
this.initialize();
this.updateConnected = true;
Script.update.connect(this.updateForThumbAndTrigger);
if (USE_THUMB_AND_TRIGGER_MODE === true) {
Script.update.connect(this.updateForThumbAndTrigger);
} else {
Script.update.connect(this.update);
}
};
this.findMidpoint = function(start, end) {
@ -216,7 +222,14 @@ function Teleporter() {
}
this.exitTeleportMode = function(value) {
Script.update.disconnect(this.updateForThumbAndTrigger);
if (USE_THUMB_AND_TRIGGER_MODE === true) {
Script.update.disconnect(this.updateForThumbAndTrigger);
} else {
Script.update.disconnect(this.update);
}
this.updateConnected = null;
this.disableMappings();
this.turnOffOverlayBeams();
@ -644,8 +657,12 @@ function registerMappingsWithThumbAndTrigger() {
});
}
//registerMappings();
registerMappingsWithThumbAndTrigger()
if (USE_THUMB_AND_TRIGGER_MODE === true) {
registerMappingsWithThumbAndTrigger();
} else {
registerMappings();
}
var teleporter = new Teleporter();
Controller.enableMapping(mappingName);
@ -658,6 +675,12 @@ function cleanup() {
teleporter.deleteTargetOverlay();
teleporter.turnOffOverlayBeams();
if (teleporter.updateConnected !== null) {
Script.update.disconnect(teleporter.updateForThumbAndTrigger);
if (USE_THUMB_AND_TRIGGER_MODE === true) {
Script.update.disconnect(teleporter.updateForThumbAndTrigger);
} else {
Script.update.disconnect(teleporter.update);
}
}
}