Merge branch 'refs/heads/NinjaInternal' into FileIO

Conflicts:
	.gitignore
	js/ninja.reel/ninja.js

2 files changed, 70 insertions, 28 deletions

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 100755
--- 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 38dbb110..96053490 100755
--- 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
@@ -40,19 +40,16 @@ exports.ThreeD = Montage.create(Component, {
             else
             {
                 this.inGlobalMode = true;
-                if(this.application.ninja.selectedElements.length)
+                var item = this.item;
+                if(item)
                 {
-                    var item = this.application.ninja.selectedElements[0]._element;
-                    if(item)
-                    {
-                        this.x3D = item.elementModel.props3D.x3D;
-                        this.y3D = item.elementModel.props3D.y3D;
-                        this.z3D = item.elementModel.props3D.z3D;
-
-                        this.xAngle = item.elementModel.props3D.xAngle;
-                        this.yAngle = item.elementModel.props3D.yAngle;
-                        this.zAngle = item.elementModel.props3D.zAngle;
-                    }
+                    this.x3D = item.elementModel.props3D.x3D;
+                    this.y3D = item.elementModel.props3D.y3D;
+                    this.z3D = item.elementModel.props3D.z3D;
+
+                    this.xAngle = item.elementModel.props3D.xAngle;
+                    this.yAngle = item.elementModel.props3D.yAngle;
+                    this.zAngle = item.elementModel.props3D.zAngle;
                 }
             }
         }
@@ -98,6 +95,18 @@ exports.ThreeD = Montage.create(Component, {
         }
     },
 
+    item: {
+        value: null
+    },
+
+    _curMat: {
+        value: null
+    },
+
+    _curProp: {
+        value: null
+    },
+
     handleChange: {
         value: function(event) {
             if(event.wasSetByCode) {
@@ -106,9 +115,12 @@ exports.ThreeD = Montage.create(Component, {
 
             this.apply3DProperties(event.currentTarget.identifier,
                                     event.currentTarget,
-                                    this.application.ninja.selectedElements[0]._element,
+                                    this.item,
                                     this.inGlobalMode,
                                     false);
+
+            this._curMat = null;
+            this._curProp = null;
         }
     },
 
@@ -120,7 +132,7 @@ exports.ThreeD = Montage.create(Component, {
 
             this.apply3DProperties(event.currentTarget.identifier,
                             event.currentTarget,
-                            this.application.ninja.selectedElements[0]._element,
+                            this.item,
                             this.inGlobalMode,
                             true);
         }
@@ -128,9 +140,20 @@ exports.ThreeD = Montage.create(Component, {
 
     apply3DProperties : {
         value : function(prop, value, item, inGlobalMode, isChanging){
-            // TODO - May want to use mediator instead
-            var curMat = item.elementModel.props3D.matrix3d;
-            var delta = value.value - item.elementModel.props3D[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)
@@ -183,12 +206,31 @@ exports.ThreeD = Montage.create(Component, {
 
     templateDidLoad : {
         value: function() {
-        Object.defineBinding(this, "axisMode", {
-                        boundObject: this.axisModeGroupControl,
-                        boundObjectPropertyPath: "selectedIndex",
-                        oneway: false
-                    });
+            Object.defineBinding(this, "axisMode", {
+                            boundObject: this.axisModeGroupControl,
+                            boundObjectPropertyPath: "selectedIndex",
+                            oneway: false
+                        });
+
+            Object.defineBinding(this, "item", {
+                    boundObject: this,
+                    boundObjectPropertyPath: "application.ninja.selectedElements",
+                    boundValueMutator: this._getSelectedItem
+                });