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

Merge pull request #5718 from jherico/homer

Browse source 
Magballs: Cleaning up some debugging spew and fixing UI HTML paths
This commit is contained in:
Brad Hefta-Gaub 2015-09-04 10:01:01 -07:00
commit 143376f501
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
examples/libraries/omniTool/models/wand.js
View file

@ -91,10 +91,7 @@ Wand.prototype.setTipColors = function(color1, color2) {
} }
Wand.prototype.onUpdate = function(deltaTime) { Wand.prototype.onUpdate = function(deltaTime) {
logDebug("Z4");
if (this.visible) { if (this.visible) {
logDebug("5");
var time = new Date().getTime() / 250; var time = new Date().getTime() / 250;
var scale1 = Math.abs(Math.sin(time)); var scale1 = Math.abs(Math.sin(time));
var scale2 = Math.abs(Math.cos(time)); var scale2 = Math.abs(Math.cos(time));

5
examples/toys/magBalls.js
View file

@ -34,7 +34,7 @@ MODE_INFO[BALL_EDIT_MODE_ADD] = {
}, },
colors: [ COLORS.GREEN, COLORS.BLUE ], colors: [ COLORS.GREEN, COLORS.BLUE ],
// FIXME use an http path or find a way to get the relative path to the file // 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] = { MODE_INFO[BALL_EDIT_MODE_DELETE] = {
@ -45,10 +45,9 @@ MODE_INFO[BALL_EDIT_MODE_DELETE] = {
}, },
colors: [ COLORS.RED, COLORS.BLUE ], colors: [ COLORS.RED, COLORS.BLUE ],
// FIXME use an http path or find a way to get the relative path to the file // 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, var UI_POSITION_MODE_LABEL = Vec3.multiply(0.5,
Vec3.sum(MODE_INFO[BALL_EDIT_MODE_ADD].uiPosition, Vec3.sum(MODE_INFO[BALL_EDIT_MODE_ADD].uiPosition,
MODE_INFO[BALL_EDIT_MODE_DELETE].uiPosition)); MODE_INFO[BALL_EDIT_MODE_DELETE].uiPosition));