aboutsummaryrefslogtreecommitdiff
path: root/js/tools
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-05-02 16:50:38 -0700
committerNivesh Rajbhandari2012-05-02 16:50:38 -0700
commit7c77aa914eb96c2b5b797e37c16aa786c05f38e8 (patch)
treebc9d4d9f721552ca0b55299d217867c345f9db8b /js/tools
parenta809c6b3ba6f024922dd3f10bbc4ab456de2407e (diff)
downloadninja-7c77aa914eb96c2b5b797e37c16aa786c05f38e8.tar.gz
Converting geom-obj to object literal notation.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/tools')
-rwxr-xr-xjs/tools/LineTool.js2
-rwxr-xr-xjs/tools/OvalTool.js2
-rwxr-xr-xjs/tools/RectTool.js2
3 files changed, 3 insertions, 3 deletions
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index 9c4ba892..a32fbdc8 100755
--- a/js/tools/LineTool.js
+++ b/js/tools/LineTool.js
@@ -233,7 +233,7 @@ exports.LineTool = Montage.create(ShapeTool, {
233 var xOffset = ((left - canvas.offsetLeft + w/2) - canvas.width/2); 233 var xOffset = ((left - canvas.offsetLeft + w/2) - canvas.width/2);
234 var yOffset = (canvas.height/2 - (top - canvas.offsetTop + h/2)); 234 var yOffset = (canvas.height/2 - (top - canvas.offsetTop + h/2));
235 235
236 var line = new Line(); 236 var line = Object.create(Line, {});
237 line.init(world, xOffset, yOffset, w, h, slope, strokeSize, strokeColor, strokeMaterial, strokeStyle, xAdj, yAdj); 237 line.init(world, xOffset, yOffset, w, h, slope, strokeSize, strokeColor, strokeMaterial, strokeStyle, xAdj, yAdj);
238 238
239 world.addObject(line); 239 world.addObject(line);
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