aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhwc4872012-06-13 14:30:23 -0700
committerhwc4872012-06-13 14:30:23 -0700
commit544aa96828cd77276566f6911cab63aeb4aff3da (patch)
tree3310ad8927b734a214cfa7200cb1c0ea46da2abc
parent3e481dd581e0305dd8b572ed0d17e86622223464 (diff)
downloadninja-544aa96828cd77276566f6911cab63aeb4aff3da.tar.gz
Oval stroke and fill material were stored in inverted order.
-rwxr-xr-xjs/lib/geom/circle.js28
1 files changed, 14 insertions, 14 deletions
diff --git a/js/lib/geom/circle.js b/js/lib/geom/circle.js
index 6627b4b7..086c1058 100755
--- a/js/lib/geom/circle.js
+++ b/js/lib/geom/circle.js
@@ -305,6 +305,20 @@ exports.Circle = Object.create(GeomObj, {
305 strokePrim1 = this.generateOvalRing(x, y, reverseRotMat, fillScaleMat, strokeScaleMat, nTriangles, strokeMaterial2); 305 strokePrim1 = this.generateOvalRing(x, y, reverseRotMat, fillScaleMat, strokeScaleMat, nTriangles, strokeMaterial2);
306 } 306 }
307 307
308 if (strokePrim0) {
309 strokeMaterial0.fitToPrimitive( strokePrim0 );
310
311 this._primArray.push( strokePrim0 );
312 this._materialNodeArray.push( strokeMaterial0.getMaterialNode() );
313 }
314
315 if (strokePrim1) {
316 strokeMaterial2.fitToPrimitive( strokePrim1 );
317
318 this._primArray.push( strokePrim1 );
319 this._materialNodeArray.push( strokeMaterial2.getMaterialNode() );
320 }
321
308 ///////////////////////////////////////////////////////////// 322 /////////////////////////////////////////////////////////////
309 // Fill 323 // Fill
310 fillMaterial = this.makeFillMaterial(); 324 fillMaterial = this.makeFillMaterial();
@@ -321,20 +335,6 @@ exports.Circle = Object.create(GeomObj, {
321 this._materialNodeArray.push( fillMaterial.getMaterialNode() ); 335 this._materialNodeArray.push( fillMaterial.getMaterialNode() );
322 } 336 }
323 337
324 if (strokePrim0) {
325 strokeMaterial0.fitToPrimitive( strokePrim0 );
326
327 this._primArray.push( strokePrim0 );
328 this._materialNodeArray.push( strokeMaterial0.getMaterialNode() );
329 }
330
331 if (strokePrim1) {
332 strokeMaterial2.fitToPrimitive( strokePrim1 );
333
334 this._primArray.push( strokePrim1 );
335 this._materialNodeArray.push( strokeMaterial2.getMaterialNode() );
336 }
337
338 world.updateObject(this); 338 world.updateObject(this);
339 } 339 }
340 }, 340 },