aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/3D
Commit message (Collapse)AuthorAge
...
* | webTemplate var gets reset to false, so must check for new stage template ↵Nivesh Rajbhandari2012-05-01
| | | | | | | | | | | | differently. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Get working plane grid to draw for new stage web template workflow.Nivesh Rajbhandari2012-05-01
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Creating shapes in a containerhwc4872012-04-27
| |
* | canvas interactionhwc4872012-04-26
| |
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-25
|\| | | | | | | Canvas-interaction
| * Merge branch 'master' into pentoolPushkar Joshi2012-04-19
| |\ | | | | | | | | | | | | Conflicts: js/helper-classes/3D/view-utils.js
| * \ Merge branch 'master' into pentoolPushkar Joshi2012-04-17
| |\ \ | | | | | | | | | | | | | | | | Conflicts: js/tools/PenTool.js
| * | | snapping feedback for pen tool, correct for subpaths that may lie on rotated ↵Pushkar Joshi2012-04-09
| | | | | | | | | | | | | | | | canvas, and with a rotated view
| * | | 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
| * | | | 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
* | | | | canvas interactionhwc4872012-04-23
| |_|_|/ |/| | |
* | | | Merge pull request #168 from mqg734/EricMergeValerio Virgillito2012-04-19
|\ \ \ \ | | | | | | | | | | Merging Eric's snapping and tool fixes into master.
| * | | | Fixing some more merge issues.Nivesh Rajbhandari2012-04-18
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | Allow snapping to unselected objectshwc4872012-04-17
| | | | |
| * | | | 3D rotationhwc4872012-04-13
| | | | |
| * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-13
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Snapping_II Conflicts: js/helper-classes/3D/view-utils.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 js/tools/Translate3DToolBase.js
| * | | | 3D Rotate changeshwc4872012-04-13
| | | | |
| * | | | Rotate3D tool changeshwc4872012-04-11
| | | | |
| * | | | translate3DObject tool fixes.hwc4872012-04-05
| | |_|/ | |/| |
* | | | Grid should redraw on elementChanging as well as elementChange.Nivesh Rajbhandari2012-04-17
| |/ / |/| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Fixing selection/tag layout drawing when canvas and image elements have borders.Nivesh Rajbhandari2012-04-12
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Borders are not factored into offset calculations by the browser, so we have ↵Nivesh Rajbhandari2012-04-12
| | | | | | | | | | | | | | | | | | to adjust for them. Also, we should set webkit-transform-style to preserve-3d if elements are rotated (until we also support flattened mode). Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | offsets should be calculated on offsetParent instead of parentElement.Nivesh Rajbhandari2012-04-11
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Single perspective fix.Nivesh Rajbhandari2012-04-09
| | | | | | | | | | | | | | | | | | Note that rotating multiple objects when the stage is rotated still doesn't work and flatten still doesn't work. 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>
| * | | Adding replaceElement routine and event so Timeline can avoid removing and ↵Nivesh Rajbhandari2012-04-04
| |/ / | | | | | | | | | | | | | | | adding layers and PI and SelectionController can avoid deselecting and reselecting the element. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Need to set elementModel.isIn2DSnapCache flag to false when removing element ↵Nivesh Rajbhandari2012-04-04
| | | | | | | | | | | | | | | | | | from SnapManager's cache. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | 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>
| * 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
| * Merge branch 'master' into brushtoolPushkar Joshi2012-03-27
| |\ | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js
| * | 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)
* | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-03-27
|\ \ \ | | |/ | |/| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Merge branch 'refs/heads/master' into montage-integrationValerio Virgillito2012-03-21
| |\ \
| * | | Fixed snap-manager to stop snapping after first level children.Nivesh Rajbhandari2012-03-17
| | |/ | |/| | | | | | | 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>
* | Fixing error in drawUtils when closing document - should set _eltArray and ↵Nivesh Rajbhandari2012-03-20
|/ | | | | | _planesArray's length to 0 instead of setting the arrays to null. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Merge pull request #34 from ericmueller/integrationJose Antonio Marquez Russo2012-03-15
|\ | | | | Integration
| * Fixed BumpMetal materialhwc4872012-03-13
| |
* | Fixed drawing of multiple selection bounds when in flat case.Nivesh Rajbhandari2012-03-13
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Merge pull request #110 from mqg734/WebGLFixesValerio Virgillito2012-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
| * Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-03-09
| |\
| | * IKNINJA-1270: fixed browser crashing when you close a document while playing ↵Ananya Sen2012-03-08
| | | | | | | | | | | | | | | | | | a video Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-03-06
| |\|
| * | Create drag plane parallel to working plane and offset by where the user ↵Nivesh Rajbhandari2012-03-06
| | | | | | | | | | | | | | | | | | clicked in z. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Merge pull request #30 from ananyasen/FileIO-ananyaJose Antonio Marquez Russo2012-03-08
|\ \ \ | | | | | | | | FileIO branch pull request
| * | | null the arrays on all documents closed, so that they get garbage collectedAnanya Sen2012-03-08
| | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | IKNINJA-1270: fixed browser crashing when you close a document while playing ↵Ananya Sen2012-03-06
| | |/ | |/| | | | | | | | | | | | | a video then wait for a while Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-03-06
|\| | | | | | | | | | | | | | | | | | | | integration Conflicts: js/preloader/Preloader.js
| * | Squashed commit of preload-fix into MasterValerio Virgillito2012-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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 15:48:49 +0000