aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-03-27 16:38:52 -0700
committerNivesh Rajbhandari2012-03-27 16:38:52 -0700
commit331ea08655245e3532e48bf160d5f68a04d8723f (patch)
treec0d2b9ec55ec6ab82576e35803bbcd76649022c4 /js
parent75e7d29352787ee8182928403ecae09627117d57 (diff)
downloadninja-331ea08655245e3532e48bf160d5f68a04d8723f.tar.gz
IKNINJA-764 - The Local/Global options are not in synced with both 3D object rotate tool and 3D object translate tool.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js')
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.js1
-rwxr-xr-xjs/tools/RotateObject3DTool.js1
-rwxr-xr-xjs/tools/TranslateObject3DTool.js11
3 files changed, 11 insertions, 2 deletions
diff --git a/js/components/layout/tools-list.reel/tools-list.js b/js/components/layout/tools-list.reel/tools-list.js
index 5ea6f70f..d68e8a56 100755
--- a/js/components/layout/tools-list.reel/tools-list.js
+++ b/js/components/layout/tools-list.reel/tools-list.js
@@ -56,6 +56,7 @@ exports.ToolsList = Montage.create(Component, {
56 this.SubselectionTool.options = this.application.ninja.toolsProperties.subSelectionProperties; 56 this.SubselectionTool.options = this.application.ninja.toolsProperties.subSelectionProperties;
57 57
58 this.Rotate3DTool.options = this.application.ninja.toolsProperties.rotate3DProperties; 58 this.Rotate3DTool.options = this.application.ninja.toolsProperties.rotate3DProperties;
59 this.Translate3DTool.options = this.application.ninja.toolsProperties.rotate3DProperties;
59 this.TagTool.options = this.application.ninja.toolsProperties.tagProperties; 60 this.TagTool.options = this.application.ninja.toolsProperties.tagProperties;
60 this.PenTool.options = this.application.ninja.toolsProperties.penProperties; 61 this.PenTool.options = this.application.ninja.toolsProperties.penProperties;
61 this.TextTool.options = this.application.ninja.toolsProperties.textProperties; 62 this.TextTool.options = this.application.ninja.toolsProperties.textProperties;
diff --git a/js/tools/RotateObject3DTool.js b/js/tools/RotateObject3DTool.js
index 72af6eff..27352231 100755
--- a/js/tools/RotateObject3DTool.js
+++ b/js/tools/RotateObject3DTool.js
@@ -51,6 +51,7 @@ exports.RotateObject3DTool = Montage.create(Rotate3DToolBase, {
51 toolHandle._rotMat = Matrix.RotationZ( angle ); 51 toolHandle._rotMat = Matrix.RotationZ( angle );
52 } 52 }
53 } 53 }
54 this._inLocalMode = (this.options.selectedMode === "rotateLocally");
54 } 55 }
55 }, 56 },
56 57
diff --git a/js/tools/TranslateObject3DTool.js b/js/tools/TranslateObject3DTool.js
index 60633e74..4fac8187 100755
--- a/js/tools/TranslateObject3DTool.js
+++ b/js/tools/TranslateObject3DTool.js
@@ -4,15 +4,22 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
4(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. 4(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5</copyright> */ 5</copyright> */
6 6
7var Translate3DToolBase = require("js/tools/Translate3DToolBase").Translate3DToolBase, 7var Montage = require("montage/core/core").Montage,
8 Translate3DToolBase = require("js/tools/Translate3DToolBase").Translate3DToolBase,
8 drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils, 9 drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils,
9 viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils, 10 viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils,
10 snapManager = require("js/helper-classes/3D/snap-manager").SnapManager; 11 snapManager = require("js/helper-classes/3D/snap-manager").SnapManager;
11 12
12exports.TranslateObject3DTool = Object.create(Translate3DToolBase, { 13exports.TranslateObject3DTool = Montage.create(Translate3DToolBase, {
13 _toolID: { value: "translateObject3DTool" }, 14 _toolID: { value: "translateObject3DTool" },
14 _canOperateOnStage: { value: true }, 15 _canOperateOnStage: { value: true },
15 16
17 _initializeToolHandles: {
18 value: function() {
19 this._inLocalMode = (this.options.selectedMode === "rotateLocally");
20 }
21 },
22
16 initializeSnapping : { 23 initializeSnapping : {
17 value : function(event) 24 value : function(event)
18 { 25 {