aboutsummaryrefslogtreecommitdiff
path: root/js/tools/BrushTool.js
Commit message (Collapse)AuthorAge
* BSD LicenseKris Kowal2012-07-09
|
* Remove trailing spacesKris Kowal2012-07-06
|
* Expand tabsKris Kowal2012-07-06
|
* Update copyright boilerplateKris Kowal2012-07-06
|
* 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>
* Merge pull request #280 from pushkarjoshi/brushtoolValerio Virgillito2012-06-08
|\ | | | | Brushtool
| * change the PI to make it look like the fill color affects the brush stroke colorPushkar Joshi2012-06-07
| |
* | Merge branch 'refs/heads/master' into element-model-fixesValerio Virgillito2012-06-06
|\| | | | | | | | | | | | | | | Conflicts: js/document/models/html.js js/document/views/design.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * rename dragging plane to dragPlane (for consistency with ShapeTool)Pushkar Joshi2012-05-29
| |
| * Merge branch 'master' into pentoolPushkar Joshi2012-05-21
| |\
| * \ Merge branch 'master' into pentoolPushkar Joshi2012-05-07
| |\ \
| * | | handle left button up correctly for the brush toolPushkar Joshi2012-05-01
| | | |
* | | | 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>
* | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-05-07
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WorkingBranch Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/components/tools-properties/brush-properties.reel/brush-properties.html js/components/tools-properties/fill-properties.reel/fill-properties.html js/components/tools-properties/pen-properties.reel/pen-properties.html js/components/tools-properties/pencil-properties.reel/pencil-properties.html js/components/tools-properties/selection-properties.reel/selection-properties.html js/components/tools-properties/shape-properties.reel/shape-properties.html js/components/tools-properties/tag-properties.reel/tag-properties.html js/components/tools-properties/text-properties.reel/text-properties.html
| * | Refactor creating elements. Removed makeNJElement and separated the model ↵Valerio Virgillito2012-05-03
| |/ | | | | | | | | | | creation Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* / First round of moving color chips into the sub tools. Shape and Pen tool now ↵John Mayhew2012-05-03
|/ | | | have chips in the sub tool bar. Still need to complete adding chips to the Brush tool and finalizing the subtool bar layout to our spec for all of the subtools.
* Refix brush tool elementAdded eventJonathan Duran2012-04-27
| | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* track the dragging plane based on the hit record so that the file IO works ↵Pushkar Joshi2012-04-26
| | | | again (bug fix)
* render the calligraphic brush stroke in realtime on a rotated canvasPushkar Joshi2012-04-25
|
* allow the realtime drawing of brush strokes drawn off the standard XY plane ↵Pushkar Joshi2012-04-24
| | | | by passing in the transformation matrix
* Merge branch 'master' into pentoolPushkar Joshi2012-04-17
|\ | | | | | | | | Conflicts: js/tools/PenTool.js
| * -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>
| * Removing fill, stroke, fillMaterial and strokeMaterial from the shapeModel ↵Nivesh Rajbhandari2012-04-05
| | | | | | | | | | | | cache because they can easily get out of sync with the actual colors and materials. Instead, we will always query the object for these values. 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>
| * | WebGL needs to have 3d styles to render.Nivesh Rajbhandari2012-03-22
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Merge branch 'master' into pentoolPushkar Joshi2012-04-04
|\ \ \ | | |/ | |/| | | | | | | Conflicts: js/tools/PenTool.js
| * | 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>
* | | draw the path overlay (and anchor points) taking into account the ↵Pushkar Joshi2012-04-04
|/ / | | | | | | transformation applied to the element canvas and the stage canvas. Still quite buggy.
* | correctly update the brush stroke canvas size and position when the stroke ↵Pushkar Joshi2012-03-23
| | | | | | | | size is changed (does not yet work when smoothing is applied) AND select the newly created brush stroke by default
* | Almost working version of brush tool that uses only local coordinates to ↵Pushkar Joshi2012-03-23
| | | | | | | | store the brush stroke points. Current version does not yet update the width and height of the brush stroke canvas upon changing the brush stroke through the PI. Also, current version does not obtain 3D position of points properly from the drawing tool base (see BrushTool _getUnsnappedPosition)
* | revert to using the angle without flipping its sign...fixing some minor bugs ↵Pushkar Joshi2012-03-20
| | | | | | | | | | | | and code cleanup GOOD status before doing 3D unprojection step
* | draw the brush stroke in realtimePushkar Joshi2012-03-19
| |
* | update values in the PI from values of the selected brush stroke or pen tool ↵Pushkar Joshi2012-03-15
| | | | | | | | path
* | PI for pen and brush strokesPushkar Joshi2012-03-14
| |
* | Add a smoothing amount parameter, and hide options based on checkboxesPushkar Joshi2012-03-13
|/
* bug fixes for spline interpolationPushkar Joshi2012-03-12
| | | | | | | AND Laplacian smoothing for denoising AND code cleanup (removing blocks of commented code)
* brush stroke options for calligraphic brush stylePushkar Joshi2012-03-08
|
* implement stroke hardness such that it is percentage of the stroke width ↵Pushkar Joshi2012-03-07
| | | | | | | that's fully the color of the brush AND add a smoothing flag for the brush options
* Merge branch 'master' into brushtoolPushkar Joshi2012-03-06
|\
| * 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>
* | Catmull-Rom spline sampling for the brush stroke, and options for stroke ↵Pushkar Joshi2012-03-02
| | | | | | | | size, stroke hardness and both stroke colors (left and right --- temporarily using the stroke and fill colors respectively)
* | first attempt at rendering the brush stroke as a collection of polylines ↵Pushkar Joshi2012-03-01
|/ | | | (number of polylines equals the stroke width)
* changed the registration point of the brush tool icon andPushkar Joshi2012-02-29
| | | | added a temporary check to prevent extremely long brush strokes
* resample the brush stroke so we don't have gaps if the path is drawn rapidly,Pushkar Joshi2012-02-29
| | | | | | | and, allow to change the stroke color, and, more efficient stroke rendering by drawing translated radial gradients (instead of creating new gradients for each stroke sample)
* Merge branch 'pentool' into brushtoolPushkar Joshi2012-02-24
|\ | | | | | | | | | | Conflicts: imports/codemirror/mode/scheme/scheme.js js/tools/BrushTool.js
| * 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>
| * Merged old FileIOJose Antonio Marquez2012-01-27
| |
* | first phase of simple resampling to prevent tiny segmentsPushkar Joshi2012-02-09
|/
* First commit of Ninja to ninja-internalPierre Frisch2012-01-27
Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>