Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | | | | Merge branch 'brushtool' into pentool | Pushkar Joshi | 2012-03-28 | |
|\ \ \ \ | | |/ / | |/| | | ||||
| * | | | turn off changing the left and top of the brush stroke canvas | Pushkar Joshi | 2012-03-28 | |
| | | | | ||||
* | | | | 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 | |||
* | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-27 | |
|\ \ \ | | |/ | |/| | ||||
| * | | Fixed issue with WebGL materials not working after file-save or ↵ | Nivesh Rajbhandari | 2012-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 Joshi | 2012-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 Joshi | 2012-03-27 | |
| | | | | | | | | | | | | get called | |||
* | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-27 | |
|\| | | | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js | |||
| * | | Fixed a problem switching from 3D to 2D and back to 3D. | hwc487 | 2012-03-23 | |
| | | | ||||
| * | | Added Paris and Raiders materials | hwc487 | 2012-03-22 | |
| | | | ||||
| * | | Bug Fixes for Canvas & WebGL File IO | hwc487 | 2012-03-20 | |
| | | | ||||
| * | | Supporting new and old GL data formats. | hwc487 | 2012-03-16 | |
| | | | ||||
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-03-16 | |
| |\ \ | | | | | | | | | | | | | integration | |||
| * | | | Conversion to JSON based file IO for canvas2D and WebGL rendering | hwc487 | 2012-03-16 | |
| | | | | ||||
* | | | | correctly update the brush stroke canvas size and position when the stroke ↵ | Pushkar Joshi | 2012-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 Joshi | 2012-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 Joshi | 2012-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 Joshi | 2012-03-20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | and code cleanup GOOD status before doing 3D unprojection step | |||
* | | | | draw the brush stroke in realtime | Pushkar Joshi | 2012-03-19 | |
| | | | | ||||
* | | | | first pass for file IO of brush strokes | Pushkar Joshi | 2012-03-19 | |
| | | | | ||||
* | | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-16 | |
|\ \ \ \ | | |/ / | |/| | | ||||
| * | | | Merge pull request #34 from ericmueller/integration | Jose Antonio Marquez Russo | 2012-03-15 | |
| |\| | | | | | | | | | | Integration | |||
| | * | | Uber material changes for IO | hwc487 | 2012-03-12 | |
| | | | | ||||
* | | | | 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 | |
| | | | | ||||
* | | | | Merge branch 'pentool' into brushtool | Pushkar Joshi | 2012-03-13 | |
|\| | | | ||||
| * | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-03-13 | |
| |\ \ \ | ||||
| | * \ \ | Merge pull request #110 from mqg734/WebGLFixes | Valerio Virgillito | 2012-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 | |||
| | | * | | | Support import/export of gradient materials. This fixes the eyedropper not ↵ | Nivesh Rajbhandari | 2012-03-12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | being able to sample gradient colors from WebGL shapes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | * | | | Fixing radial gradient for rectangle. | Nivesh Rajbhandari | 2012-03-09 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | * | | | Fixing radial gradients for line and circle. | Nivesh Rajbhandari | 2012-03-09 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | * | | | gradient support for canvas-2d shapes. | Nivesh Rajbhandari | 2012-03-07 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | * | | | Change linear gradient to go from left to right instead of top-left to ↵ | Nivesh Rajbhandari | 2012-03-07 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bottom-right. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | * | | | Gradient support for canvas-2d rectangle. | Nivesh Rajbhandari | 2012-03-07 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | * | | | Fix for stroke and fill gradients not being retained when drawing multiple ↵ | Nivesh Rajbhandari | 2012-03-07 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shapes and switching between them. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | * | | | preliminary support for setting gradients on webgl shapes. | Nivesh Rajbhandari | 2012-03-07 | |
| | | | |/ | | | |/| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | | | Merge pull request #108 from pushkarjoshi/brushtool | Valerio Virgillito | 2012-03-13 | |
| | |\ \ \ | | | |_|/ | | |/| | | Brushtool | |||
| | * | | | Canvas IO | hwc487 | 2012-03-08 | |
| | | | | | ||||
| | * | | | File IO | hwc487 | 2012-03-07 | |
| | | |/ | | |/| | ||||
* | / | | Add a smoothing amount parameter, and hide options based on checkboxes | Pushkar Joshi | 2012-03-13 | |
|/ / / | ||||
* | / | turn off the fill color for pen tool paths by default | Pushkar Joshi | 2012-03-13 | |
| |/ |/| | ||||
* | | seemingly working version of the calligraphic brush (seems to work with ↵ | Pushkar Joshi | 2012-03-12 | |
| | | | | | | | | transparency and large stroke widths...seems to work better with smoothing) | |||
* | | bug fixes for spline interpolation | Pushkar Joshi | 2012-03-12 | |
| | | | | | | | | | | | | | | AND Laplacian smoothing for denoising AND code cleanup (removing blocks of commented code) | |||
* | | brush stroke options for calligraphic brush style | Pushkar Joshi | 2012-03-08 | |
| | | ||||
* | | implement stroke hardness such that it is percentage of the stroke width ↵ | Pushkar Joshi | 2012-03-07 | |
| | | | | | | | | | | | | | | that's fully the color of the brush AND add a smoothing flag for the brush options | |||
* | | merge Valerio's architecture changes | Pushkar Joshi | 2012-03-06 | |
| | | ||||
* | | merge Valerio's architecture changes into pen tool | 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> |