aboutsummaryrefslogtreecommitdiff
path: root/js/lib
Commit message (Collapse)AuthorAge
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugshwc4872012-05-11
|\ | | | | | | | | | | Conflicts: js/lib/geom/circle.js js/lib/geom/rectangle.js
| * Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-05-07
| |\
| * | Converting geom-obj to object literal notation.Nivesh Rajbhandari2012-05-02
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Converting line, circle and rectangle shapes to object literal notation.Nivesh Rajbhandari2012-05-02
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | code cleanup for linear gradients.hwc4872012-05-08
| | |
* | | WebGL linear gradients to match CSShwc4872012-05-08
| | |
* | | Radial gradients to match CSShwc4872012-05-08
| |/ |/|
* | Refactor creating elements. Removed makeNJElement and separated the model ↵Valerio Virgillito2012-05-03
| | | | | | | | | | | | creation Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Nesting absolute element in the Tag tool. Refactoring element creation and ↵Valerio Virgillito2012-05-02
|/ | | | | | element models Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge pull request #182 from ericmueller/Canvas-interactionValerio Virgillito2012-04-30
|\ | | | | Canvas interaction
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-27
| |\ | | | | | | | | | Canvas-interaction
| * | canvas interactionhwc4872012-04-26
| | |
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-25
| |\ \ | | | | | | | | | | | | Canvas-interaction
| * | | Snapping tocontained objectshwc4872012-04-24
| | | |
| * | | canvas interactionhwc4872012-04-23
| | | |
* | | | Merge branch 'refs/heads/serialization'Valerio Virgillito2012-04-27
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-26
| |\ \ \
| * | | | Fixing the element model and adding get elementValerio Virgillito2012-04-26
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Merge pull request #176 from pushkarjoshi/brushtoolValerio Virgillito2012-04-27
|\ \ \ \ | |_|/ / |/| | | Brushtool
| * | | 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
* | | IKNinja-406 - Strange behavior when changing the corner radius to the ↵Nivesh Rajbhandari2012-04-25
| | | | | | | | | | | | | | | | | | | | | | | | maximum value. IKNinja-1236 - Corner radius is not applied if stroke size is >= 2 times the corner radius. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Changing canvas-2d gradient drawing to more closely match div's ↵Nivesh Rajbhandari2012-04-25
|/ / | | | | | | | | | | background-image gradient support. 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
* | Merge branch 'master' into pentoolPushkar Joshi2012-04-19
|\| | | | | | | | | Conflicts: js/helper-classes/3D/view-utils.js
| * IKNinja-1477 - Cannot preflight Fill color if WebGL Line shape is selected.Nivesh Rajbhandari2012-04-17
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | correctly maintain canvas position when drawing subpaths off the XY plane ↵Pushkar Joshi2012-04-19
| | | | | | | | (was a bug with starting drawing in those planes)
* | 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
* | re-enable dragging and editing of anchor point handles for bezier path ↵Pushkar Joshi2012-04-18
| | | | | | | | editing in 3D
* | 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)
* | Merge branch 'master' into pentoolPushkar Joshi2012-04-17
|\| | | | | | | | | Conflicts: js/tools/PenTool.js
| * Undoing mistakes from auto-merge.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>
| | | * Merge branch 'refs/heads/EricSnapping' into WebGLFileIONivesh Rajbhandari2012-04-04
| | | |\
| | | | * Snapping fixes.hwc4872012-04-02
| | | | |
| | | * | IKNinja-1399 - [Eyedropper] Not sampling WebGL gradients after file open.Nivesh Rajbhandari2012-04-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to set the isShape property in the elementModel on file open. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | IKNinna-1409 - Should dirty document when changing shape properties. ↵Nivesh Rajbhandari2012-04-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNinja-1391 - Shapes need to support no-color. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | Update PI and Color Panel to reflect default LinearGradient and ↵Nivesh Rajbhandari2012-03-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RadialGradient materials' colors. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | Merge branch 'refs/heads/ninja-internal' into WebGLFileIONivesh Rajbhandari2012-03-30
| | | |\| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | Updated shapes to always check for its stroke and fill colors and materials ↵Nivesh Rajbhandari2012-03-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of relying on the shapeModel cache because it can get out of sync. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | Build elements' properties3d values on file open.Nivesh Rajbhandari2012-03-27
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | Merge branch 'refs/heads/WebGLFileIO' into WebGLMaterialsNivesh Rajbhandari2012-03-27
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-03-27
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Do not set webkit-transform styles on elements unless 3d is used on them.Nivesh Rajbhandari2012-03-21
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Get matrix and perspective distance from styles controller.Nivesh Rajbhandari2012-03-21
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | IKNINJA-1370 - Toggle WebGL on/off is no longer working in the PI.Nivesh Rajbhandari2012-03-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug was injected by some changes in GLWorld.import. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | 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
* | | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 00:56:28 +0000