aboutsummaryrefslogtreecommitdiff
path: root/js/lib
Commit message (Collapse)AuthorAge
* 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>
* | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-04-04
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | WorkingBranch Conflicts: js/lib/drawing/world.js
| * | | 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>
* | | removed unnecessary call to exportMaterials from init(). this call should ↵John Mayhew2012-04-04
| | | | | | | | | | | | not have been there.
* | | removed old unused import and export functions.John Mayhew2012-04-03
| | |
* | | fixed remaining namespace bugs ensuring the use of the RDGE namespace ↵John Mayhew2012-04-03
| | | | | | | | | | | | everywhere it is required
* | | Made use of semicolons consistent and updated new files to use the new RDGE ↵John Mayhew2012-04-03
| | | | | | | | | | | | namespace
* | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-04-02
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WorkingBranch Conflicts: js/helper-classes/RDGE/rdge-compiled.js js/helper-classes/RDGE/runtime/GLRuntime.js js/helper-classes/RDGE/src/core/script/MeshManager.js js/helper-classes/RDGE/src/core/script/engine.js js/helper-classes/RDGE/src/core/script/fx/ssao.js js/helper-classes/RDGE/src/core/script/init_state.js js/helper-classes/RDGE/src/core/script/run_state.js js/helper-classes/RDGE/src/core/script/scenegraphNodes.js js/helper-classes/RDGE/src/core/script/utilities.js js/helper-classes/RDGE/src/tools/compile-rdge-core.bat js/helper-classes/RDGE/src/tools/compile-rdge-core.sh js/helper-classes/RDGE/src/tools/rdge-compiled.js js/lib/drawing/world.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/deform-material.js js/lib/rdge/materials/flat-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/linear-gradient-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-blur-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/relief-tunnel-material.js js/lib/rdge/materials/square-tunnel-material.js js/lib/rdge/materials/star-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/tunnel-material.js js/lib/rdge/materials/twist-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/uber-material.js js/lib/rdge/materials/water-material.js js/lib/rdge/materials/z-invert-material.js js/preloader/Preloader.js
| * | turn off changing the left and top of the brush stroke canvasPushkar Joshi2012-03-28
| | |
| * | Merge branch 'master' into brushtoolPushkar Joshi2012-03-27
| |\|
| | * Fixed issue with WebGL materials not working after file-save or ↵Nivesh Rajbhandari2012-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 Joshi2012-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 Joshi2012-03-27
| | | | | | | | | | | | get called
| * | Merge branch 'master' into brushtoolPushkar Joshi2012-03-27
| |\| | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js
| | * Check for a authortime animation setting in the draw routine for WebGL.Nivesh Rajbhandari2012-03-24
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Merge branch 'refs/heads/montage-integration' into WebGL-Animation-CheckBoxNivesh Rajbhandari2012-03-24
| | |\
| | | * Fixed a problem switching from 3D to 2D and back to 3D.hwc4872012-03-23
| | | |
| | * | Check for a authortime animation setting in the draw routine for WebGL.Nivesh Rajbhandari2012-03-23
| | |/ | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Respect play/pause WebGL animation when saving files and re-rendering caused ↵Nivesh Rajbhandari2012-03-23
| | | | | | | | | | | | | | | | | | by geometry changes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Squashed commit of the following GL integrationValerio Virgillito2012-03-22
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * Fixing the selection issuesValerio Virgillito2012-03-20
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | correctly update the brush stroke canvas size and position when the stroke ↵Pushkar Joshi2012-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 Joshi2012-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 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)
| * | revert to using the angle without flipping its sign...fixing some minor bugs ↵Pushkar Joshi2012-03-20
| | | | | | | | | | | | | | | | | | and code cleanup GOOD status before doing 3D unprojection step
| * | draw the brush stroke in realtimePushkar Joshi2012-03-19
| | |
| * | first pass for file IO of brush strokesPushkar Joshi2012-03-19
| | |
| * | Merge branch 'master' into brushtoolPushkar Joshi2012-03-16
| |\|
| | * Merge pull request #34 from ericmueller/integrationJose Antonio Marquez Russo2012-03-15
| | |\ | | | | | | | | Integration
| | | * Corrections for Uber shader IOhwc4872012-03-14
| | | |
| | | * Uber material changes for IOhwc4872012-03-12
| | | |
| * | | update values in the PI from values of the selected brush stroke or pen tool ↵Pushkar Joshi2012-03-15
| | | | | | | | | | | | | | | | path
| * | | Merge branch 'master' into pentoolPushkar Joshi2012-03-14
| |\| |
| | * | Some code cleanup - removing unused assignments.Valerio Virgillito2012-03-13
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | PI for pen and brush strokesPushkar Joshi2012-03-14
| | | |
| * | | Merge branch 'pentool' into brushtoolPushkar Joshi2012-03-13
| |\| |
| | * | Merge branch 'master' into pentoolPushkar Joshi2012-03-13
| | |\ \
| | | * \ 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
| | | | * | Support import/export of gradient materials. This fixes the eyedropper not ↵Nivesh Rajbhandari2012-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 Rajbhandari2012-03-09
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | | * | Fixing radial gradients for line and circle.Nivesh Rajbhandari2012-03-09
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | | * | Eyedropper support for getting color value from webgl shapes.Nivesh Rajbhandari2012-03-09
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | | * | gradient support for canvas-2d shapes.Nivesh Rajbhandari2012-03-07
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 17:44:50 +0000