demo and only do for vive

This commit is contained in:
James B. Pollack 2016-08-17 16:12:07 -07:00
parent 82a8887275
commit a4a41faf24
2 changed files with 8 additions and 5 deletions

View file

@ -26,6 +26,8 @@ Script.load("system/controllers/handControllerPointer.js");
Script.load("system/controllers/squeezeHands.js"); Script.load("system/controllers/squeezeHands.js");
Script.load("system/controllers/grab.js"); Script.load("system/controllers/grab.js");
Script.load("system/controllers/teleport.js"); Script.load("system/controllers/teleport.js");
Script.load("system/controllers/advancedMovement.js") if (Controller.Hardware.Vive !== undefined) {
Script.load("system/controllers/advancedMovement.js")
}
Script.load("system/dialTone.js"); Script.load("system/dialTone.js");
Script.load("system/firstPersonHMD.js"); Script.load("system/firstPersonHMD.js");

View file

@ -17,9 +17,10 @@ function addTranslationToLeftStick() {
function registerMappings() { function registerMappings() {
mappingName = 'Hifi-AdvancedMovement-Dev-' + Math.random(); mappingName = 'Hifi-AdvancedMovement-Dev-' + Math.random();
advancedMapping = Controller.newMapping(mappingName); advancedMapping = Controller.newMapping(mappingName);
advancedMapping.from(Controller.Vive.LY).when(Controller.Vive.LSY).invert().to(Controller.Standard.LY); var VIVE = Controller.Hardware.Vive;
advancedMapping.from(Controller.Vive.LX).when(Controller.Vive.LSX).to(Controller.Standard.LX); advancedMapping.from(VIVE.LY).when(Controller.Vive.LSY).invert().to(Controller.Standard.LY);
advancedMapping.from(Controller.Vive.RY).when(Controller.Vive.RSY).invert().to(Controller.Standard.RY); advancedMapping.from(VIVE.LX).when(Controller.Vive.LSX).to(Controller.Standard.LX);
advancedMapping.from(VIVE.RY).when(Controller.Vive.RSY).invert().to(Controller.Standard.RY);
} }
function removeTranslationFromLeftStick() { function removeTranslationFromLeftStick() {