diff options
author | Jonathan Duran | 2012-05-11 14:10:50 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-05-11 14:10:50 -0700 |
commit | 6fcaa4e923a19672b5860b4c6f67d836680e7e99 (patch) | |
tree | e473e99d0e9ad8e9ca44cc6e2c2e86d2e8ff7477 /js/tools | |
parent | 67a9691aba370cf4e9928ac6cf14548ded95fc92 (diff) | |
parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
download | ninja-6fcaa4e923a19672b5860b4c6f67d836680e7e99.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/tools')
-rwxr-xr-x | js/tools/LineTool.js | 3 | ||||
-rwxr-xr-x | js/tools/OvalTool.js | 2 | ||||
-rwxr-xr-x | js/tools/RectTool.js | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js index 5941b464..198d7e69 100755 --- a/js/tools/LineTool.js +++ b/js/tools/LineTool.js | |||
@@ -234,7 +234,8 @@ exports.LineTool = Montage.create(ShapeTool, { | |||
234 | var xOffset = ((left - canvas.offsetLeft + w/2) - canvas.width/2); | 234 | var xOffset = ((left - canvas.offsetLeft + w/2) - canvas.width/2); |
235 | var yOffset = (canvas.height/2 - (top - canvas.offsetTop + h/2)); | 235 | var yOffset = (canvas.height/2 - (top - canvas.offsetTop + h/2)); |
236 | 236 | ||
237 | var line = new Line(world, xOffset, yOffset, w, h, slope, strokeSize, strokeColor, strokeMaterial, strokeStyle, xAdj, yAdj); | 237 | var line = Object.create(Line, {}); |
238 | line.init(world, xOffset, yOffset, w, h, slope, strokeSize, strokeColor, strokeMaterial, strokeStyle, xAdj, yAdj); | ||
238 | 239 | ||
239 | world.addObject(line); | 240 | world.addObject(line); |
240 | world.render(); | 241 | world.render(); |
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); |
diff --git a/js/tools/RectTool.js b/js/tools/RectTool.js index 0c14a559..0a3c8200 100755 --- a/js/tools/RectTool.js +++ b/js/tools/RectTool.js | |||
@@ -87,7 +87,7 @@ exports.RectTool = Montage.create(ShapeTool, { | |||
87 | var xOffset = ((left - canvas.offsetLeft + w/2) - canvas.width/2); | 87 | var xOffset = ((left - canvas.offsetLeft + w/2) - canvas.width/2); |
88 | var yOffset = (canvas.height/2 - (top - canvas.offsetTop + h/2)); | 88 | var yOffset = (canvas.height/2 - (top - canvas.offsetTop + h/2)); |
89 | 89 | ||
90 | var rect = new Rectangle(); | 90 | var rect = Object.create(Rectangle, {}); |
91 | rect.init(world, xOffset, yOffset, w, h, strokeSize, strokeColor, fillColor, | 91 | rect.init(world, xOffset, yOffset, w, h, strokeSize, strokeColor, fillColor, |
92 | tlRadius, trRadius, blRadius, brRadius, strokeMaterial, fillMaterial, strokeStyle); | 92 | tlRadius, trRadius, blRadius, brRadius, strokeMaterial, fillMaterial, strokeStyle); |
93 | 93 | ||