Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements

3 files changed, 101 insertions, 1 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 1cb66d3f..6d11bd0e 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -483,6 +483,8 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
 
             if(!this.webTemplate) {
                 this._showCurrentDocument();
+            } else {
+                this.application.ninja.stage.stageView.showRulers();
             }
 
             this.webTemplate = false;
diff --git a/js/controllers/elements/body-controller.js b/js/controllers/elements/body-controller.js
new file mode 100755
index 00000000..14aeae24
--- /dev/null
+++ b/js/controllers/elements/body-controller.js
@@ -0,0 +1,95 @@
+/* <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,
+    ElementController = require("js/controllers/elements/element-controller").ElementController;
+
+exports.BodyController = 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, 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;
+
+            if(update3DModel) {
+                this._update3DProperties(el, mat, dist);
+            }
+        }
+    },
+
+    getProperty: {
+        value: function(el, p) {
+        }
+    },
+
+    setProperty: {
+        value: function(el, p, value) {
+        }
+    },
+
+    setAttribute: {
+        value: function(el, att, value) {
+        }
+    },
+
+    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;
+            }
+        }
+    },
+
+    getMatrix: {
+        value: function(el) {
+            if(el.elementModel && el.elementModel.props3D && el.elementModel.props3D.matrix3d)
+            {
+                return el.elementModel.props3D.matrix3d.slice(0);
+            }
+            else
+            {
+                var mat;
+
+                if (el)
+                {
+                    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)
+                    {
+                        zoom = Number(zoom);
+                        if (zoom != 1)
+                        {
+                            var zoomMat = Matrix.create(  [
+                                [ zoom,    0,    0, 0],
+                                [    0, zoom,    0, 0],
+                                [    0,    0, zoom, 0],
+                                [    0,    0,    0, 1]
+                            ] );
+                            glmat4.multiply( zoomMat, mat, mat );
+                        }
+                    }
+                }
+
+                el.elementModel.props3D.matrix3d = mat;
+                return mat;
+            }
+        }
+    }
+});
diff --git a/js/controllers/elements/controller-factory.js b/js/controllers/elements/controller-factory.js
index a772eb16..1bbbbce0 100755
--- a/js/controllers/elements/controller-factory.js
+++ b/js/controllers/elements/controller-factory.js
@@ -6,7 +6,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 
 var Montage         = require("montage/core/core").Montage;
 
-var BlockController = require("js/controllers/elements/block-controller").BlockController,
+var BodyController = require("js/controllers/elements/body-controller").BodyController,
+    BlockController = require("js/controllers/elements/block-controller").BlockController,
     StageController = require("js/controllers/elements/stage-controller").StageController,
     ShapesController = require("js/controllers/elements/shapes-controller").ShapesController,
         ImageController = require("js/controllers/elements/image-controller").ImageController,
@@ -27,6 +28,8 @@ exports.ControllerFactory = Montage.create(Montage, {
                     return BlockController;
                 } else if(value.indexOf("stage") !== -1) {
                     return StageController;
+                } else if(value.indexOf("body") !== -1) {
+                    return BodyController;
                 } else if(value.indexOf("shape") !== -1) {
                     return ShapesController;
                 } else if(value.indexOf("canvas") !== -1) {