| Commit message (Collapse) | Author | Age |
| |
|
|
|
|
| |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|
|
|
|
|
| |
the ink bottle tool.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|\ |
|
| |
| |
| |
| | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|/
|
|
| |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|
|
|
|
|
| |
Other shape types will be handled separately for now.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|
|
|
|
|
| |
of whether they are 2d shapes or WebGL shapes.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|
|
|
|
|
| |
well and line shape doesn't have getFillColor method.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|
|
|
|
|
| |
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>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | |
| | |
| | |
| | |
| | |
| | | |
color. Also, dispatching an addElement event when toggling shape from WebGL/canvas2d so timeline can draw correctly.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | |
| | |
| | |
| | |
| | |
| | | |
IKNinja-1391 - Shapes need to support no-color.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | |\
| | | |
| | | |
| | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
instead of relying on the shapeModel cache because it can get out of sync.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
adding layers and PI and SelectionController can avoid deselecting and reselecting the element.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| |\| |
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
js/controllers/elements/shapes-controller.js
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
and code cleanup
GOOD status before doing 3D unprojection step
|
| | | |
| | | |
| | | |
| | | | |
path
|
| | | | |
|
|\ \ \ \
| | |_|/
| |/| | |
|
| | |/
| |/|
| | |
| | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|\| |
| | |
| | |
| | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | | |
by geometry changes.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|/ /
| |
| |
| |
| |
| | |
This bug was injected by some changes in GLWorld.import.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|/
|
|
|
|
| |
stroke material.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|
|
|
| |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|
|
|
| |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|
|
|
| |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|
|
|
|
|
|
| |
- 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>
|
|
|
|
|
|
|
|
| |
except if the geometry and materials change.
This is more easy to see with shapes like the brush tool.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|\ |
|
| |
| |
| |
| | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
js/ninja.reel/ninja.html
|
| |\ \ |
|
| |\ \ \ |
|
| |\ \ \ \ |
|
| |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
.gitignore
js/ninja.reel/ninja.js
|
| | | | | | | |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| |_|_|_|_|/
|/| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
controllers.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| |_|_|_|/
|/| | | |
| | | | |
| | | | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|