aboutsummaryrefslogtreecommitdiff
path: root/js/lib/geom
Commit message (Collapse)AuthorAge
...
| | * | | 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>
| * | | | 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
| | | | |
| * | | | 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
| | * | 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
| | |\ \
| | * | | update values in the PI from values of the selected brush stroke or pen tool ↵Pushkar Joshi2012-03-15
| | | | | | | | | | | | | | | | | | | | path
| | * | | PI for pen and brush strokesPushkar Joshi2012-03-14
| | | | |
| | * | | Merge branch 'pentool' into brushtoolPushkar Joshi2012-03-13
| | |\ \ \
| | * | | | Add a smoothing amount parameter, and hide options based on checkboxesPushkar Joshi2012-03-13
| | | | | |
| * | | | | -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
* | | | | | Cloud Materialhwc4872012-04-15
| | | | | |
* | | | | | Cloud Materialhwc4872012-04-13
| | | | | |
* | | | | | Cloud materialhwc4872012-04-10
| | | | | |
* | | | | | Added Flag materialhwc4872012-04-04
| | | | | |
* | | | | | started the flag materialhwc4872012-04-03
| | | | | |
* | | | | | texture abstractionhwc4872012-04-02
| |_|_|_|/ |/| | | |
* | | | | Fixed a problem switching from 3D to 2D and back to 3D.hwc4872012-03-23
| | | | |
* | | | | Added Paris and Raiders materialshwc4872012-03-22
| | | | |
* | | | | Bug Fixes for Canvas & WebGL File IOhwc4872012-03-20
| | | | |
* | | | | Supporting new and old GL data formats.hwc4872012-03-16
| | | | |
* | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-03-16
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | integration
| * | | | Merge pull request #34 from ericmueller/integrationJose Antonio Marquez Russo2012-03-15
| |\ \ \ \ | | |_|_|/ | |/| | | Integration
| * | | | 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>
| | | * | | gradient support for canvas-2d shapes.Nivesh Rajbhandari2012-03-07
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | Change linear gradient to go from left to right instead of top-left to ↵Nivesh Rajbhandari2012-03-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bottom-right. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | Gradient support for canvas-2d rectangle.Nivesh Rajbhandari2012-03-07
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | Fix for stroke and fill gradients not being retained when drawing multiple ↵Nivesh Rajbhandari2012-03-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shapes and switching between them. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | preliminary support for setting gradients on webgl shapes.Nivesh Rajbhandari2012-03-07
| | | | |/ | | | |/| | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | Merge pull request #108 from pushkarjoshi/brushtoolValerio Virgillito2012-03-13
| | |\ \ \ | | | | | | | | | | | | Brushtool
| * | | | | turn off the fill color for pen tool paths by defaultPushkar Joshi2012-03-13
| | |/ / / | |/| | |
| * | | | seemingly working version of the calligraphic brush (seems to work with ↵Pushkar Joshi2012-03-12
| | | | | | | | | | | | | | | | | | | | transparency and large stroke widths...seems to work better with smoothing)
| * | | | bug fixes for spline interpolationPushkar Joshi2012-03-12
| | | | | |