aboutsummaryrefslogtreecommitdiff
path: root/js/tools
Commit message (Collapse)AuthorAge
...
* | Merge branch 'master' into pentoolPushkar Joshi2012-03-13
|\ \ | |/ |/|
| * Merge pull request #110 from mqg734/WebGLFixesValerio Virgillito2012-03-13
| |\ | | | | | | Gradient Support for Shapes and Eyedropper support for gradients. Also fixed 3d bug when moving multiple selections in 3d using the Selection Tool
| | * Fixed element mediator, PI, and eye-dropper to handle different borders ↵Nivesh Rajbhandari2012-03-12
| | | | | | | | | | | | | | | | | | sides and gradients. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Fixing selection tool when moving multiple selection in 3d mode.Nivesh Rajbhandari2012-03-09
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Eyedropper support for getting color value from webgl shapes.Nivesh Rajbhandari2012-03-09
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Eyedropper now supports strokes in rectangle shapes.Nivesh Rajbhandari2012-03-07
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-03-06
| | |\
| | * | Create drag plane parallel to working plane and offset by where the user ↵Nivesh Rajbhandari2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | clicked in z. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Do not use transform code if transform mode is off.Nivesh Rajbhandari2012-03-05
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | We should show snap marker on mouse move even if user hasn't moused down yet.Nivesh Rajbhandari2012-03-02
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | turn off the fill color for pen tool paths by defaultPushkar 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 pentoolPushkar 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>
* | Merge branch 'master' into pentoolPushkar Joshi2012-03-05
|\|
| * Fixing flying off into space bug for translate tool too.Nivesh Rajbhandari2012-03-02
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Don't draw transform handles if the stage is the target element.Nivesh Rajbhandari2012-03-02
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Fix for jumping issue when moving items that have any 3d on them.Nivesh Rajbhandari2012-03-02
| | | | | | | | | | | | We can't translate 3d moves into 2d space due to perspective, so we must update the matrix3d values instead of the top-left values if items have 3d. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Fix for elements flying off into space when moving elements that overlap.Nivesh Rajbhandari2012-03-01
| | | | | | | | | | | | This was happening because our hit record's element and the browser's element from point did not match. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Fixed logic error when resizing with the top-left transform handles.Nivesh Rajbhandari2012-03-01
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Re-fixing IKNinja-940 - Can't select objects when in side/top view.Nivesh Rajbhandari2012-03-01
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Last-used material (instead of FlatMaterial) is applied to shape when ↵Nivesh Rajbhandari2012-02-29
| | | | | | | | | | | | turning on use WebGL checkbox in the PI. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Merge branch 'brushtool' into pentoolPushkar Joshi2012-03-02
|\ \
| * | Merge branch 'master' into brushtoolPushkar Joshi2012-03-02
| |\|
| | * Merge pull request #88 from mqg734/ToolFixesValerio Virgillito2012-02-29
| | |\ | | | | | | | | Fix for performance issue when moving shapes.
| | | * Fix for performance issue when moving shapes. We don't need to call render ↵Nivesh Rajbhandari2012-02-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | except if the geometry and materials change. This is more easy to see with shapes like the brush tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Merge pull request #85 from pushkarjoshi/brushtoolValerio Virgillito2012-02-29
| | |\ \ | | | | | | | | | | Brushtool
| | * \ \ Merge branch 'integration-candidate' of ↵Valerio Virgillito2012-02-28
| | |\ \ \ | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into integration-candidate
| | | * \ \ Merge pull request #79 from pushkarjoshi/pentoolValerio Virgillito2012-02-28
| | | |\ \ \ | | | | | | | | | | | | | | Pentool
| | * | \ \ \ Merge branch 'ToolFixes' of https://github.com/mqg734/ninja-internal into ↵Valerio Virgillito2012-02-28
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | / | | | | |_|/ | | | |/| | integration-candidate
| | | * | | Fix for "jumping" issue when using the selection tool repeatedly.Nivesh Rajbhandari2012-02-28
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | Merge branch 'integration' of https://github.com/ericmueller/ninja-internal ↵Valerio Virgillito2012-02-28
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | into integration-candidate
| | | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-02-28
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | integration
| | | * | | | Enable shift key constraint for Pan Tool.hwc4872012-02-27
| | | | | | |
| | | * | | | bug fixes for canvas 2d shape drawing.hwc4872012-02-23
| | | | | | |
| | | * | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into integrationhwc4872012-02-22
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-02-22
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | integration
| | | * | | | | | Adding bug fixes.hwc4872012-02-22
| | | | | | | | |
| | * | | | | | | Reset translation values as well when double-clicking to reset the rotation ↵Nivesh Rajbhandari2012-02-27
| | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | values. Signed-off-by: Nivesh Rajbhandari <mqg734@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)
* / | | | | | show feedback on mouseover on a part of the path where a new anchor will be ↵Pushkar Joshi2012-03-01
|/ / / / / / | | | | | | | | | | | | | | | | | | added if clicked
* | | | | | 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-28
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'master' into pentoolPushkar Joshi2012-02-28
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: manifest.json
| | * | | | Moved all color updating routines to a single function.Nivesh Rajbhandari2012-02-24
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | Distinguish between border top/right/bottom/left colors. Also, fall back to ↵Nivesh Rajbhandari2012-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | snapping routine when selecting only if the active tool allows snapping. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>