diff options
author | John Mayhew | 2012-05-15 10:44:29 -0700 |
---|---|---|
committer | John Mayhew | 2012-05-15 10:44:29 -0700 |
commit | 6bced2460423b144c6327e7a21d27bd8f279cbd3 (patch) | |
tree | 5efc0dc482b63bb78070cda9819cab3e7ef1502e /js/tools/OvalTool.js | |
parent | 035c851a955952d0a1c89a7c8a646b674ab3f4f2 (diff) | |
parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
download | ninja-6bced2460423b144c6327e7a21d27bd8f279cbd3.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Diffstat (limited to 'js/tools/OvalTool.js')
-rwxr-xr-x | js/tools/OvalTool.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tools/OvalTool.js b/js/tools/OvalTool.js index f1da3a46..ce812398 100755 --- a/js/tools/OvalTool.js +++ b/js/tools/OvalTool.js | |||
@@ -68,7 +68,7 @@ exports.OvalTool = Montage.create(ShapeTool, { | |||
68 | var xOffset = ((left - canvas.offsetLeft + w/2) - canvas.width/2); | 68 | var xOffset = ((left - canvas.offsetLeft + w/2) - canvas.width/2); |
69 | var yOffset = -(canvas.height/2 - (top - canvas.offsetTop + h/2)); | 69 | var yOffset = -(canvas.height/2 - (top - canvas.offsetTop + h/2)); |
70 | 70 | ||
71 | var oval = new Circle(); //GLCircle(); | 71 | var oval = Object.create(Circle, {}); |
72 | oval.init(world, xOffset, yOffset, w, h, strokeSize, strokeColor, fillColor, innerRadius, strokeMaterial, fillMaterial, strokeStyle); | 72 | oval.init(world, xOffset, yOffset, w, h, strokeSize, strokeColor, fillColor, innerRadius, strokeMaterial, fillMaterial, strokeStyle); |
73 | 73 | ||
74 | world.addObject(oval); | 74 | world.addObject(oval); |