Merge branch 'refs/heads/master' into CSSPanelUpdates

Conflicts:
	js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js

1 files changed, 482 insertions, 0 deletions

diff --git a/js/lib/geom/brush-stroke.js b/js/lib/geom/brush-stroke.js
new file mode 100755
index 00000000..9a934928
--- /dev/null
+++ b/js/lib/geom/brush-stroke.js
@@ -0,0 +1,482 @@
+/* <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> */
+
+// Todo: This entire class should be converted to a module
+var VecUtils = require("js/helper-classes/3D/vec-utils").VecUtils;
+var GeomObj = require("js/lib/geom/geom-obj").GeomObj;
+
+///////////////////////////////////////////////////////////////////////
+// Class GLBrushStroke
+//      representation a sequence points (polyline) created by brush tool.
+//      Derived from class GLGeomObj
+///////////////////////////////////////////////////////////////////////
+var BrushStroke = function GLBrushStroke() {
+    ///////////////////////////////////////////////////
+    // Instance variables
+    ///////////////////////////////////////////////////
+    this._Points = [];
+    this._BBoxMin = [0, 0, 0];
+    this._BBoxMax = [0, 0, 0];
+    this._dirty = true;
+
+    //whether or not to use the canvas drawing to stroke/fill
+    this._useCanvasDrawing = true;
+
+    //the X and Y location of this subpath's canvas in stage world space of Ninja
+    this._canvasX = 0;
+    this._canvasY = 0;
+
+    //stroke information
+    this._strokeWidth = 0.0;
+    this._strokeColor = [0.4, 0.4, 0.4, 1.0];
+    this._strokeMaterial = null;
+    this._strokeStyle = "Solid";
+
+    //the wetness of the brush (currently this is multiplied to the square of the stroke width, but todo should be changed to not depend on stroke width entirely
+    //smaller value means more samples for the path
+    this._WETNESS_FACTOR = 0.25;
+
+    //prevent extremely long paths that can take a long time to render
+    this._MAX_ALLOWED_SAMPLES = 500;
+
+    //drawing context
+    this._world = null;
+
+    //tool that owns this brushstroke
+    this._drawingTool = null;
+    this._planeMat = null;
+    this._planeMatInv = null;
+    this._planeCenter = null;
+
+    /////////////////////////////////////////////////////////
+    // Property Accessors/Setters
+    /////////////////////////////////////////////////////////
+    this.setWorld = function (world) {
+        this._world = world;
+    };
+
+    this.getWorld = function () {
+        return this._world;
+    };
+
+    this.geomType = function () {
+        return this.GEOM_TYPE_CUBIC_BEZIER;
+    };
+
+    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.getCanvasX = function(){
+        return this._canvasX;
+    };
+
+    this.getCanvasY = function(){
+        return this._canvasY;
+    };
+
+    this.setCanvasX = function(cx){
+        this._canvasX=cx;
+    };
+
+    this.setCanvasY = function(cy){
+        this._canvasY=cy;
+    };
+
+    this.getNumPoints = function () {
+        return this._Points.length;
+    };
+
+    this.getPoint = function (index) {
+        return this._Points[index];
+    };
+
+    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._WETNESS_FACTOR*this._strokeWidth;
+            var prevPt = this._Points[numPoints-1];
+            var diffPt = [prevPt[0]-pt[0], prevPt[1]-pt[1]];
+            var diffPtMag = Math.sqrt(diffPt[0]*diffPt[0] + diffPt[1]*diffPt[1]);
+            if (diffPtMag>threshold){
+                this._Points.push(pt);
+                this._dirty=true;
+            }
+        } else {
+            this._Points.push(pt);
+            this._dirty=true;
+        }
+    };
+    
+    this.insertPoint = function(pt, index){
+        this._Points.splice(index, 0, pt); this._dirty=true;
+    };
+
+    this.isDirty = function(){
+        return this._dirty;
+    };
+
+    this.makeDirty = function(){
+        this._dirty=true;
+    };
+
+    this.getBBoxMin = function () {
+        return this._BBoxMin;
+    };
+
+    this.getBBoxMax = function () {
+        return this._BBoxMax;
+    };
+
+    this.getStrokeWidth = function () {
+        return this._strokeWidth;
+    };
+
+    this.setStrokeWidth = function (w) {
+        this._strokeWidth = w;
+        this._dirty=true;
+    };
+
+    this.getStrokeMaterial = function () {
+        return this._strokeMaterial;
+    };
+
+    this.setStrokeMaterial = function (m) {
+        this._strokeMaterial = m;
+    };
+
+    this.getStrokeColor = function () {
+        return this._strokeColor;
+    };
+
+    this.setStrokeColor = function (c) {
+        this._strokeColor = c;
+    };
+
+    this.getStrokeStyle = function () {
+        return this._strokeStyle;
+    };
+
+    this.setStrokeStyle = function (s) {
+        this._strokeStyle = s;
+    };
+
+    this.setWidth = function () {
+
+    };//NO-OP for now
+
+    this.setHeight = function () {
+
+    };//NO-OP for now
+
+
+    //remove and return anchor at specified index, return null on error
+    this.removePoint = function (index) {
+        var retAnchor = null;
+        if (index < this._Points.length) {
+            retPt = this._Points.splice(index, 1);
+            this._dirty=true;
+        }
+        return retPoint;
+    };
+
+    //remove all the points
+    this.clear = function () {
+        this._Points = [];
+        this._dirty=true;
+    }
+
+    this.translate = function (tx, ty, tz) {
+        for (var i=0;i<this._Points.length;i++){
+            this._Points[i][0]+=tx;
+            this._Points[i][1]+=ty;
+            this._Points[i][2]+=tz;
+        }
+    };
+
+    this.computeMetaGeometry = function() {
+        if (this._dirty) {
+            var numPoints = this._Points.length;
+
+            //**** add samples to the path if needed...linear interpolation for now
+            if (numPoints>1) {
+                var threshold = this._WETNESS_FACTOR*this._strokeWidth;
+                var prevPt = this._Points[0];
+                var prevIndex = 0;
+                for (var i=1;i<numPoints;i++){
+                    var pt = this._Points[i];
+                    var diff = [pt[0]-prevPt[0], pt[1]-prevPt[1]];
+                    var distance = Math.sqrt(diff[0]*diff[0]+diff[1]*diff[1]);
+                    if (distance>threshold){
+                        //insert points along the prev. to current point
+                        var numNewPoints = Math.floor(distance/threshold);
+                        for (var j=0;j<numNewPoints;j++){
+                            var param = (j+1)/(numNewPoints+1);
+                            var newpt = [prevPt[0]+ diff[0]*param, prevPt[1]+ diff[1]*param];
+                            //insert new point before point i
+                            this._Points.splice(i, 0, [newpt[0], newpt[1], 0]);
+                            i++;
+                        }
+                        this._dirty=true;