diff options
Diffstat (limited to 'js/tools/RectTool.js')
-rwxr-xr-x | js/tools/RectTool.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/tools/RectTool.js b/js/tools/RectTool.js index 0c14a559..b35a101a 100755 --- a/js/tools/RectTool.js +++ b/js/tools/RectTool.js | |||
@@ -59,8 +59,8 @@ exports.RectTool = Montage.create(ShapeTool, { | |||
59 | var blRadius = ShapesController.GetValueInPixels(this.options.BLRadiusControl.value, this.options.BLRadiusControl.units, h); | 59 | var blRadius = ShapesController.GetValueInPixels(this.options.BLRadiusControl.value, this.options.BLRadiusControl.units, h); |
60 | var brRadius = ShapesController.GetValueInPixels(this.options.BRRadiusControl.value, this.options.BRRadiusControl.units, h); | 60 | var brRadius = ShapesController.GetValueInPixels(this.options.BRRadiusControl.value, this.options.BRRadiusControl.units, h); |
61 | 61 | ||
62 | var strokeColor = this.application.ninja.colorController.colorToolbar.stroke.webGlColor; | 62 | var strokeColor = this.options.stroke.webGlColor; |
63 | var fillColor = this.application.ninja.colorController.colorToolbar.fill.webGlColor; | 63 | var fillColor = this.options.fill.webGlColor; |
64 | // for default stroke and fill/no materials | 64 | // for default stroke and fill/no materials |
65 | var strokeMaterial = null; | 65 | var strokeMaterial = null; |
66 | var fillMaterial = null; | 66 | var fillMaterial = null; |
@@ -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 | ||