aboutsummaryrefslogtreecommitdiff
path: root/js/lib/geom/circle.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-03-10 16:30:45 -0800
committerJose Antonio Marquez2012-03-10 16:30:45 -0800
commit7d4d8651d059a91d29142d7f07d3122eb64532fa (patch)
tree6f180ddb9f631b49271670771144759c39f3c919 /js/lib/geom/circle.js
parent94ddbc239965cb39431708e78dde5127c64b0060 (diff)
parent615be47750fb86c07acd9354da12a76abe6c24e0 (diff)
downloadninja-7d4d8651d059a91d29142d7f07d3122eb64532fa.tar.gz
Merge branch 'refs/heads/FileIO-Integration' into FileIO-Build-Candidate
Diffstat (limited to 'js/lib/geom/circle.js')
-rwxr-xr-xjs/lib/geom/circle.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/js/lib/geom/circle.js b/js/lib/geom/circle.js
index ad77383b..f94d4e6b 100755
--- a/js/lib/geom/circle.js
+++ b/js/lib/geom/circle.js
@@ -61,6 +61,8 @@ var Circle = function GLCircle() {
61 } else { 61 } else {
62 this._fillMaterial = MaterialsModel.exportFlatMaterial(); 62 this._fillMaterial = MaterialsModel.exportFlatMaterial();
63 } 63 }
64
65 this.exportMaterials();
64 }; 66 };
65 67
66 /////////////////////////////////////////////////////////////////////// 68 ///////////////////////////////////////////////////////////////////////
@@ -610,8 +612,9 @@ var Circle = function GLCircle() {
610 console.log( "object material not found in library: " + fillMaterialName ); 612 console.log( "object material not found in library: " + fillMaterialName );
611 fillMat = MaterialsModel.exportFlatMaterial(); 613 fillMat = MaterialsModel.exportFlatMaterial();
612 } 614 }
613
614 this._fillMaterial = fillMat; 615 this._fillMaterial = fillMat;
616
617 this.importMaterials( importStr );
615 }; 618 };
616 619
617 this.collidesWithPoint = function( x, y ) { 620 this.collidesWithPoint = function( x, y ) {