From 6f457e10eb19a1985b8273a5c2b4c44b6b320d2a Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Tue, 6 Sep 2016 11:21:10 -0700 Subject: [PATCH] Add trigger part to vive controller display --- tutorial/tutorial.js | 4 ---- tutorial/viveHandsv2.js | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/tutorial/tutorial.js b/tutorial/tutorial.js index 4b30fa645d..ed091a6526 100644 --- a/tutorial/tutorial.js +++ b/tutorial/tutorial.js @@ -724,10 +724,6 @@ function hideEntitiesWithTag(tag) { }); } - - - - var STEPS; var currentStepNum = -1; diff --git a/tutorial/viveHandsv2.js b/tutorial/viveHandsv2.js index 50475e563e..e53de1bfc9 100644 --- a/tutorial/viveHandsv2.js +++ b/tutorial/viveHandsv2.js @@ -368,6 +368,20 @@ var VIVE_CONTROLLER_CONFIGURATION = { z: 0.06380049744620919 }, + parts: { + { + type: "linear", + modelURL: "", + input: Controller.Hardware.Vive.RT, + minValue: 0.0, + maxValue: 1.0, + textOffset: { x: -0.035, y: 0.004, z: -0.005 }, + minPosition: { x: -0.035, y: 0.004, z: -0.005 }, + maxPosition: { x: -0.035, y: 0.004, z: -0.005 }, + } + + }, + annotationTextRotation: Quat.fromPitchYawRollDegrees(180 + 45, 90, 180), annotations: {