| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | took out bad merge line and use different function for converting points ↵ | Pushkar Joshi | 2012-04-17 |
| | | | | | from local to global coords (the latter should be a temporary change as I will significantly change this) | ||
| * | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-17 |
| |\ | | | | | | | | | Conflicts: js/tools/PenTool.js | ||
| | * | -webkit-transform-style needs to be set to preserve-3d for shapes regardless ↵ | Nivesh Rajbhandari | 2012-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 Rajbhandari | 2012-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 WebGLMaterials | Nivesh Rajbhandari | 2012-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 Rajbhandari | 2012-03-22 |
| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | Snapshot for pen tool before merging with master....can draw polylines (no ↵ | Pushkar Joshi | 2012-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 Joshi | 2012-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 Joshi | 2012-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 Joshi | 2012-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 Joshi | 2012-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 Joshi | 2012-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 Joshi | 2012-04-11 |
| | | | | | | | | | | | | | than XY | ||
| * | | | correctly add points to open paths on transformed canvases | Pushkar Joshi | 2012-04-11 |
| | | | | |||
| * | | | dragging anchor points in 3D (seems to work ok for existing paths --- the ↵ | Pushkar Joshi | 2012-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 Joshi | 2012-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 Joshi | 2012-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 Joshi | 2012-04-09 |
| | | | | | | | | | | | | | canvas, and with a rotated view | ||
| * | | | improved comment about plane matrix (no real change) | Pushkar Joshi | 2012-04-06 |
| | | | | |||
| * | | | Don't update the plane matrix of subpaths that already have a plane matrix | Pushkar Joshi | 2012-04-06 |
| | | | | |||
| * | | | code cleanup and working version of selected path anchor point and overlay ↵ | Pushkar Joshi | 2012-04-06 |
| | | | | | | | | | | | | | display for new paths | ||
| * | | | complete version of the code for rendering selected subpath anchor points ↵ | Pushkar Joshi | 2012-04-06 |
| | | | | | | | | | | | | | and path overlay (code needs cleanup)...still buggy if creating new paths | ||
| * | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-04 |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: js/tools/PenTool.js | ||
| | * | | Squashed commit of Preparing for the montage undo-manager: Architecture changes | Valerio Virgillito | 2012-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 Joshi | 2012-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 Joshi | 2012-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 Joshi | 2012-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 Joshi | 2012-04-03 |
| | | | | | | | | | | | | | roundoff errors when constantly changing stroke width | ||
| * | | | render the pen path with local coordinates, but use stage world coordinates ↵ | Pushkar Joshi | 2012-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 Joshi | 2012-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 Joshi | 2012-03-28 |
| | | | | | | | | | | | | | cursors correctly over the exact mouse position AND reduce the radius (distance threshold) for picking paths | ||
| * | | | added cursors to the pen tool UI AND change cursor when the user hovers over ↵ | Pushkar Joshi | 2012-03-27 |
| |/ / | | | | | | | an anchor point or handles of thte selected anchor | ||
| * | | update values in the PI from values of the selected brush stroke or pen tool ↵ | Pushkar Joshi | 2012-03-15 |
| | | | | | | | | | path | ||
| * | | PI for pen and brush strokes | Pushkar Joshi | 2012-03-14 |
| |/ | |||
| * | turn off the fill color for pen tool paths by default | Pushkar Joshi | 2012-03-13 |
| | | |||
| * | Merge branch 'master' into pentool | Pushkar Joshi | 2012-03-06 |
| |\ | |||
| | * | Squashed commit of preload-fix into Master | Valerio Virgillito | 2012-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> | ||
| * | | show feedback on mouseover on a part of the path where a new anchor will be ↵ | Pushkar Joshi | 2012-03-01 |
| |/ | | | | added if clicked | ||
| * | new anchor control guide rendering (smaller handles) | Pushkar Joshi | 2012-02-28 |
| | | | | | | and clamp min. width and height to 1 while resizing subpaths | ||
| * | Bug fixes: | Pushkar Joshi | 2012-02-28 |
| | | | | | | | 1152: allow deleting of multiple paths from inside pen tool 1128: keyboard hotkey shortcut 'P' for pen tool 941: changing width or height of the path scales the path | ||
| * | Adding a data-RDGE-id attribute to each canvas to save/load canvas data | Valerio Virgillito | 2012-02-16 |
| | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-09 |
| |\ | |||
| | * | bug fixes for better anchor point rotation and removing snapping on hover ↵ | Pushkar Joshi | 2012-02-08 |
| | | | | | | | | | and mouse down | ||
| | * | some minor bug fixes and code cleanup | Pushkar Joshi | 2012-02-07 |
| | | | |||
| | * | avoid overriding GlGeomObj translate method | Pushkar Joshi | 2012-02-01 |
| | | | |||
| | * | handle the case of proper redraw when the alt key is held down even after ↵ | Pushkar Joshi | 2012-01-31 |
| | | | | | | | | | mouse up | ||
| | * | display the anchor point to be selected on mouse hover | Pushkar Joshi | 2012-01-31 |
| | | | |||
| | * | Merge pushkar branch on gerritt with github version | Pushkar Joshi | 2012-01-30 |
| | | | |||
| * | | Merged old FileIO | Jose Antonio Marquez | 2012-01-27 |
| |/ | |||
| * | First commit of Ninja to ninja-internal | Pierre Frisch | 2012-01-27 |
| Signed-off-by: Valerio Virgillito <rmwh84@motorola.com> | |||