From c0f43749523f4720ca4c8942fa9ac17753d93a67 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Tue, 31 Jan 2012 15:01:04 -0800
Subject: Fixing 3d section of the PI.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/controllers/elements/element-controller.js      |  2 +-
 .../sections/three-d-view.reel/three-d-view.html   | 12 +++++-----
 .../sections/three-d-view.reel/three-d-view.js     | 27 ++++++++++++++++++++--
 3 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index 30469db0..f2b54014 100644
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -206,7 +206,7 @@ var ElementController = exports.ElementController = Montage.create(NJComponent,
             el.elementModel.props3D.matrix3d = mat;
             el.elementModel.props3D.perspectiveDist = dist;
 
-//            if(update3DModel)
+            if(update3DModel)
             {
                 this._update3DProperties(el, mat, dist);
             }
diff --git a/js/panels/properties/sections/three-d-view.reel/three-d-view.html b/js/panels/properties/sections/three-d-view.reel/three-d-view.html
index 1e24cb55..11a5b3f2 100644
--- a/js/panels/properties/sections/three-d-view.reel/three-d-view.html
+++ b/js/panels/properties/sections/three-d-view.reel/three-d-view.html
@@ -39,7 +39,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 "value": {
                     "boundObject": {"@": "owner"},
                     "boundObjectPropertyPath": "x3D",
-                    "oneway": false
+                    "oneway": true
                 }
             },
             "listeners": [
@@ -68,7 +68,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 "value": {
                     "boundObject": {"@": "owner"},
                     "boundObjectPropertyPath": "y3D",
-                    "oneway": false
+                    "oneway": true
                 }
             },
             "listeners": [
@@ -97,7 +97,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 "value": {
                     "boundObject": {"@": "owner"},
                     "boundObjectPropertyPath": "z3D",
-                    "oneway": false
+                    "oneway": true
                 }
             },
             "listeners": [
@@ -128,7 +128,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 "value": {
                     "boundObject": {"@": "owner"},
                     "boundObjectPropertyPath": "xAngle",
-                    "oneway": false
+                    "oneway": true
                 }
             },
             "listeners": [
@@ -159,7 +159,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 "value": {
                     "boundObject": {"@": "owner"},
                     "boundObjectPropertyPath": "yAngle",
-                    "oneway": false
+                    "oneway": true
                 }
             },
             "listeners": [
@@ -190,7 +190,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 "value": {
                     "boundObject": {"@": "owner"},
                     "boundObjectPropertyPath": "zAngle",
-                    "oneway": false
+                    "oneway": true
                 }
             },
             "listeners": [
diff --git a/js/panels/properties/sections/three-d-view.reel/three-d-view.js b/js/panels/properties/sections/three-d-view.reel/three-d-view.js
index dda9f993..96053490 100644
--- a/js/panels/properties/sections/three-d-view.reel/three-d-view.js
+++ b/js/panels/properties/sections/three-d-view.reel/three-d-view.js
@@ -99,6 +99,14 @@ exports.ThreeD = Montage.create(Component, {
         value: null
     },
 
+    _curMat: {
+        value: null
+    },
+
+    _curProp: {
+        value: null
+    },
+
     handleChange: {
         value: function(event) {
             if(event.wasSetByCode) {
@@ -110,6 +118,9 @@ exports.ThreeD = Montage.create(Component, {
                                     this.item,
                                     this.inGlobalMode,
                                     false);
+
+            this._curMat = null;
+            this._curProp = null;
         }
     },
 
@@ -129,8 +140,20 @@ exports.ThreeD = Montage.create(Component, {
 
     apply3DProperties : {
         value : function(prop, value, item, inGlobalMode, isChanging){
-            var curMat = this.application.ninja.elementMediator.getMatrix(item);
-            var delta = value.value - this.application.ninja.elementMediator.get3DProperty(item, prop);
+            if(!this._curMat)
+            {
+                this._curMat = this.application.ninja.elementMediator.getMatrix(item);
+            }
+            var curMat = this._curMat;
+            var delta = value.value;
+            if(inGlobalMode)
+            {
+                if(!this._curProp)
+                {
+                    this._curProp = this.application.ninja.elementMediator.get3DProperty(item, prop);
+                }
+                delta -= this._curProp;
+            }
 
             var xFormMat = Matrix.I(4);
             switch (prop)
-- 
cgit v1.2.3