Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures

Conflicts:
	js/lib/geom/geom-obj.js
	js/lib/geom/rectangle.js
	js/tools/TagTool.js

12 files changed, 73 insertions, 307 deletions

diff --git a/js/tools/BrushTool.js b/js/tools/BrushTool.js
index ded56ecc..5c334b92 100644
--- a/js/tools/BrushTool.js
+++ b/js/tools/BrushTool.js
@@ -374,13 +374,11 @@ exports.BrushTool = Montage.create(ShapeTool, {
                 return;
             }
 
-            var left = Math.round(midPt[0] - 0.5 * w);
-            var top = Math.round(midPt[1] - 0.5 * h);
-
             if (!canvas) {
-                var newCanvas = NJUtils.makeNJElement("canvas", "Brushstroke", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true);
-                var elementModel = TagTool.makeElement(w, h, planeMat, midPt, newCanvas, true);
-                ElementMediator.addElements(newCanvas, elementModel.data, false);
+                var newCanvas = document.application.njUtils.make("canvas", {"data-RDGE-id": NJUtils.generateRandom()}, this.application.ninja.currentDocument);
+                document.application.njUtils.createModelWithShape(newCanvas, "Brushstroke");
+                var styles = document.application.njUtils.stylesFromDraw(newCanvas, w, h, {midPt: midPt, planeMat: planeMat});
+                this.application.ninja.elementMediator.addElements(newCanvas, styles, false);
 
                 // create all the GL stuff
                 var world = this.getGLWorld(newCanvas, this._useWebGL);
diff --git a/js/tools/EyedropperTool.js b/js/tools/EyedropperTool.js
index 346975b2..6678e498 100755
--- a/js/tools/EyedropperTool.js
+++ b/js/tools/EyedropperTool.js
@@ -375,7 +375,8 @@ exports.EyedropperTool = Montage.create(toolBase, {
                     var worldData = elt.elementModel.shapeModel.GLWorld.exportJSON();
                     if(worldData)
                     {
-                        this._webGlDataCanvas = njModule.NJUtils.makeNJElement("canvas", "Canvas", "shape", {"data-RDGE-id": njModule.NJUtils.generateRandom()}, true);
+                        this._webGlDataCanvas = njModule.NJUtils.make("canvas", {"data-RDGE-id": njModule.NJUtils.generateRandom()}, this.application.ninja.currentDocument);
+                        njModule.NJUtils.createModelWithShape(this._webGlDataCanvas, "Canvas");
                         this._applyElementStyles(elt, this._webGlDataCanvas, ["display", "position", "width", "height",
                                                                     "-webkit-transform", "-webkit-transform-style"]);
                         this._webGlDataCanvas.style.left = eltCoords[0] + "px";
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index 61971c33..6621d18b 100755
--- a/js/tools/LineTool.js
+++ b/js/tools/LineTool.js
@@ -77,10 +77,11 @@ exports.LineTool = Montage.create(ShapeTool, {
                             h += ~~(yAdj*2);
                         }
 
-                        canvas = NJUtils.makeNJElement("canvas", "Canvas", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true);
-                        var elementModel = TagTool.makeElement(w, h, drawData.planeMat, drawData.midPt, canvas, true);
-                        canvas.elementModel.isShape = true;
-                        this.application.ninja.elementMediator.addElements(canvas, elementModel.data);
+                        canvas = document.application.njUtils.make("canvas", {"data-RDGE-id": NJUtils.generateRandom()}, this.application.ninja.currentDocument);
+                        document.application.njUtils.createModelWithShape(canvas, "Line");
+
+                        var styles = document.application.njUtils.stylesFromDraw(canvas, w, h, drawData);
+                        this.application.ninja.elementMediator.addElements(canvas, styles);
                     } else {
                         canvas = this._targetedElement;
                         canvas.elementModel.controller = ShapesController;
@@ -233,7 +234,8 @@ exports.LineTool = Montage.create(ShapeTool, {
             var xOffset = ((left - canvas.offsetLeft + w/2) - canvas.width/2);
             var yOffset = (canvas.height/2 - (top - canvas.offsetTop + h/2));
 
-            var line = new Line(world, xOffset, yOffset, w, h, slope, strokeSize, strokeColor, strokeMaterial, strokeStyle, xAdj, yAdj);
+            var line = Object.create(Line, {});
+            line.init(world, xOffset, yOffset, w, h, slope, strokeSize, strokeColor, strokeMaterial, strokeStyle, xAdj, yAdj);
 
             world.addObject(line);
             world.render();
@@ -241,7 +243,7 @@ exports.LineTool = Montage.create(ShapeTool, {
             canvas.elementModel.shapeModel.shapeCount++;
             if(canvas.elementModel.shapeModel.shapeCount === 1)
             {
-                canvas.elementModel.selection = "Line";
+//                canvas.elementModel.selection = "Line";
                 canvas.elementModel.pi = "LinePi";
                 canvas.elementModel.shapeModel.strokeSize = this.options.strokeSize.value + " " + this.options.strokeSize.units;
 
diff --git a/js/tools/OvalTool.js b/js/tools/OvalTool.js
index f06fadb9..917da538 100755
--- a/js/tools/OvalTool.js
+++ b/js/tools/OvalTool.js
@@ -68,7 +68,7 @@ exports.OvalTool = Montage.create(ShapeTool, {
             var xOffset = ((left - canvas.offsetLeft + w/2) - canvas.width/2);
             var yOffset = -(canvas.height/2 - (top - canvas.offsetTop + h/2));
 
-            var oval = new Circle(); //GLCircle();
+            var oval = Object.create(Circle, {});
             oval.init(world, xOffset, yOffset, w, h, strokeSize, strokeColor, fillColor, innerRadius, strokeMaterial, fillMaterial, strokeStyle);
 
             world.addObject(oval);
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js
index 8ecc9f79..16990ca7 100755
--- a/js/tools/PenTool.js
+++ b/js/tools/PenTool.js
@@ -557,17 +557,16 @@ exports.PenTool = Montage.create(ShapeTool, {
                 return;
             }
 
-            w= Math.round(w);
+            w = Math.round(w);
             h = Math.round(h);
             var left = Math.round(midPt[0] - 0.5 * w);
             var top = Math.round(midPt[1] - 0.5 * h);
 
             if (!canvas) {
-                var newCanvas = null;
-                newCanvas = NJUtils.makeNJElement("canvas", "Subpath", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true);
-                var elementModel = TagTool.makeElement(parseInt(w), parseInt(h), planeMat, midPt, newCanvas, true);
-                //note that we set the notify event to false because we send the event separately at end of this code block
-                ElementMediator.addElements(newCanvas, elementModel.data, false);
+                var newCanvas = document.application.njUtils.make("canvas", {"data-RDGE-id": NJUtils.generateRandom()}, this.application.ninja.currentDocument);
+                document.application.njUtils.createModelWithShape(newCanvas, "Subpath");
+                var styles = document.application.njUtils.stylesFromDraw(newCanvas, parseInt(w), parseInt(h), {midPt: midPt, planeMat: planeMat});
+                this.application.ninja.elementMediator.addElements(newCanvas, styles, false);
 
                 // create all the GL stuff
                 var world = this.getGLWorld(newCanvas, this._useWebGL);//this.options.use3D);//this.CreateGLWorld(planeMat, midPt, newCanvas, this._useWebGL);//fillMaterial, strokeMaterial);
diff --git a/js/tools/RectTool.js b/js/tools/RectTool.js
index 5865f00d..a8c57688 100755
--- a/js/tools/RectTool.js
+++ b/js/tools/RectTool.js
@@ -87,7 +87,7 @@ exports.RectTool = Montage.create(ShapeTool, {
             var xOffset = ((left - canvas.offsetLeft + w/2) - canvas.width/2);
             var yOffset = (canvas.height/2 - (top - canvas.offsetTop + h/2));
 
-            var rect = new Rectangle();
+            var rect = Object.create(Rectangle, {});
             rect.init(world, xOffset, yOffset, w, h, strokeSize, strokeColor, fillColor,
                                         tlRadius, trRadius, blRadius, brRadius, strokeMaterial, fillMaterial, strokeStyle);
 
diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js
index 855c7b8c..07c26b8c 100755
--- a/js/tools/SelectionTool.js
+++ b/js/tools/SelectionTool.js
@@ -504,7 +504,7 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
                 delta = vecUtils.vecSubtract( 3, data.pt1, data.pt0 );
                 delta[0] = ~~delta[0];
                 delta[1] = ~~delta[1];
-                delta[2] = 0;
+                //delta[2] = 0;
                 var transMat = Matrix.Translation( delta );
                 this._moveElements(transMat);
             }
diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js
index d2337000..0562dbc2 100755
--- a/js/tools/ShapeTool.js
+++ b/js/tools/ShapeTool.js
@@ -53,23 +53,17 @@ exports.ShapeTool = Montage.create(DrawingTool, {
         }
     },
 
-        HandleLeftButtonUp:
-    {
-        value: function (event)
-        {
-            var drawData;
-
-            drawData = this.getDrawingData();
+        HandleLeftButtonUp: {
+        value: function (event) {
+            var canvas, drawData = this.getDrawingData();
 
             if(drawData) {
-                var canvas;
                 if(!this._useExistingCanvas()) {
-                    canvas = NJUtils.makeNJElement("canvas", "Canvas", "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true);
-                    var elementModel = TagTool.makeElement(~~drawData.width, ~~drawData.height,
-                                                                        drawData.planeMat, drawData.midPt, canvas, true);
+                    canvas = document.application.njUtils.make("canvas", {"data-RDGE-id": NJUtils.generateRandom()}, this.application.ninja.currentDocument);
+                    document.application.njUtils.createModelWithShape(canvas);
 
-                    canvas.elementModel.isShape = true;
-                                        this.application.ninja.elementMediator.addElements(canvas, elementModel.data);
+                    var styles = document.application.njUtils.stylesFromDraw(canvas, ~~drawData.width, ~~drawData.height, drawData);
+                    this.application.ninja.elementMediator.addElements(canvas, styles);
                 } else {
                     canvas = this._targetedElement;
                     if (!canvas.getAttribute( "data-RDGE-id" ))
@@ -193,26 +187,6 @@ exports.ShapeTool = Montage.create(DrawingTool, {
         }
     },
 
-    createCanvas: {
-        value: function (left, top, w, h)
-        {
-            //var tmpDiv = document.createElement("canvas");
-            var tmpDiv = NJUtils.makeNJElement("canvas", "Canvas", "block");
-            var rules = {
-                            'position': 'absolute',
-                            'top' : top + 'px',
-                            'left' : left + 'px',
-                            '-webkit-transform-style' : 'preserve-3d',
-                            '-webkit-transform' : 'matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1)'
-                        };
-
-            tmpDiv.width = w;
-            tmpDiv.height = h;
-
-            return {el: tmpDiv, rules: rules};
-        }
-    },
-