aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-25
|\
| * Merge pull request #174 from pushkarjoshi/pentoolValerio Virgillito2012-04-24
| |\ | | | | | | Pentool
| | * Merge branch 'master' into pentoolPushkar Joshi2012-04-24
| | |\ | | |/ | |/|
| | * 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
| | * | 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
| | * | | Snapshot for pen tool before merging with master....can draw polylines (no ↵Pushkar Joshi2012-04-17
| | | | | | | | | | | | | | | | | | | | prev, next) handles and hit testing in 3D. Update of the canvas with a transformation on it will modify the canvas incorrectly, and will be completed after merging with master
| | * | | re-enable some hit testing and change the code for obtaining 3D (stage ↵Pushkar Joshi2012-04-16
| | | | | | | | | | | | | | | | | | | | world) point when there is no canvas yet
| | * | | limit the size of the subpath canvas by ignoring the last point added that ↵Pushkar Joshi2012-04-16
| | | | | | | | | | | | | | | | | | | | tool the canvas size over the specified limit
| | * | | Allow the path stroke width to be changed without causing a drift in the ↵Pushkar Joshi2012-04-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | canvas position AND some code cleanup (remove canvas left and top tracking for each subpath) AND add flags for the specifying in what coordinate space we're sampling the subpath
| | * | | Still buggy version of pen tool that can create polylines in 3D space ↵Pushkar Joshi2012-04-13
| | | | | | | | | | | | | | | | | | | | correctly (except for incorrect canvas translation). Using cleaned up and re-factored version of the code. Not suitable for testing.
| | * | | Use local coordinates for rendering and hit testing only when the path ↵Pushkar Joshi2012-04-12
| | | | | | | | | | | | | | | | | | | | canvas exists....AND...good state for code that works in 3D as long as the path was originally created in XY plane of the stage
| | * | | create paths in 3D...still buggy if starting from scratch in planes other ↵Pushkar Joshi2012-04-11
| | | | | | | | | | | | | | | | | | | | than XY
| | * | | correctly add points to open paths on transformed canvasesPushkar Joshi2012-04-11
| | | | |
| | * | | dragging anchor points in 3D (seems to work ok for existing paths --- the ↵Pushkar Joshi2012-04-11
| | | | | | | | | | | | | | | | | | | | left and top change causes the rest of the points to move, which *may* be unavoidable), still has bugs with NEW points being placed at wrong position
| | * | | Use local coordinates to pick a point within the path (works correctly even ↵Pushkar Joshi2012-04-11
| | | | | | | | | | | | | | | | | | | | with canvas and/or stage transformation). Dragging does not yet work in case of canvas transformation
| | * | | compute and store local coordinates for all anchor points and their control ↵Pushkar Joshi2012-04-10
| | | | | | | | | | | | | | | | | | | | handles separately, AND more hit testing with local coordinates
| | * | | snapping feedback for pen tool, correct for subpaths that may lie on rotated ↵Pushkar Joshi2012-04-09
| | | | | | | | | | | | | | | | | | | | canvas, and with a rotated view
| | * | | Merge branch 'master' into pentoolPushkar Joshi2012-04-06
| | |\ \ \
| | * | | | improved comment about plane matrix (no real change)Pushkar Joshi2012-04-06
| | | | | |
| | * | | | Don't update the plane matrix of subpaths that already have a plane matrixPushkar Joshi2012-04-06
| | | | | |
| | * | | | code cleanup and working version of selected path anchor point and overlay ↵Pushkar Joshi2012-04-06
| | | | | | | | | | | | | | | | | | | | | | | | display for new paths
| | * | | | complete version of the code for rendering selected subpath anchor points ↵Pushkar Joshi2012-04-06
| | | | | | | | | | | | | | | | | | | | | | | | and path overlay (code needs cleanup)...still buggy if creating new paths
| | * | | | Merge branch 'master' into pentoolPushkar Joshi2012-04-04
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/tools/PenTool.js
| | * | | | | 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.
| | * | | | | Merge branch 'master' into pentoolPushkar Joshi2012-04-03
| | |\ \ \ \ \
| | * | | | | | 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
| | * | | | | | adjust the position for the pen tool feedback cursor AND fix a bug where ↵Pushkar Joshi2012-03-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | everything selected gets deleted (even if we have a selected subpath)
| | * | | | | | change cursors for pen tool realtime feedback....still need to position the ↵Pushkar Joshi2012-03-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cursors correctly over the exact mouse position AND reduce the radius (distance threshold) for picking paths
| | * | | | | | Merge branch 'brushtool' into pentoolPushkar 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
* | | | | | | | | Revert "Fix Pen Tool not broadcasting elementAdded event"Jonathan Duran2012-04-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0475cb7e37601366ec07d77fcea44269d3d49633. Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/layout/bread-crumb.reel/bread-crumb.js Signed-off-by: Jonathan Duran <jduran@motorola.com>