aboutsummaryrefslogtreecommitdiff
path: root/js/tools
Commit message (Collapse)AuthorAge
* Merge pull request #176 from pushkarjoshi/brushtoolValerio Virgillito2012-04-27
|\ | | | | Brushtool
| * 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 pull request #175 from mqg734/BoundsCalculationValerio Virgillito2012-04-25
|\ \ | |/ |/| Allow users to toggle application of stroke and border settings when using the ink bottle tool. Also, fixed translate tool's handles to draw without stage's zoom.
| * Allow users to toggle application of stroke and border settings when using ↵Nivesh Rajbhandari2012-04-24
| | | | | | | | | | | | the ink bottle tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Fixing translate handles to draw without zoom value. Also fixed some typos ↵Nivesh Rajbhandari2012-04-20
| | | | | | | | | | | | in zoom code. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | re-compute and store the center of the subpath in local coordinates upon ↵Pushkar Joshi2012-04-24
| | | | | | | | file open
* | allow the addition of the pen tool to the timelinePushkar Joshi2012-04-23
| |
* | Merge branch 'master' into pentoolPushkar Joshi2012-04-19
|\| | | | | | | | | Conflicts: js/helper-classes/3D/view-utils.js
| * Moving initialzeSnapping routine from RotateObject3DTool tool to ↵Nivesh Rajbhandari2012-04-18
| | | | | | | | | | | | Rotate3DToolBase so Rotate Stage uses the same code. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Fixing some more merge issues.Nivesh Rajbhandari2012-04-18
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Merge branch 'refs/heads/ninja-internal' into EricMergeNivesh Rajbhandari2012-04-18
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/tools/Rotate3DToolBase.js js/tools/RotateStage3DTool.js js/tools/Translate3DToolBase.js js/tools/modifier-tool-base.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | snapping for stage rotation toolhwc4872012-04-16
| | |
| * | 3D translation fixeshwc4872012-04-16
| | |
| * | 3D rotationhwc4872012-04-13
| | |
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-13
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Snapping_II Conflicts: js/helper-classes/3D/view-utils.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 js/tools/Translate3DToolBase.js
| * | | 3D Rotate changeshwc4872012-04-13
| | | |
| * | | Rotate3D tool changeshwc4872012-04-11
| | | |
| * | | translate3DObject tool fixes.hwc4872012-04-05
| | | |
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-04
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Snapping Conflicts: 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
| * | | | Cap fix for vecUtils.hwc4872012-04-04
| | | | |
| * | | | turned off translation handles during a multi-object drag.hwc4872012-04-04
| | | | |
| * | | | Translate 3D fix for multi-selection Z translationhwc4872012-04-02
| | | | |
* | | | | get the canvas plane matrix before multiplying it with the translation due ↵Pushkar Joshi2012-04-19
| | | | | | | | | | | | | | | | | | | | to shift in center of rotation
* | | | | correctly maintain canvas position when drawing subpaths off the XY plane ↵Pushkar Joshi2012-04-19
| | | | | | | | | | | | | | | | | | | | (was a bug with starting drawing in those planes)
* | | | | for subpaths that have not been initialized with a canvas yet (i.e. no local ↵Pushkar Joshi2012-04-19
| | | | | | | | | | | | | | | | | | | | coordinates), use stage world mouse positions to translate the anchor points while dragging
* | | | | store the canvas center (in local space) per each subpath, instead of ↵Pushkar Joshi2012-04-19
| | | | | | | | | | | | | | | | | | | | tracking it by the pen tool. This fixes the bug where the canvas transform was incorrectly applied when the stroke width was changed
* | | | | turn off snapping for the pen tool (with an option to turn it back on if we ↵Pushkar Joshi2012-04-19
| | | | | | | | | | | | | | | | | | | | decide to, later)
* | | | | fix a bug with closing the subpathPushkar Joshi2012-04-18
| | | | |
* | | | | re-enable dragging and editing of anchor point handles for bezier path ↵Pushkar Joshi2012-04-18
| | | | | | | | | | | | | | | | | | | | editing in 3D
* | | | | compute the translation to new center of bounding of the subpath --- this ↵Pushkar Joshi2012-04-18
| | | | | | | | | | | | | | | | | | | | preserves the correct transformation applied to the subpath. This is a good snapshot of the polyline drawing in 3D (with some minor bugs).
* | | | | allow drawing polylines in YZ and XZ planes as well as XY. In those planes, ↵Pushkar Joshi2012-04-18
| | | | | | | | | | | | | | | | | | | | still have bug with shift when the bbox of the path grows (due to missing translation)
* | | | | Fairly stable version of polyline drawing code that works for paths on XY, ↵Pushkar Joshi2012-04-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | YZ, XZ planes. Current bugs: if the new point increases the bbox of the canvas, the entire canvas is shifted (due to inconsistency with center of rotation) AND the first two points added to planes other than XY have incorrect local coordinates (due to missing local coordinates)
* | | | | took out bad merge line and use different function for converting points ↵Pushkar Joshi2012-04-17
| | | | | | | | | | | | | | | | | | | | from local to global coords (the latter should be a temporary change as I will significantly change this)
* | | | | Merge branch 'master' into pentoolPushkar Joshi2012-04-17
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Conflicts: js/tools/PenTool.js
| * | | | fixed stage rotationValerio Virgillito2012-04-13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | clear console logValerio Virgillito2012-04-13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | fixing the transform handlesValerio Virgillito2012-04-13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | removing _undo array and _targets array and use object instead of matching ↵Valerio Virgillito2012-04-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | arrays to set properties Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Merge branch 'refs/heads/master' into undo-managerValerio Virgillito2012-04-12
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js 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>
| * | | | setProperties to the montage undo/redoValerio Virgillito2012-04-09
| |/ / / | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@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>
| * | | 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>
| * | | Fixing 3d tool reset to redraw handles.Nivesh Rajbhandari2012-04-05
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Commenting out console logs.Nivesh Rajbhandari2012-04-05
| | | | | | | | | | | | | | | | 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>
| | | * | We should require VecUtils instead of referring to the global reference ↵Nivesh Rajbhandari2012-04-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since we will eventually remove that from the window object. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 17:50:08 +0000