diff options
author | Jose Antonio Marquez Russo | 2012-03-08 10:49:06 -0800 |
---|---|---|
committer | Jose Antonio Marquez Russo | 2012-03-08 10:49:06 -0800 |
commit | 85f21e020ac281e8e545df1cf269034de99a00b1 (patch) | |
tree | 441834fa8b02b1cc2a970210020d27e06d2c99be /js/helper-classes/backup-delete/GLCircle.js | |
parent | d9813946dc28d8c28033a68b68300b9d9eda115c (diff) | |
parent | 11a6f18e274d7232cdbb8f6e9e65e0a5ab756451 (diff) | |
download | ninja-85f21e020ac281e8e545df1cf269034de99a00b1.tar.gz |
Merge pull request #29 from ericmueller/integration
Integration
Diffstat (limited to 'js/helper-classes/backup-delete/GLCircle.js')
-rwxr-xr-x | js/helper-classes/backup-delete/GLCircle.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/helper-classes/backup-delete/GLCircle.js b/js/helper-classes/backup-delete/GLCircle.js index 15ed6b6d..59d0bdaf 100755 --- a/js/helper-classes/backup-delete/GLCircle.js +++ b/js/helper-classes/backup-delete/GLCircle.js | |||
@@ -381,7 +381,6 @@ function GLCircle() | |||
381 | // translate | 381 | // translate |
382 | var xCtr = 0.5*world.getViewportWidth() + this._xOffset, | 382 | var xCtr = 0.5*world.getViewportWidth() + this._xOffset, |
383 | yCtr = 0.5*world.getViewportHeight() + this._yOffset; | 383 | yCtr = 0.5*world.getViewportHeight() + this._yOffset; |
384 | //ctx.setTransform( xScale, 0.0, 0.0, yScale, xCtr, yCtr ); | ||
385 | var mat = Matrix.create( [ | 384 | var mat = Matrix.create( [ |
386 | [ xScale, 0.0, 0.0, xCtr], | 385 | [ xScale, 0.0, 0.0, xCtr], |
387 | [ 0.0, yScale, 0.0, yCtr], | 386 | [ 0.0, yScale, 0.0, yCtr], |
@@ -538,6 +537,8 @@ function GLCircle() | |||
538 | rtnStr += "flatMaterial"; | 537 | rtnStr += "flatMaterial"; |
539 | rtnStr += "\n"; | 538 | rtnStr += "\n"; |
540 | 539 | ||
540 | rtnStr += this.exportMaterials(); | ||
541 | |||
541 | return rtnStr; | 542 | return rtnStr; |
542 | } | 543 | } |
543 | 544 | ||