diff options
author | hwc487 | 2012-05-11 11:28:15 -0700 |
---|---|---|
committer | hwc487 | 2012-05-11 11:28:15 -0700 |
commit | 634194bf87744dd6f693380ec878cc5dd42207a1 (patch) | |
tree | 9652bf677abb71b56582deb9c46fb2dcb7d9a687 /js/tools/OvalTool.js | |
parent | d1bcb47ba34f2f2b8db5fa310a9e9a9bd7973988 (diff) | |
parent | e2ef92008a39a67d4f7db0627c7352bdc06ed476 (diff) | |
download | ninja-634194bf87744dd6f693380ec878cc5dd42207a1.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugs
Conflicts:
js/lib/geom/circle.js
js/lib/geom/rectangle.js
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 6edec811..e9dc66bb 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); |