From c2805c7414c4ff595998ae00c14d647d43dd8b89 Mon Sep 17 00:00:00 2001 From: danny Date: Mon, 1 Jul 2019 08:33:55 +1000 Subject: [PATCH] changed file casings and variable name in objects.js file to get threebox to build in angular apps with optimization and without warnings. --- src/Animation/AnimationManager.js | 2 +- src/objects/objects.js | 7 ++++--- src/utils/material.js | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Animation/AnimationManager.js b/src/Animation/AnimationManager.js index 8cc24382..7aaa5b6a 100755 --- a/src/Animation/AnimationManager.js +++ b/src/Animation/AnimationManager.js @@ -1,4 +1,4 @@ -var threebox = require('../Threebox.js'); +var threebox = require('../threebox.js'); var utils = require("../utils/utils.js"); var validate = require("../utils/validate.js"); diff --git a/src/objects/objects.js b/src/objects/objects.js index b364f858..a42e0bfa 100644 --- a/src/objects/objects.js +++ b/src/objects/objects.js @@ -1,5 +1,6 @@ var utils = require("../utils/utils.js"); var material = require("../utils/material.js"); +var THREE = require("../three.js"); const AnimationManager = require("../animation/AnimationManager.js"); @@ -41,11 +42,11 @@ Objects.prototype = { }, - _addMethods: function(obj, static){ + _addMethods: function(obj, fixed){ var root = this; - if (static) { + if (fixed) { } @@ -93,7 +94,7 @@ Objects.prototype = { obj.add = function(){ root.world.add(obj); - if (!static) obj.set({position:obj.coordinates}); + if (!fixed) obj.set({position:obj.coordinates}); return obj; } diff --git a/src/utils/material.js b/src/utils/material.js index 72d3d140..1f0dfc8d 100644 --- a/src/utils/material.js +++ b/src/utils/material.js @@ -5,7 +5,7 @@ // - specify a `material` string, `color`, and/or `opacity` as modifications of the default material // - provide none of these parameters, to use the default material -var utils = require("../Utils/Utils.js"); +var utils = require("./utils.js"); var THREE = require("../three.js"); var defaults = {