diff options
author | Nivesh Rajbhandari | 2012-04-02 14:52:14 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-04-02 14:52:14 -0700 |
commit | 5377e963c4413640cd3c04e0406384df04144568 (patch) | |
tree | 75a6c9e74ad45648f880107609b644bbb65fcc2a /js/tools/ShapeTool.js | |
parent | c4e83a61311db75c7a1c307553262e77ecaae662 (diff) | |
download | ninja-5377e963c4413640cd3c04e0406384df04144568.tar.gz |
Switching to Linear/RadialGradient materials will set the corresponding color. Also, dispatching an addElement event when toggling shape from WebGL/canvas2d so timeline can draw correctly.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/tools/ShapeTool.js')
-rwxr-xr-x | js/tools/ShapeTool.js | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js index 1a12401f..85009bc2 100755 --- a/js/tools/ShapeTool.js +++ b/js/tools/ShapeTool.js | |||
@@ -206,33 +206,6 @@ exports.ShapeTool = Montage.create(DrawingTool, { | |||
206 | } | 206 | } |
207 | }, | 207 | }, |
208 | 208 | ||
209 | _getMaterialColor: { | ||
210 | value: function(m) | ||
211 | { | ||
212 | var css, | ||
213 | colorObj; | ||
214 | if(m === "LinearGradientMaterial") | ||
215 | { | ||
216 | css = "-webkit-gradient(linear, left top, right top, from(rgb(255, 0, 0)), color-stop(0.3, rgb(0, 255, 0)), color-stop(0.6, rgb(0, 0, 255)), to(rgb(0, 255, 255)))"; | ||
217 | } | ||
218 | else if(m === "RadialGradientMaterial") | ||
219 | { | ||
220 | css = "-webkit-radial-gradient(50% 50%, ellipse cover, rgb(255, 0, 0) 0%, rgb(0, 255, 0) 30%, rgb(0, 0, 255) 60%, rgb(0, 255, 255) 100%)"; | ||
221 | } | ||
222 | |||
223 | if(css) | ||
224 | { | ||
225 | colorObj = this.application.ninja.colorController.getColorObjFromCss(css); | ||
226 | if(colorObj) | ||
227 | { | ||
228 | return {gradientMode:colorObj.color.gradientMode, color:colorObj.color.stops}; | ||
229 | } | ||
230 | } | ||
231 | |||
232 | return null; | ||
233 | } | ||
234 | }, | ||
235 | |||
236 | // We can draw on an existing canvas unless it has only a single shape object | 209 | // We can draw on an existing canvas unless it has only a single shape object |
237 | _useExistingCanvas: { | 210 | _useExistingCanvas: { |
238 | value: function() | 211 | value: function() |