Skip to content
This repository has been archived by the owner on Apr 21, 2021. It is now read-only.

minor changes to get Threebox to work and build in angular. #65

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Animation/AnimationManager.js
Original file line number Diff line number Diff line change
@@ -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");

Expand Down
7 changes: 4 additions & 3 deletions src/objects/objects.js
Original file line number Diff line number Diff line change
@@ -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");

Expand Down Expand Up @@ -41,11 +42,11 @@ Objects.prototype = {

},

_addMethods: function(obj, static){
_addMethods: function(obj, fixed){

var root = this;

if (static) {
if (fixed) {

}

Expand Down Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion src/utils/material.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down