From 352f0f7ea711d53a3979ced5e3ea1ba566c443ad Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Thu, 8 Sep 2016 16:22:16 -0700 Subject: [PATCH] Update controller model URL --- tutorial/tutorial.js | 2 ++ tutorial/viveHandsv2.js | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tutorial/tutorial.js b/tutorial/tutorial.js index e6cbae11ce..ee33b4428a 100644 --- a/tutorial/tutorial.js +++ b/tutorial/tutorial.js @@ -866,6 +866,8 @@ Controller.keyReleaseEvent.connect(function (event) { } } else if (event.text == "F12") { restartStep(); + } else if (event.text == "F10") { + MyAvatar.shouldRenderLocally = !MyAvatar.shouldRenderLocally; } else if (event.text == "r") { stopTutorial(); startTutorial(); diff --git a/tutorial/viveHandsv2.js b/tutorial/viveHandsv2.js index 8271fdcffe..0cd761e034 100644 --- a/tutorial/viveHandsv2.js +++ b/tutorial/viveHandsv2.js @@ -199,7 +199,7 @@ var viveNaturalPosition = { z: 0.06380049744620919 }; var viveModelURL = "https://hifi-public.s3.amazonaws.com/huffman/controllers/vive2.fbx"; -var viveModelURL = "file:///C:\\Users\\Ryan\\Assets\\controller\\vive_body.fbx"; +var viveModelURL = "https://hifi-public.s3.amazonaws.com/huffman/controllers/vive_body.fbx", var VIVE_CONTROLLER_CONFIGURATION = { name: "Vive", @@ -935,7 +935,6 @@ var c = setupController(VIVE_CONTROLLER_CONFIGURATION); //c.setPartVisible("touchpad", false); //c.setPartVisible("touchpad_teleport", false); -//MyAvatar.shouldRenderLocally = false; Script.scriptEnding.connect(function() { deleteControllerDisplay(c); MyAvatar.shouldRenderLocally = true;