Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste

3 files changed, 263 insertions, 281 deletions

diff --git a/js/lib/NJUtils.js b/js/lib/NJUtils.js
index 7dd4c9e8..0dec6345 100755
--- a/js/lib/NJUtils.js
+++ b/js/lib/NJUtils.js
@@ -90,30 +90,6 @@ 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) {
@@ -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..09a7023c 100755
--- a/js/lib/geom/brush-stroke.js
+++ b/js/lib/geom/brush-stroke.js
@@ -264,13 +264,67 @@ var BrushStroke = function GLBrushStroke() {
         this._strokeStyle = s;
     };
 
-    this.setWidth = function () {
+    this.setWidth = function (newW) {
+        if (newW<1) {
+            newW=1; //clamp minimum width to 1
+        }
+
+        //scale the contents of this subpath to lie within this width
+        //determine the scale factor by comparing with the old width
+        var oldWidth = this._BBoxMax[0]-this._BBoxMin[0];
+        if (oldWidth<1) {
+            oldWidth=1;
+        }
+
+        var scaleX = newW/oldWidth;
+        if (scaleX===1) {
+            return; //no need to do anything
+        }
+
+        //scale the local point positions such that the width of the bbox is the newW
+        var origX = this._BBoxMin[0];
+        var numPoints = this._LocalPoints.length;
+        for (var i=0;i<numPoints;i++){
+            //compute the distance from the bboxMin
+            var oldW = this._LocalPoints[i][0] - origX;
+            this._LocalPoints[i] = [(origX + oldW*scaleX),this._LocalPoints[i][1],this._LocalPoints[i][2]];
+
+            oldW = this._OrigLocalPoints[i][0] - origX;
+            this._OrigLocalPoints[i] = [(origX + oldW*scaleX),this._OrigLocalPoints[i][1],this._OrigLocalPoints[i][2]];
+        }
+        this._isDirty = true;
+    };
+
+    this.setHeight = function (newH) {
+        if (newH<1) {
+            newH=1; //clamp minimum width to 1
+        }
 
-    };//NO-OP for now
+        //scale the contents of this subpath to lie within this height
+        //determine the scale factor by comparing with the old height
+        var oldHeight = this._BBoxMax[1]-this._BBoxMin[1];
+        if (oldHeight<1) {
+            oldHeight=1;
+        }
+
+        var scaleY = newH/oldHeight;
+        if (scaleY===1) {
+            return; //no need to do anything
+        }
 
-    this.setHeight = function () {
+        //scale the local point positions such that the width of the bbox is the newW
+        var origY = this._BBoxMin[1];
+        var numPoints = this._LocalPoints.length;
+        for (var i=0;i<numPoints;i++){
+            //compute the distance from the bboxMin
+            var oldH = this._LocalPoints[i][1] - origY;
+            this._LocalPoints[i] = [this._LocalPoints[i][0],(origY + oldH*scaleY),this._LocalPoints[i][2]];
 
-    };//NO-OP for now
+            oldH = this._OrigLocalPoints[i][1] - origY;
+            this._OrigLocalPoints[i] = [this._OrigLocalPoints[i][0],(origY + oldH*scaleY),this._OrigLocalPoints[i][2]];
+        }
+        this._isDirty = true;
+    };
 
     this.getWidth = function() {
         if (this._isDirty){
@@ -583,7 +637,7 @@ var BrushStroke = function GLBrushStroke() {
             //build the stamp for the brush stroke
             var t=0;
             var numTraces = this._strokeWidth;
-            var halfNumTraces = numTraces/2;
+            var halfNumTraces = numTraces*0.5;
             var opaqueRegionHalfWidth = 0.5*this._strokeHardness*numTraces*0.01; //the 0.01 is to convert the strokeHardness from [0,100] to [0,1]
             var maxTransparentRegionHalfWidth = halfNumTraces-opaqueRegionHalfWidth;
 
@@ -603,20 +657,23 @@ var BrushStroke = function GLBrushStroke() {
             ctx.lineCap="butt";
             ctx.globalCompositeOperation = 'source-over';
             ctx.globalAlpha = this._strokeColor[3];
-            //todo figure out the correct formula for the line width
-            ctx.lineWidth=2;
-            if (t===numTraces-1){
-                ctx.lineWidth = 1;
+