Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 14:18:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update controller model URL

Browse source
This commit is contained in:
Ryan Huffman 2016-09-08 16:22:16 -07:00
parent 324365deca
commit 352f0f7ea7
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tutorial/tutorial.js
View file

@ -866,6 +866,8 @@ Controller.keyReleaseEvent.connect(function (event) {
} }
} else if (event.text == "F12") { } else if (event.text == "F12") {
restartStep(); restartStep();
} else if (event.text == "F10") {
MyAvatar.shouldRenderLocally = !MyAvatar.shouldRenderLocally;
} else if (event.text == "r") { } else if (event.text == "r") {
stopTutorial(); stopTutorial();
startTutorial(); startTutorial();

3
tutorial/viveHandsv2.js
View file

@ -199,7 +199,7 @@ var viveNaturalPosition = {
z: 0.06380049744620919 z: 0.06380049744620919
}; };
var viveModelURL = "https://hifi-public.s3.amazonaws.com/huffman/controllers/vive2.fbx"; 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 = { var VIVE_CONTROLLER_CONFIGURATION = {
name: "Vive", name: "Vive",
@ -935,7 +935,6 @@ var c = setupController(VIVE_CONTROLLER_CONFIGURATION);
//c.setPartVisible("touchpad", false); //c.setPartVisible("touchpad", false);
//c.setPartVisible("touchpad_teleport", false); //c.setPartVisible("touchpad_teleport", false);
//MyAvatar.shouldRenderLocally = false;
Script.scriptEnding.connect(function() { Script.scriptEnding.connect(function() {
deleteControllerDisplay(c); deleteControllerDisplay(c);
MyAvatar.shouldRenderLocally = true; MyAvatar.shouldRenderLocally = true;