Merge branch 'refs/heads/NinjaInternal' into FileIO

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

31 files changed, 373 insertions, 378 deletions

diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.js b/js/components/tools-properties/rect-properties.reel/rect-properties.js
index 8d0cd21f..1e717f88 100755
--- a/js/components/tools-properties/rect-properties.reel/rect-properties.js
+++ b/js/components/tools-properties/rect-properties.reel/rect-properties.js
@@ -113,7 +113,7 @@ exports.RectProperties = Montage.create(ToolProperties, {
 
     handleChange: {
         value: function(event) {
-            var hotTxt = event.currentTarget
+            var hotTxt = event.currentTarget;
             if(hotTxt.units === "%") {
                 if(hotTxt.value > 50) {
                     hotTxt.maxValue = 50;
diff --git a/js/components/tree.reel/tree.js b/js/components/tree.reel/tree.js
index 9c1b07e4..7084ba99 100755
--- a/js/components/tree.reel/tree.js
+++ b/js/components/tree.reel/tree.js
@@ -6,7 +6,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 
 var Montage = require("montage/core/core").Montage;
 var Component = require("montage/ui/component").Component;
-var nj = require("js/lib/NJUtils.js").NJUtils;
+var nj = require("js/lib/NJUtils").NJUtils;
 
 exports.Tree = Montage.create(Component, {
 
diff --git a/js/controllers/elements/canvas-controller.js b/js/controllers/elements/canvas-controller.js
index 21de9879..b5df3911 100755
--- a/js/controllers/elements/canvas-controller.js
+++ b/js/controllers/elements/canvas-controller.js
@@ -34,12 +34,12 @@ exports.CanvasController = Montage.create(ElementController, {
             }
         }
     },
-
-    setProperties: {
-        value: function(el, props, index) {
-            for(var p in props) {
-                el.elementModel.controller.setProperty(el, p, props[p][index]);
-            }
-        }
+        
+   setProperties: {
+       value: function(el, props, index) {
+           for(var p in props) {
+               el.elementModel.controller.setProperty(el, p, props[p][index]);
+           }
+       }
     }
 });
\ No newline at end of file
diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index f254220c..f2b54014 100755
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -127,36 +127,35 @@ var ElementController = exports.ElementController = Montage.create(NJComponent,
             }
             else
             {
-                // TODO - for now, just return the identity matrix
-                return Matrix.I(4);
-//                var mat;
-//
-//                if (elt)
-//                {
-//                    var xformStr = ElementsMediator.getProperty(elt, "-webkit-transform");
-//                    if (xformStr)
-//                        mat = this.transformStringToMat( xformStr );
-//                    if (!mat)
-//                        mat = Matrix.I(4);
-//
-//                    if (elt.style && elt.style.zoom)
-//                    {
-//                        var zoom = Number(elt.style.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 );
-//                        }
-//                    }
-//                }
-//
-//                elt.elementModel.props3D.matrix3d = mat;
-//                return mat;
+                var mat;
+
+                if (el)
+                {
+                    var xformStr = this.application.ninja.elementMediator.getProperty(el, "-webkit-transform");
+                    if (xformStr)
+                        mat = this.transformStringToMat( xformStr );
+                    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;
             }
         }
     },
@@ -207,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/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index d34644a7..c5f22138 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -24,6 +24,26 @@ exports.ShapesController = Montage.create(CanvasController, {
                     el.elementModel.shapeModel.GLGeomObj.setInnerRadius(val/100);
                     el.elementModel.shapeModel.GLGeomObj.buildBuffers();
                     break;
+                case "tlRadius":
+                    this.setShapeProperty(el, "tlRadius", value);
+                    el.elementModel.shapeModel.GLGeomObj.setTLRadius(val);
+                    el.elementModel.shapeModel.GLGeomObj.buildBuffers();
+                    break;
+                case "trRadius":
+                    this.setShapeProperty(el, "trRadius", value);
+                    el.elementModel.shapeModel.GLGeomObj.setTRRadius(val);
+                    el.elementModel.shapeModel.GLGeomObj.buildBuffers();
+                    break;
+                case "blRadius":
+                    this.setShapeProperty(el, "blRadius", value);
+                    el.elementModel.shapeModel.GLGeomObj.setBLRadius(val);
+                    el.elementModel.shapeModel.GLGeomObj.buildBuffers();
+                    break;
+                case "brRadius":
+                    this.setShapeProperty(el, "brRadius", value);
+                    el.elementModel.shapeModel.GLGeomObj.setBRRadius(val);
+                    el.elementModel.shapeModel.GLGeomObj.buildBuffers();
+                    break;
                 case "width":
                     el.elementModel.shapeModel.GLGeomObj.setWidth(val);
                     CanvasController.setProperty(el, p, value);
@@ -46,8 +66,16 @@ exports.ShapesController = Montage.create(CanvasController, {
     getProperty: {
         value: function(el, p) {
             switch(p) {
+                case "stroke":
+                case "fill":
                 case "strokeSize":
                 case "innerRadius":
+                case "tlRadius":
+                case "trRadius":
+                case "blRadius":
+                case "brRadius":
+                case "strokeMaterial":
+                case "fillMaterial":
                     return this.getShapeProperty(el, p);