aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/3D
Commit message (Collapse)AuthorAge
* Normalize HTML DOCTYPEKris Kowal2012-07-09
| | | | | | | Was lower-case. Now upper-case. Also fixed BOMs, trailing white-space, DOS line terminators. Did not expand tabs to spaces.
* BSD LicenseKris Kowal2012-07-09
|
* Merge branch 'normalize' of https://github.com/kriskowal/ninja-internalValerio Virgillito2012-07-09
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/gradientpicker.reel/gradientpicker.js js/components/tools-properties/text-properties.reel/text-properties.js js/document/views/base.js js/document/views/design.js js/helper-classes/3D/StageLine.js js/helper-classes/3D/draw-utils.js js/lib/drawing/world.js js/lib/geom/circle.js js/lib/geom/line.js js/lib/geom/rectangle.js js/lib/geom/shape-primitive.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/flag-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/mandel-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/water-material.js js/panels/Materials/materials-library-panel.reel/materials-library-panel.html js/panels/Materials/materials-library-panel.reel/materials-library-panel.js js/panels/Materials/materials-popup.reel/materials-popup.html js/panels/Materials/materials-popup.reel/materials-popup.js js/tools/LineTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Remove trailing spacesKris Kowal2012-07-06
| |
| * Expand tabsKris Kowal2012-07-06
| |
* | Merge pull request #357 from ericmueller/GridFixesValerio Virgillito2012-07-09
|\ \ | | | | | | Fixes for incorrect line/polygon intersections.
| * | Fixes a bug in rectangle containment test.hwc4872012-06-29
| | |
| * | Fixes for incorrect line/polygon intersections.hwc4872012-06-28
| | |
* | | Merge branch 'refs/heads/ninja-internal' into MaterialsUINivesh Rajbhandari2012-07-09
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: js/panels/Materials/materials-library-panel.reel/materials-library-panel.css js/panels/Materials/materials-popup.reel/materials-popup.css Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Update copyright boilerplateKris Kowal2012-07-06
| |/
* / IKNINJA-1246 - Line drawing feedback disappears when using no-color or ↵Nivesh Rajbhandari2012-07-09
|/ | | | | | gradient for stroke color. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Merge pull request #326 from mqg734/ReclaimStagePaddingValerio Virgillito2012-06-25
|\ | | | | Reclaim negative padding when moving items back into positive direction.
| * When reclaiming stage's negative scroll padding, we need to use the ↵Nivesh Rajbhandari2012-06-25
| | | | | | | | | | | | template's left and top padding as the minimum values when switching between documents. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Reclaim negative padding when moving items back into positive direction.Nivesh Rajbhandari2012-06-21
| | | | | | | | | | | | Note that we only do this on elementChange and not elementChanging since it is a potentially slow routine. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Make stage transparent when rotating/zooming templates and draw an outline ↵Nivesh Rajbhandari2012-06-22
| | | | | | | | | | | | | | | | | | around the user's root instead. Also, fixed the background color setting on banner and animation templates' "body." Stage outline draws using drawGridLines code so it can show intersection with element planes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Display "(0, 0)" where the origin is.Nivesh Rajbhandari2012-06-22
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Have to guard against cases when stage lines are parallel to the canvas and ↵Nivesh Rajbhandari2012-06-22
| | | | | | | | | | | | the line intersection routine returns null. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Draw stage left and top references lines.Nivesh Rajbhandari2012-06-21
|/ | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Merge pull request #315 from mqg734/IKNinja_1671Valerio Virgillito2012-06-20
|\ | | | | IKNINJA-1671 - GIO: 3D rotate widget is offset from the object when rotated in negative space.
| * Fix for error when using ZoomTool.Nivesh Rajbhandari2012-06-20
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * IKNINJA-1671 - GIO: 3D rotate widget is offset from the object when rotated ↵Nivesh Rajbhandari2012-06-19
| | | | | | | | | | | | | | | | in negative space. I fixed this temporarily by disabling the auto stage scroll calculations when we modify matrices. The correct fix will be to update any matrices and local2Global caches if we update the stage's padding (which I'm doing in a separate fix for a single draw cycle for the stage, but that fix is not ready yet). Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Added logic to handle grid drawing where grid line starts on an object boundaryhwc4872012-06-19
|/
* IKNinja-1710 - Boundary box is drawn offset when switching between docs. ↵Nivesh Rajbhandari2012-06-14
| | | | | | This issue is related to move object to negative space. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* rewrite: currentSelectedContainer -> domContainerValerio Virgillito2012-06-08
| | | | | | | Fixed the currentSelectedContainer by removing bindings and using property change on the current document added the red outline back. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'refs/heads/master' into element-model-fixesValerio Virgillito2012-06-06
|\ | | | | | | | | | | | | | | Conflicts: js/document/models/html.js js/document/views/design.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Merge branch 'master' into pentoolPushkar Joshi2012-06-05
| |\
| * \ Merge branch 'master' into pentoolPushkar Joshi2012-06-04
| |\ \ | | | | | | | | | | | | | | | | Conflicts: js/tools/PenTool.js
| * \ \ Merge branch 'master' into pentoolPushkar Joshi2012-05-31
| |\ \ \
| * \ \ \ Merge branch 'master' into pentoolPushkar Joshi2012-05-11
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into pentoolPushkar Joshi2012-05-07
| |\ \ \ \ \
| * | | | | | Fix for 1525 Pen: "Uncaught RangeError: Maximum call stack size exceeded".Pushkar Joshi2012-04-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (check if the second mouse click actually selects the existing first anchor point)
* | | | | | | removing all model creators.Valerio Virgillito2012-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The elementModel is now a getter that will create a new model when needed. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | fix in the draw utils for drawing the 3d compassValerio Virgillito2012-06-05
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | Compass should draw in lower-left regardless of the stage height.Nivesh Rajbhandari2012-06-05
| |_|_|_|/ |/| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | removing the last closeDocument handlerValerio Virgillito2012-05-31
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | Adding back the stage references in the 3d classes.Nivesh Rajbhandari2012-05-31
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | Fixed bug with scrolling too much when moving objects in negative space.Nivesh Rajbhandari2012-05-29
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | Moving layout and stageDeps' handleOpenDocument into stage.Nivesh Rajbhandari2012-05-29
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | Sped up user-interaction by moving grid drawing into its own canvas so the ↵Nivesh Rajbhandari2012-05-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | layout code doesn't have to be run when modifying selected elements. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | Cache perspective distance lookup to speed up user interaction.Nivesh Rajbhandari2012-05-29
| |_|_|/ |/| | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/document-html.js js/helper-classes/3D/view-utils.js js/stage/stage.reel/stage.js
| * | | | Removed unused variables and methods in stage-deps, layout design, and ↵Nivesh Rajbhandari2012-05-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | snap-manager. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | Fixed scrolling and centering stage code. Also, moved liveNodeList into the ↵Nivesh Rajbhandari2012-05-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | design view and added an option to exclude styles and text nodes when retrieving the live nodes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | Cleaning up referencing to 'documentRoot' and '_document'Jose Antonio Marquez2012-05-24
|/ / / / | | | | | | | | | | | | Moved to reference new model in DOM architecture rework. This should not affect anything, just moving the references, and also the setting to the render methods in the design view.
* | | | Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-05-22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | removed console output.hwc4872012-05-14
| | | | |
| * | | | Drag plane not being set. Injection from a recent checkin of mine.hwc4872012-05-14
| | | | |
| * | | | removed some console output.hwc4872012-05-14
| | | | |
| * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugshwc4872012-05-11
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | Conflicts: js/lib/geom/circle.js js/lib/geom/rectangle.js
| * / | | Fixed an inaccuracy snapping to the stage.hwc4872012-05-10
| |/ / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 06:08:23 +0000