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

thumb and trigger

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

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

@ -121,7 +121,7 @@ function Teleporter() {
this.teleportHand = hand;
this.initialize();
this.updateConnected = true;
Script.update.connect(this.update);
Script.update.connect(this.updateForThumbAndTrigger);
};
@ -216,11 +216,10 @@ function Teleporter() {
}
this.exitTeleportMode = function(value) {
Script.update.disconnect(this.update);
Script.update.disconnect(this.updateForThumbAndTrigger);
this.updateConnected = null;
this.disableMappings();
this.turnOffOverlayBeams();
this.enableGrab();
Script.setTimeout(function() {
inTeleportMode = false;
@ -247,6 +246,35 @@ function Teleporter() {
};
this.updateForThumbAndTrigger = function() {
if (teleporter.teleportHand === 'left') {
teleporter.leftRay();
if (leftPad.buttonValue === 0) {
_this.exitTeleportMode();
_this.deleteTargetOverlay();
return;
}
if (leftTrigger.buttonValue === 0 && inTeleportMode === true) {
_this.teleport();
return;
}
} else {
teleporter.rightRay();
if (rightPad.buttonValue === 0) {
_this.exitTeleportMode();
_this.deleteTargetOverlay();
return;
}
if (rightTrigger.buttonValue === 0 && inTeleportMode === true) {
_this.teleport();
return;
}
}
};
this.rightRay = function() {
@ -595,9 +623,29 @@ function registerMappings() {
}, TELEPORT_DELAY)
}
});
}
registerMappings();
function registerMappingsWithThumbAndTrigger() {
mappingName = 'Hifi-Teleporter-Dev-' + Math.random();
teleportMapping = Controller.newMapping(mappingName);
teleportMapping.from(Controller.Standard.RT).peek().to(rightTrigger.buttonPress);
teleportMapping.from(Controller.Standard.LT).peek().to(leftTrigger.buttonPress);
teleportMapping.from(Controller.Standard.RightPrimaryThumb).peek().to(rightPad.buttonPress);
teleportMapping.from(Controller.Standard.LeftPrimaryThumb).peek().to(leftPad.buttonPress);
teleportMapping.from(leftPad.down).when(leftTrigger.down).to(function(value) {
teleporter.enterTeleportMode('left')
});
teleportMapping.from(rightPad.down).when(rightTrigger.down).to(function(value) {
teleporter.enterTeleportMode('right')
});
}
//registerMappings();
registerMappingsWithThumbAndTrigger()
var teleporter = new Teleporter();
Controller.enableMapping(mappingName);
@ -610,6 +658,6 @@ function cleanup() {
teleporter.deleteTargetOverlay();
teleporter.turnOffOverlayBeams();
if (teleporter.updateConnected !== null) {
Script.update.disconnect(teleporter.update);
Script.update.disconnect(teleporter.updateForThumbAndTrigger);
}
}