1 files changed, 53 insertions, 41 deletions

diff --git a/js/controllers/elements/stage-controller.js b/js/controllers/elements/stage-controller.js
index 97ea3aa5..3ef7dacc 100755
--- a/js/controllers/elements/stage-controller.js
+++ b/js/controllers/elements/stage-controller.js
@@ -31,46 +31,34 @@ exports.StageController = Montage.create(ElementController, {
         }
     },
 
+
     // TODO - perspective distance needs to be passed in as "dist" and matrix3d needs to be passed in as "mat"
     set3DProperties: {
-        value: function(el, props, index, update3DModel) {
-            var dist = props[index]["dist"],
-                mat = props[index]["mat"];
-            this.application.ninja.stylesController.setElementStyle(el,
-                                                                    "-webkit-transform",
-                                                                    "perspective(" + dist + ") " +
-                                                                    "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")",
-                                                                    true);
-
-            el.elementModel.props3D.matrix3d = mat;
-            el.elementModel.props3D.perspectiveDist = dist;
-
-            // TODO - Move this to matrix class
-            if(this._isRotated(mat))
-            {
-                this.application.ninja.currentDocument.stageBG.style.display = "none";
-            }
-            else
-            {
-                this.application.ninja.stylesController.setElementStyle(this.application.ninja.currentDocument.stageBG,
-                                                                        "-webkit-transform",
-                                                                        "perspective(" + dist + ") " +
-                                                                        "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")",
-                                                                        true);
-
-                this.application.ninja.currentDocument.stageBG.elementModel.props3D.matrix3d = mat;
-                this.application.ninja.currentDocument.stageBG.elementModel.props3D.perspectiveDist = dist;
-                this.application.ninja.currentDocument.stageBG.style.display = "block";
-            }
+            value: function(el, props, update3DModel) {
+                var dist = props["dist"], mat = props["mat"];
+                this.application.ninja.stylesController.setElementStyle(el, "-webkit-transform", "perspective(" + dist + ") " + "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")", true);
+
+                el.elementModel.props3D.matrix3d = mat;
+                el.elementModel.props3D.perspectiveDist = dist;
 
-            this.application.ninja.stage.updatedStage = true;
+                // TODO - Move this to matrix class
+                if(this._isRotated(mat)) {
+                    this.application.ninja.currentDocument.stageBG.style.display = "none";
+                } else {
+                    this.application.ninja.stylesController.setElementStyle(this.application.ninja.currentDocument.stageBG, "-webkit-transform", "perspective(" + dist + ") " + "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")", true);
 
-            if(update3DModel)
-            {
-                this._update3DProperties(el, mat, dist);
+                    this.application.ninja.currentDocument.stageBG.elementModel.props3D.matrix3d = mat;
+                    this.application.ninja.currentDocument.stageBG.elementModel.props3D.perspectiveDist = dist;
+                    this.application.ninja.currentDocument.stageBG.style.display = "block";
+                }
+
+                this.application.ninja.stage.updatedStage = true;
+
+                if(update3DModel) {
+                    this._update3DProperties(el, mat, dist);
+                }
             }
-        }
-    },
+        },
 
     getProperty: {
         value: function(el, p) {
@@ -83,8 +71,14 @@ exports.StageController = Montage.create(ElementController, {
                     return el.elementModel.stageDimension.style.getProperty(p);
                 case "width":
                     return el.elementModel.stageDimension.style.getProperty(p);
+                case "-webkit-transform-style":
+                    if(el.id === "Viewport") {
+                        return this.application.ninja.stylesController.getElementStyle(el, p, false, true);
+                    } else {
+                        return el.elementModel.stageView.style.getProperty(p);
+                    }
                 default:
-                    return ElementController.getProperty(el, p, false, true);
+                    return ElementController.getProperty(el, p, true, true);
                     //console.log("Undefined Stage property ", p);
             }
         }
@@ -111,6 +105,10 @@ exports.StageController = Montage.create(ElementController, {
                     this.application.ninja.currentDocument.iframe.height = parseInt(value) + 400;
                     el.elementModel.stageDimension.style.setProperty(p, value);
                     break;
+                case "-webkit-transform-style":
+                    el.elementModel.stageView.style.setProperty(p, value);
+                    this.application.ninja.stage.updatedStage = true;
+                    break;
                 default:
                     console.log("Undefined property ", p, "for the Stage Controller");
             }
@@ -143,11 +141,10 @@ exports.StageController = Montage.create(ElementController, {
 
                 if (el)
                 {
-                    var xformStr = this.application.ninja.elementMediator.getProperty(el, "-webkit-transform");
-                    if (xformStr)
-                        mat = this.transformStringToMat( xformStr );
-                    if (!mat)
+                    mat = this.application.ninja.stylesController.getMatrixFromElement(el, true);
+                    if (!mat) {
                         mat = Matrix.I(4);
+                    }
 
                     var zoom = this.application.ninja.elementMediator.getProperty(el, "zoom");
                     if (zoom)
@@ -170,5 +167,20 @@ exports.StageController = Montage.create(ElementController, {
                 return mat;
             }
         }
-    }
+    },
+
+    getPerspectiveDist: {
+        value: function(el) {
+            if(el.elementModel && el.elementModel.props3D && el.elementModel.props3D.perspectiveDist)
+            {
+                return el.elementModel.props3D.perspectiveDist;
+            }
+            else
+            {
+                var dist = this.application.ninja.stylesController.getPerspectiveDistFromElement(el, true);
+                el.elementModel.props3D.perspectiveDist = dist;
+                return dist;
+            }
+        }
+    },
 });