aboutsummaryrefslogtreecommitdiff
path: root/js/lib
Commit message (Collapse)AuthorAge
...
* | | | | | | | | | | 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.
* | | | | | | | | | working File I/O for pen tool created paths and some minor bug fixes ↵Pushkar Joshi2012-04-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (correctly setting the canvas for brush stroke file I/O, correct plane matrix for file I/O)
* | | | | | | | | | track the canvas top left position instead of the center position to figure ↵Pushkar Joshi2012-04-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | out when to translate the subpath per canvas translation...this one seems to not drift (no floating point issues uncovered so far)
* | | | | | | | | | First attempt at preventing the drifting of the canvas due to floating point ↵Pushkar Joshi2012-04-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | roundoff errors when constantly changing stroke width
* | | | | | | | | | render the pen path with local coordinates, but use stage world coordinates ↵Pushkar Joshi2012-04-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to position the canvas on which the path is rendered AND add data-montage- to the ids in the pen and brush reels AND fix a bug with pen stroke transparency not working
* | | | | | | | | | Merge branch 'brushtool' into pentoolPushkar Joshi2012-03-28
|\| | | | | | | | |
| * | | | | | | | | turn off changing the left and top of the brush stroke canvasPushkar Joshi2012-03-28
| | | | | | | | | |
* | | | | | | | | | added cursors to the pen tool UI AND change cursor when the user hovers over ↵Pushkar Joshi2012-03-27
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | an anchor point or handles of thte selected anchor
* | | | | | | | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-27
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Fixed issue with WebGL materials not working after file-save or ↵Nivesh Rajbhandari2012-03-26
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | chrome-preview. Also fixed Raiders material not showing in the PI or working during Chrome Preview. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | File IO for the brush stroke AND changing the data type of brush stroke from ↵Pushkar Joshi2012-03-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GEOM_TYPE_CUBIC_BEZIER to GEOM_TYPE_BRUSH_STROKE
* | | | | | | | add a setfillcolor to brush stroke so the default fillcolor handler does not ↵Pushkar Joshi2012-03-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get called
* | | | | | | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js
| * | | | | | | Check for a authortime animation setting in the draw routine for WebGL.Nivesh Rajbhandari2012-03-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | Merge branch 'refs/heads/montage-integration' into WebGL-Animation-CheckBoxNivesh Rajbhandari2012-03-24
| |\ \ \ \ \ \ \
| | * | | | | | | Fixed a problem switching from 3D to 2D and back to 3D.hwc4872012-03-23
| | | | | | | | |
| * | | | | | | | Check for a authortime animation setting in the draw routine for WebGL.Nivesh Rajbhandari2012-03-23
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | Respect play/pause WebGL animation when saving files and re-rendering caused ↵Nivesh Rajbhandari2012-03-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by geometry changes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | Squashed commit of the following GL integrationValerio Virgillito2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | Fixing the selection issuesValerio Virgillito2012-03-20
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | correctly update the brush stroke canvas size and position when the stroke ↵Pushkar Joshi2012-03-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | path is smoothed (and also when the stroke width is changed) AND some code cleanup to remove unnecessary brush stroke properties
* | | | | | | 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
| | | | | | |
* | | | | | | first pass for file IO of brush strokesPushkar Joshi2012-03-19
| | | | | | |
* | | | | | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-16
|\| | | | | |
| * | | | | | Merge pull request #34 from ericmueller/integrationJose Antonio Marquez Russo2012-03-15
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | Integration
| | * | | | | Corrections for Uber shader IOhwc4872012-03-14
| | | | | | |
| | * | | | | Uber material changes for IOhwc4872012-03-12
| | | | | | |
* | | | | | | update values in the PI from values of the selected brush stroke or pen tool ↵Pushkar Joshi2012-03-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | path
* | | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-03-14
|\| | | | | |
| * | | | | | Some code cleanup - removing unused assignments.Valerio Virgillito2012-03-13
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | PI for pen and brush strokesPushkar Joshi2012-03-14
| | | | | |
* | | | | | Merge branch 'pentool' into brushtoolPushkar Joshi2012-03-13
|\| | | | |
| * | | | | Merge branch 'master' into pentoolPushkar Joshi2012-03-13
| |\ \ \ \ \
| | * \ \ \ \ Merge pull request #110 from mqg734/WebGLFixesValerio Virgillito2012-03-13
| | |\ \ \ \ \ | | | | | | | | | | | | |