diff options
author | hwc487 | 2012-03-12 14:46:32 -0700 |
---|---|---|
committer | hwc487 | 2012-03-12 14:46:32 -0700 |
commit | ef2dd5dfc557154d4755914f73963da8e858c4f1 (patch) | |
tree | b2b3e7c5b948f210b9fcc5d3dbd39ae9752938f8 /assets/CanvasRuntime.js | |
parent | 124c1e0e4bf7a0523e641ee37352128690f15c28 (diff) | |
parent | e50077ad43f18f16de106ff6547520f73746932e (diff) | |
download | ninja-ef2dd5dfc557154d4755914f73963da8e858c4f1.tar.gz |
Merge branch 'integration' of github.com:ericmueller/ninja-internal into integration
Diffstat (limited to 'assets/CanvasRuntime.js')
-rw-r--r-- | assets/CanvasRuntime.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/assets/CanvasRuntime.js b/assets/CanvasRuntime.js index 5caf72ee..445050bc 100644 --- a/assets/CanvasRuntime.js +++ b/assets/CanvasRuntime.js | |||
@@ -852,12 +852,12 @@ function RuntimeOval() | |||
852 | // translate | 852 | // translate |
853 | var xCtr = 0.5*world.getViewportWidth() + this._xOffset, | 853 | var xCtr = 0.5*world.getViewportWidth() + this._xOffset, |
854 | yCtr = 0.5*world.getViewportHeight() + this._yOffset; | 854 | yCtr = 0.5*world.getViewportHeight() + this._yOffset; |
855 | var mat = Matrix.create( [ | 855 | var mat = [ |
856 | [ xScale, 0.0, 0.0, xCtr], | 856 | [ xScale, 0.0, 0.0, xCtr], |
857 | [ 0.0, yScale, 0.0, yCtr], | 857 | [ 0.0, yScale, 0.0, yCtr], |
858 | [ 0.0, 0.0, 1.0, 0.0], | 858 | [ 0.0, 0.0, 1.0, 0.0], |
859 | [ 0.0, 0.0, 0.0, 1.0] | 859 | [ 0.0, 0.0, 0.0, 1.0] |
860 | ] ); | 860 | ]; |
861 | 861 | ||
862 | // get a bezier representation of the circle | 862 | // get a bezier representation of the circle |
863 | var bezPts = this.circularArcToBezier( [0,0,0], [1,0,0], 2.0*Math.PI ); | 863 | var bezPts = this.circularArcToBezier( [0,0,0], [1,0,0], 2.0*Math.PI ); |