From 80f2ecbab6cad9310523d5842b681676132d37c7 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Fri, 4 Sep 2015 09:59:42 -0700 Subject: [PATCH] Cleaning up some debugging spew and fixing UI HTML paths --- examples/libraries/omniTool/models/wand.js | 3 --- examples/toys/magBalls.js | 5 ++--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/examples/libraries/omniTool/models/wand.js b/examples/libraries/omniTool/models/wand.js index af28afb81c..e14c90b36a 100644 --- a/examples/libraries/omniTool/models/wand.js +++ b/examples/libraries/omniTool/models/wand.js @@ -91,10 +91,7 @@ Wand.prototype.setTipColors = function(color1, color2) { } Wand.prototype.onUpdate = function(deltaTime) { - logDebug("Z4"); - if (this.visible) { - logDebug("5"); var time = new Date().getTime() / 250; var scale1 = Math.abs(Math.sin(time)); var scale2 = Math.abs(Math.cos(time)); diff --git a/examples/toys/magBalls.js b/examples/toys/magBalls.js index 7c11a94e06..e163aa5ffd 100644 --- a/examples/toys/magBalls.js +++ b/examples/toys/magBalls.js @@ -34,7 +34,7 @@ MODE_INFO[BALL_EDIT_MODE_ADD] = { }, colors: [ COLORS.GREEN, COLORS.BLUE ], // FIXME use an http path or find a way to get the relative path to the file - url: "file:///" + Script.resolvePath('../html/magBalls/addMode.html').replace("c:", "C:"), + url: Script.resolvePath('../html/magBalls/addMode.html'), }; MODE_INFO[BALL_EDIT_MODE_DELETE] = { @@ -45,10 +45,9 @@ MODE_INFO[BALL_EDIT_MODE_DELETE] = { }, colors: [ COLORS.RED, COLORS.BLUE ], // FIXME use an http path or find a way to get the relative path to the file - url: "file:///" + Script.resolvePath('../html/magBalls/deleteMode.html').replace("c:", "C:"), + url: Script.resolvePath('../html/magBalls/deleteMode.html'), }; - var UI_POSITION_MODE_LABEL = Vec3.multiply(0.5, Vec3.sum(MODE_INFO[BALL_EDIT_MODE_ADD].uiPosition, MODE_INFO[BALL_EDIT_MODE_DELETE].uiPosition));