Merge branch 'brushtool' into pentool

1 files changed, 0 insertions, 265 deletions

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
deleted file mode 100755
index 35591afa..00000000
--- a/js/panels/properties/sections/three-d-view.reel/three-d-view.js
+++ /dev/null
@@ -1,265 +0,0 @@
-/* <copyright>
-This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
-No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
-(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
-</copyright> */
-
-var Montage = require("montage/core/core").Montage;
-var Component = require("montage/ui/component").Component;
-
-exports.ThreeD = Montage.create(Component, {
-
-    inGlobalMode: {
-        value: false
-    },
-
-    // TODO - booleans not working with boundValueMutator when bound to selectedIndex, so using index
-    // 0 = local; 1 = global
-    _axisMode: {
-        value: 0
-    },
-
-    axisMode: {
-        get: function() {
-            return this._axisMode;
-        },
-        set: function(value) {
-            this._axisMode = value;
-            
-            if(value === 0)
-            {
-                this.inGlobalMode = false;
-                this.x3D = 0;
-                this.y3D = 0;
-                this.z3D = 0;
-
-                this.xAngle = 0;
-                this.yAngle = 0;
-                this.zAngle = 0;
-            }
-            else
-            {
-                this.inGlobalMode = true;
-                var item = this.item;
-                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;
-                }
-            }
-        }
-    },
-
-    x3D: {
-        value: 0
-    },
-
-    y3D: {
-        value: 0
-    },
-
-    z3D: {
-        value: 0
-    },
-
-    xAngle: {
-        value: 0
-    },
-
-    yAngle: {
-        value: 0
-    },
-
-    zAngle: {
-        value: 0
-    },
-
-    _disableTranslation: {
-        value: true
-    },
-
-    disableTranslation: {
-        get: function () {
-            return this._disableTranslation;
-        },
-        set: function (value) {
-            if(value !== this._disableTranslation) {
-                this._disableTranslation  = value;
-                this.needsDraw = true;
-            }
-        }
-    },
-
-    item: {
-        value: null
-    },
-
-    _curMat: {
-        value: null
-    },
-
-    _curProp: {
-        value: null
-    },
-
-    handleChange: {
-        value: function(event) {
-            if(event.wasSetByCode) {
-                return;
-            }
-
-            this.apply3DProperties(event.currentTarget.identifier,
-                                    event.currentTarget,
-                                    this.item,
-                                    this.inGlobalMode,
-                                    false);
-
-            this._curMat = null;
-            this._curProp = null;
-        }
-    },
-
-    handleChanging: {
-        value: function(event) {
-            if(event.wasSetByCode) {
-                return;
-            }
-
-            this.apply3DProperties(event.currentTarget.identifier,
-                            event.currentTarget,
-                            this.item,
-                            this.inGlobalMode,
-                            true);
-        }
-    },
-
-    apply3DProperties : {
-        value : function(prop, value, item, inGlobalMode, isChanging){
-            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)
-            {
-                case "xAngle":
-                    xFormMat = Matrix.RotationX(MathUtils.DEG_TO_RAD * delta);
-                    break;
-                case "yAngle":
-                    xFormMat = Matrix.RotationY(MathUtils.DEG_TO_RAD * delta);
-                    break;
-                case "zAngle":
-                    xFormMat = Matrix.RotationZ(MathUtils.DEG_TO_RAD * delta);
-                    break;
-                case "x3D":
-                    xFormMat[12] = delta;
-                    break;
-                case "y3D":
-                    xFormMat[13] = delta;
-                    break;
-                case "z3D":
-                    xFormMat[14] = delta;
-                    break;
-            }
-
-            var mat = [];
-            if(inGlobalMode)
-            {
-                glmat4.multiply(xFormMat, curMat, mat);
-            }
-            else
-            {
-                glmat4.multiply(curMat, xFormMat, mat);
-            }
-
-            if(isChanging)
-            {
-                this.application.ninja.elementMediator.setMatrix(item, mat, true);
-            }
-            else
-            {
-                this.application.ninja.elementMediator.setMatrix(item, mat, false);
-
-                if(!inGlobalMode)
-                {
-                    value.value = 0;
-                }
-            }
-        }
-    },
-
-    templateDidLoad : {
-        value: function() {