aboutsummaryrefslogtreecommitdiff
path: root/js/tools/ShapeTool.js
Commit message (Collapse)AuthorAge
* jshint cleanup on the tools directoryValerio Virgillito2012-07-24
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* IKNINJA-1924 - Hovering over panel resizers after collapsing and expanding ↵Nivesh Rajbhandari2012-07-19
| | | | | | | | panel causes error. Canvas sizes were not updated when using the splitter to toggle collapse/expansion of panels. This was fixed by the StageDrawingFixes pull request. We should also guard agains null value in stage's getElement routine. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* BSD LicenseKris Kowal2012-07-09
|
* Expand tabsKris Kowal2012-07-06
|
* Update copyright boilerplateKris Kowal2012-07-06
|
* Fixed not being able to draw linear and radial gradients. Also fixed ↵Nivesh Rajbhandari2012-06-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNINJA-1721 - File dirty marker does not show when modifying elements and IKNinja-1581 and IKNinja-1758 - Paint bucket fill bugs with lines and brush objects. Squashed commit of the following: commit 7cad082c89911d34a99feeef8e91d22b89cae8f1 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Thu Jun 28 17:52:07 2012 -0700 Fix for not being able to draw linear and radial gradient materials. I'm turning off pre-flight support of gradients for WebGL since it conflicts with the materials' color support. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit d0df8a2bff052d855bafb7885792b1dfff8eab7d Merge: 2c67d26 b4b54f6 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Thu Jun 28 17:50:11 2012 -0700 Merge branch 'refs/heads/ninja-internal' into ToolFixes commit 2c67d264851f0897fdca8ca887c1c82d0e434217 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Thu Jun 28 15:06:13 2012 -0700 IKNINJA-1721 - File dirty marker does not show when modifying elements. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit bb4b6a52eb75efb2f435cdb53f810ae3bc1f1fc3 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Thu Jun 28 11:15:34 2012 -0700 IKNinja-1581 and IKNinja-1758 - Paint bucket fill bugs with lines and brush objects. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Support pre-flighting of gradients for shape tools - rect, line, oval, brush ↵Nivesh Rajbhandari2012-06-26
| | | | | | and pen. Note that WebGL shapes are not supported yet. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* rewrite: currentSelectedContainer -> domContainerValerio Virgillito2012-06-08
| | | | | | | Fixed the currentSelectedContainer by removing bindings and using property change on the current document added the red outline back. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'refs/heads/master' into element-model-fixesValerio Virgillito2012-06-06
|\ | | | | | | | | | | | | | | Conflicts: js/tools/LineTool.js js/tools/ShapeTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Do not create any tags or shapes with width or height of 0.Nivesh Rajbhandari2012-06-06
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | removing all model creators.Valerio Virgillito2012-06-05
|/ | | | | | The elementModel is now a getter that will create a new model when needed. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* IKNinja-1628 - Can't draw shapes inside canvas after double-clicking into ↵Nivesh Rajbhandari2012-05-17
| | | | | | canvas. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Refactor creating elements. Removed makeNJElement and separated the model ↵Valerio Virgillito2012-05-03
| | | | | | creation Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Support drawing in side and top view. Also, adding back support for drawing ↵Nivesh Rajbhandari2012-05-01
| | | | | | shapes inside canvas when double-clicked into canvas or when moused over canvas. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Removing some console logsValerio Virgillito2012-04-30
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge pull request #182 from ericmueller/Canvas-interactionValerio Virgillito2012-04-30
|\ | | | | Canvas interaction
| * Creating shapes in a containerhwc4872012-04-27
| |
| * canvas interactionhwc4872012-04-26
| |
| * canvas interactionhwc4872012-04-23
| |
* | Simplifying the getElement method from stage and adding an exclusion list to ↵Valerio Virgillito2012-04-26
|/ | | | | | the new template Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Single perspective fix.Nivesh Rajbhandari2012-04-09
| | | | | | Note that rotating multiple objects when the stage is rotated still doesn't work and flatten still doesn't work. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* -webkit-transform-style needs to be set to preserve-3d for shapes regardless ↵Nivesh Rajbhandari2012-04-05
| | | | | | of whether they are 2d shapes or WebGL shapes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Merge branch 'refs/heads/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-04-04
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/templates/montage-html/default_html.css js/mediators/element-mediator.js js/panels/properties.reel/properties.js js/tools/BrushTool.js js/tools/LineTool.js js/tools/PenTool.js js/tools/SelectionTool.js js/tools/ShapeTool.js js/tools/TranslateObject3DTool.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Merge branch 'refs/heads/WebGLFileIO' into ToolFixesNivesh Rajbhandari2012-04-04
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: assets/canvas-runtime.js js/controllers/elements/shapes-controller.js js/lib/drawing/world.js js/lib/geom/geom-obj.js js/lib/geom/line.js js/mediators/element-mediator.js js/panels/presets/animations-presets.reel/animations-presets.js js/panels/presets/style-presets.reel/style-presets.js js/panels/presets/transitions-presets.reel/transitions-presets.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Give user feedback about which element the Fill/InkBottle tools will act on.Nivesh Rajbhandari2012-04-03
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Switching to Linear/RadialGradient materials will set the corresponding ↵Nivesh Rajbhandari2012-04-02
| | | | | | | | | | | | | | | | | | 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>
| | * Update PI and Color Panel to reflect default LinearGradient and ↵Nivesh Rajbhandari2012-03-30
| | | | | | | | | | | | | | | | | | RadialGradient materials' colors. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Squashed commit of Preparing for the montage undo-manager: Architecture changesValerio Virgillito2012-04-04
| |/ | | | | | | | | | | | | | | | | Reworked the add and remove elements into 1 function which can take 1 or more elements. Removed the _element from the selection array Many other changes related to those 2 changes Undo/Redo shortcuts are now using montage undo/redo manager. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* / WebGL needs to have 3d styles to render.Nivesh Rajbhandari2012-03-22
|/ | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Squashed commit of preload-fix into MasterValerio Virgillito2012-03-06
| | | | | | | - Requiring all the previously pre-loaded files - RDGE, Codemirror and gl-matrix are not included via a script tag. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Adding a data-RDGE-id attribute to each canvas to save/load canvas dataValerio Virgillito2012-02-16
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-06
|\
| * Update element planes after shapes are created so stage grid updates.Nivesh Rajbhandari2012-02-03
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Merged old FileIOJose Antonio Marquez2012-01-27
|/
* First commit of Ninja to ninja-internalPierre Frisch2012-01-27
Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>