aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes
Commit message (Collapse)AuthorAge
* 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/ninja-internal' into ToolFixesNivesh Rajbhandari2012-04-04
| |\
| | * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-04-04
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | WorkingBranch Conflicts: js/lib/drawing/world.js
| | * | Removed the dependence on an "assets" directory for the RDGE runtime. Now ↵John Mayhew2012-04-03
| | | | | | | | | | | | | | | | Ninja does not need to create duplicate files when it sets up the users Ninja Projects directory for RDGE support.
| | * | updated the rdge compiled version and its runtime, incremented rdge library ↵John Mayhew2012-04-03
| | | | | | | | | | | | | | | | version number
| | * | fixed remaining namespace bugs ensuring the use of the RDGE namespace ↵John Mayhew2012-04-03
| | | | | | | | | | | | | | | | everywhere it is required
| | * | removed unnecessary files from the RDGE build.John Mayhew2012-04-03
| | | | | | | | | | | | | | | | | | | | Added back the build batch and shell script files for building the compiled version of RDGE Corrected the build scripts to not include the precompiled.js file twice.
| | * | 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
| | * | | Recompiled RDGE and put index.html back to loading the compiled version of RDGEJohn Mayhew2012-04-02
| | | | |
| | * | | Fixed compiler warningsJohn Mayhew2012-04-02
| | | | |
| | * | | -Namespaced all RDGE javascript.John Mayhew2012-04-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Removed the following unused files from the build script /core/script/fx/blur.js /core/script/fx/ssao.js /core/script/animation.js - Fully removed the following from the build and from source control as they are unused or no longer needed /core/script/util/dbgpanel.js /core/script/util/fpsTracker.js /core/script/util/statTracker.js /core/script/input.js /core/script/TextureManager.js /core/script/ubershader.js
| * | | | 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>
| * | | Squashed commit of the following GL integrationValerio Virgillito2012-03-22
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@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 branch 'refs/heads/Ninja-Internal' into FileIO-Build-CandidateJose Antonio Marquez2012-03-15
|\ \
| * | Removing the backup-delete folder and the RDGE tools directory.Valerio Virgillito2012-03-15
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Merge pull request #34 from ericmueller/integrationJose Antonio Marquez Russo2012-03-15
|\ \ \ | |/ / |/| | Integration
| * | Fixed BumpMetal materialhwc4872012-03-13
| | |
| * | Uber material changes for IOhwc4872012-03-12
| | |
* | | 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 #108 from pushkarjoshi/brushtoolValerio Virgillito2012-03-13
|\ \ \ \ | |_|_|/ |/| | | Brushtool
| * | | Merge branch 'pentool' into brushtoolPushkar Joshi2012-03-06
| |\ \ \
| | * \ \ Merge branch 'master' into pentoolPushkar Joshi2012-03-06
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Merge branch 'master' into pentoolPushkar Joshi2012-03-05
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Merge branch 'brushtool' into pentoolPushkar Joshi2012-03-02
| | |\ \ \
| | * | | | show feedback on mouseover on a part of the path where a new anchor will be ↵Pushkar Joshi2012-03-01
| | | | | | | | | | | | | | | | | | | | | | | | added if clicked
| * | | | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-06
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | draw brush stroke as concentric paths overlaid on top of each other...allows ↵Pushkar Joshi2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | us to simulate softness for circular brushes
| * | | | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-05
| |\ \ \ \ \ | | |_|_|/ / | |/| | | / | | | |_|/ | | |/| |
| * | | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-02
| |\ \ \ \
| * | | | | Catmull-Rom spline sampling for the brush stroke, and options for stroke ↵Pushkar Joshi2012-03-02
| | | | | | | | | | | | | | | | | | | | | | | | size, stroke hardness and both stroke colors (left and right --- temporarily using the stroke and fill colors respectively)
| * | | | | first attempt at rendering the brush stroke as a collection of polylines ↵Pushkar Joshi2012-03-01
| | |_|_|/ | |/| | | | | | | | | | | | | (number of polylines equals the stroke width)
* | | | | remap hard coded strings in rdge internal code.hwc4872012-03-09
| | | | |
* | | | | 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
| | | | | | | | | | | | |