Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-16 09:40:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix vive bug

Browse source
This commit is contained in:
James B. Pollack 2016-07-01 00:48:29 -07:00
parent 104ee63a77
commit b2e407a8e1
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -87,8 +87,8 @@ function Teleporter() {
this.createMappings = function() { this.createMappings = function() {
print('jbp create mappings internal'); print('jbp create mappings internal');
// peek at the trigger and thumbs to store their values // peek at the trigger and thumbs to store their values
teleporter.telporterMappingInternalName='Hifi-Teleporter-Internal-Dev-' + Math.random(); teleporter.telporterMappingInternalName = 'Hifi-Teleporter-Internal-Dev-' + Math.random();
teleporter.teleportMappingInternal = Controller.newMapping(teleporter.telporterMappingInternalName); teleporter.teleportMappingInternal = Controller.newMapping(teleporter.telporterMappingInternalName);
Controller.enableMapping(teleporter.telporterMappingInternalName); Controller.enableMapping(teleporter.telporterMappingInternalName);
}; };
@ -124,20 +124,24 @@ function Teleporter() {
}; };
this.update = function() { this.update = function() {
//print('in teleporter update') //print('in teleporter update')
if (rightPad.buttonValue === 0 || leftPad.buttonValue === 0) {
print('JBP THUMB RELEASED SHOULD EXIT')
_this.exitTeleportMode();
return;
}
if (teleporter.teleportHand === 'left') { if (teleporter.teleportHand === 'left') {
teleporter.leftRay(); teleporter.leftRay();
if (leftPad.buttonValue === 0) {
_this.exitTeleportMode();
return;
}
if (leftTrigger.buttonValue === 0) { if (leftTrigger.buttonValue === 0) {
_this.teleport(); _this.teleport();
} }
} else { } else {
teleporter.rightRay(); teleporter.rightRay();
if (rightPad.buttonValue === 0) {
_this.exitTeleportMode();
return;
}
if (rightTrigger.buttonValue === 0) { if (rightTrigger.buttonValue === 0) {
_this.teleport(); _this.teleport();
} }
@ -256,14 +260,14 @@ function Teleporter() {
this.rightOverlayOff = function() { this.rightOverlayOff = function() {
if (this.rightOverlayLine !== null) { if (this.rightOverlayLine !== null) {
Overlays.deleteOverlay(this.rightOverlayLine); Overlays.deleteOverlay(this.rightOverlayLine);
this.rightOverlayLine=null; this.rightOverlayLine = null;
} }
}; };
this.leftOverlayOff = function() { this.leftOverlayOff = function() {
if (this.leftOverlayLine !== null) { if (this.leftOverlayLine !== null) {
Overlays.deleteOverlay(this.leftOverlayLine); Overlays.deleteOverlay(this.leftOverlayLine);
this.leftOverlayLine=null; this.leftOverlayLine = null;
} }
}; };