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

Conflicts:
	assets/canvas-runtime.js
	js/io/system/ninjalibrary.json
	js/mediators/element-mediator.js

3 files changed, 926 insertions, 881 deletions

diff --git a/js/lib/NJUtils.js b/js/lib/NJUtils.js
index 7dd4c9e8..b35e29bc 100755
--- a/js/lib/NJUtils.js
+++ b/js/lib/NJUtils.js
@@ -90,38 +90,14 @@ exports.NJUtils = Montage.create(Component, {
         }
     },
 
-    createModel: {
-        value: function(el) {
-            el.elementModel = Montage.create(ElementModel).initialize(el);
-        }
-    },
-
-    createModelWithShape: {
-        value: function(el, selection) {
-            el.elementModel = Montage.create(ElementModel).initialize(el, true, selection);
-        }
-    },
-
-    createModelWithSelection: {
-        value: function(el, selection) {
-            el.elementModel = Montage.create(ElementModel).initialize(el, false, selection);
-        }
-    },
-
-    createModelForComponent: {
-        value: function(el, selection) {
-            el.elementModel = Montage.create(ElementModel).initialize(el, false, selection, true);
-        }
-    },
-
     // TODO: Find a better place for this method
     stylesFromDraw: {
         value: function(element, width, height, drawData, pos) {
             var styles = {};
 
             styles['position'] = pos ? pos: "absolute";
-            styles['left'] = (Math.round(drawData.midPt[0] - 0.5 * width)) - this.application.ninja.currentSelectedContainer.offsetLeft + 'px';
-            styles['top'] = (Math.round(drawData.midPt[1] - 0.5 * height)) - this.application.ninja.currentSelectedContainer.offsetTop + 'px';
+            styles['left'] = (Math.round(drawData.midPt[0] - 0.5 * width)) - this.application.ninja.currentDocument.model.domContainer.offsetLeft + 'px';
+            styles['top'] = (Math.round(drawData.midPt[1] - 0.5 * height)) - this.application.ninja.currentDocument.model.domContainer.offsetTop + 'px';
             styles['width'] = width + 'px';
             styles['height'] = height + 'px';
 
@@ -166,102 +142,6 @@ exports.NJUtils = Montage.create(Component, {
         }
     },
 
-    ///// Element Model creation for existing elements
-    ///// TODO: find a different place for this function
-    makeElementModel: {
-        value: function(el, selection, controller, isShape) {
-            var p3d = Montage.create(Properties3D);
-
-            var shapeProps = null;
-            var pi = controller + "Pi";
-
-            if(isShape) {
-                shapeProps = Montage.create(ShapeModel);
-            }
-
-            if(el.controller) {
-
-                var componentInfo = Montage.getInfoForObject(el.controller);
-                var componentName = componentInfo.objectName.toLowerCase();
-
-                controller  = "component";
-                isShape = false;
-
-                switch(componentName) {
-                    case "feedreader":
-                        selection = "Feed Reader";
-                        pi = "FeedReaderPi";
-                        break;
-                    case "map":
-                        selection = "Map";
-                        pi = "MapPi";
-                        break;
-                    case "youtubechannel":
-                        selection = "Youtube Channel";
-                        pi = "YoutubeChannelPi";
-                        break;
-                    case "picasacarousel":
-                        selection = "Picasa Carousel";
-                        pi = "PicasaCarouselPi";
-                        break;
-                }
-            }
-
-            el.elementModel = Montage.create(ElementModel, {
-                    type:       { value: el.nodeName},
-                    selection:  { value: selection},
-                    controller: { value: ControllerFactory.getController(controller)},
-                    pi:         { value: pi},
-                    props3D:    { value: p3d},
-                    shapeModel: { value: shapeProps},
-                    isShape:    { value: isShape}
-            });
-
-
-        }
-    },
-
-    ///// Element Model creation for existing elements based on element type.
-    ///// TODO: Selection and model should be based on the element type
-    makeModelFromElement: {
-        value: function(el) {
-            var selection = "div",
-                controller = "block",
-                isShape = false;
-            switch(el.nodeName.toLowerCase())
-            {
-                case "div":
-                    break;
-                case "img":
-                    selection = "image";
-                    controller = "image";
-                    break;
-                case "video":
-                    selection = "video";
-                    controller = "video";
-                    break;
-                case "canvas":
-                    isShape = el.getAttribute("data-RDGE-id");
-                    if(isShape) {
-                        // TODO - Need more info about the shape
-                        selection = "canvas";
-                        controller = "shape";
-                        isShape = true;
-                    } else {
-                        selection = "canvas";
-                        controller = "canvas";
-                    }
-                    break;
-                case "shape":
-                    break;
-            }
-            this.makeElementModel(el, selection, controller, isShape);
-            if(el.elementModel && el.elementModel.props3D) {
-                el.elementModel.props3D.init(el, (selection === "Stage"));
-            }
-        }
-    },
-
     ///// Removes all child nodes and returns node
     ///// Accepts a single node, or an array of dom nodes
     empty : {
diff --git a/js/lib/geom/brush-stroke.js b/js/lib/geom/brush-stroke.js
index 6facdd5d..d9c2ab53 100755
--- a/js/lib/geom/brush-stroke.js
+++ b/js/lib/geom/brush-stroke.js
@@ -45,7 +45,7 @@ var BrushStroke = function GLBrushStroke() {
     this._strokeAmountSmoothing = 0;
 
     // currently, brush does not support a fill region
-    this.canFill = false;
+    this.canFill = true;
 
     //threshold that tells us whether two samples are too far apart
     this._MAX_SAMPLE_DISTANCE_THRESHOLD = 5;
@@ -65,710 +65,840 @@ var BrushStroke = function GLBrushStroke() {
     this._planeMatInv = null;
     this._planeCenter = null;
     this._dragPlane = null;
+}; //BrushStroke class defition
 
-    /////////////////////////////////////////////////////////
-    // Property Accessors/Setters
-    /////////////////////////////////////////////////////////
-    this.setCanvas = function(c) {
-        this._canvas = c;
-    }
-
-    this.setWorld = function (world) {
-        this._world = world;
-    };
-
-    this.getWorld = function () {
-        return this._world;
-    };
-
-    this.geomType = function () {
-        return this.GEOM_TYPE_BRUSH_STROKE;
-    };
-
-    this.setDrawingTool = function (tool) {
-        this._drawingTool = tool;
-    };
-
-    this.getDrawingTool = function () {
-        return this._drawingTool;
-    };
-
-    this.setPlaneMatrix = function(planeMat){
-        this._planeMat = planeMat;
-    };
-
-    this.setPlaneMatrixInverse = function(planeMatInv){
-        this._planeMatInv = planeMatInv;
-    };
-
-    this.setPlaneCenter = function(pc){
-        this._planeCenter = pc;
-    };
-
-    this.setDragPlane = function(p){
-        this._dragPlane = p;
-    };
-
-    this.getNumPoints = function () {
-        if (this._LocalPoints.length)
-            return this._LocalPoints.length;
-        else
-            return this._Points.length;
-    };
-
-    this.getPoint = function (index) {
-        return this._Points[index].slice(0);
-    };
+BrushStroke.prototype = Object.create(GeomObj, {});
 
-    this.addPoint = function (pt) {
-        //add the point only if it is some epsilon away from the previous point
-        var numPoints = this._Points.length;
-        if (numPoints>0) {
-            var threshold = this._MIN_SAMPLE_DISTANCE_THRESHOLD;
-            var prevPt = this._Points[numPoints-1];
-            var diffPt = [prevPt[0]-pt[0], prevPt[1]-pt[1]];
+/////////////////////////////////////////////////////////
+// Property Accessors/Setters
+/////////////////////////////////////////////////////////
+BrushStroke.prototype.setCanvas = function(c) {
+    this._canvas = c;
+};
+