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

add easy mode

Browse source
This commit is contained in:
James B. Pollack 2016-07-01 11:12:20 -07:00
parent 0c60d87d3b
commit 4762091aaf
1 changed files with 67 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,10 +19,10 @@
//try moving to final destination in 4 steps: 50% 75% 90% 100% (arrival)
var inTeleportMode = false;
var easyMode = true;
function ThumbPad(hand) {
this.hand = hand;
var _this = this;
@ -53,7 +53,6 @@ function Trigger(hand) {
};
}
function Teleporter() {
var _this = this;
this.targetProps = null;
@ -107,7 +106,13 @@ function Teleporter() {
this.teleportHand = hand;
this.initialize();
this.updateConnected = true;
Script.update.connect(this.update);
if (easyMode !== true) {
Script.update.connect(this.update);
} else {
Script.update.connect(this.updateEasy);
}
};
this.exitTeleportMode = function(value) {
@ -117,7 +122,11 @@ function Teleporter() {
this.leftOverlayOff();
Entities.deleteEntity(_this.targetEntity);
this.enableGrab();
Script.update.disconnect(this.update);
if (easyMode !== true) {
Script.update.disconnect(this.update);
} else {
Script.update.disconnect(this.updateEasy);
}
this.updateConnected = false;
inTeleportMode = false;
@ -126,7 +135,6 @@ function Teleporter() {
this.update = function() {
//print('in teleporter update')
if (teleporter.teleportHand === 'left') {
teleporter.leftRay();
if (leftPad.buttonValue === 0) {
@ -150,6 +158,25 @@ function Teleporter() {
};
this.updateEasy = function() {
if (teleporter.teleportHand === 'left') {
teleporter.leftRay();
if (leftPad.buttonValue === 0) {
_this.teleport();
return;
}
} else {
teleporter.rightRay();
if (rightPad.buttonValue === 0) {
_this.teleport();
return;
}
}
};
this.rightRay = function() {
var rightPosition = Vec3.sum(Vec3.multiplyQbyV(MyAvatar.orientation, Controller.getPoseValue(Controller.Standard.RightHand).translation), MyAvatar.position);
@ -357,6 +384,7 @@ function getJointData() {
}
var leftPad = new ThumbPad('left');
var rightPad = new ThumbPad('right');
var leftTrigger = new Trigger('left');
@ -364,20 +392,41 @@ var rightTrigger = new Trigger('right');
//create a controller mapping and make sure to disable it when the script is stopped
var mappingName = 'Hifi-Teleporter-Dev-' + Math.random();
var 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);
var mappingName, teleportMapping;
teleportMapping.from(leftPad.down).when(leftTrigger.down).to(function() {
teleporter.enterTeleportMode('left')
});
teleportMapping.from(rightPad.down).when(rightTrigger.down).to(function() {
teleporter.enterTeleportMode('right')
});
function registerMappings() {
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() {
teleporter.enterTeleportMode('left')
});
teleportMapping.from(rightPad.down).when(rightTrigger.down).to(function() {
teleporter.enterTeleportMode('right')
});
}
function registerMappingsEasy() {
mappingName = 'Hifi-Teleporter-Dev-' + Math.random();
teleportMapping = Controller.newMapping(mappingName);
teleportMapping.from(Controller.Standard.RightPrimaryThumb).peek().to(rightPad.buttonPress);
teleportMapping.from(Controller.Standard.LeftPrimaryThumb).peek().to(leftPad.buttonPress);
teleportMapping.from(leftPad.down).to(function() {
teleporter.enterTeleportMode('left')
});
teleportMapping.from(rightPad.down).to(function() {
teleporter.enterTeleportMode('right')
});
}
registerMappingsEasy();
var teleporter = new Teleporter();
Controller.enableMapping(mappingName);