From d7d78d4a4e8cf82c56379d25efbe679b3b823abc Mon Sep 17 00:00:00 2001
From: Pushkar Joshi
Date: Thu, 1 Mar 2012 11:22:46 -0800
Subject: show feedback on mouseover on a part of the path where a new anchor
 will be added if clicked

---
 js/helper-classes/RDGE/GLSubpath.js | 147 ++++++++++++++++++++++++++++++------
 1 file changed, 124 insertions(+), 23 deletions(-)

(limited to 'js/helper-classes')

diff --git a/js/helper-classes/RDGE/GLSubpath.js b/js/helper-classes/RDGE/GLSubpath.js
index f3d8ad36..2fb91d33 100755
--- a/js/helper-classes/RDGE/GLSubpath.js
+++ b/js/helper-classes/RDGE/GLSubpath.js
@@ -505,7 +505,6 @@ GLSubpath.prototype._isWithinBoundingBox = function(point, ctrlPts, radius) {
 GLSubpath.prototype.pickAnchor = function (pickX, pickY, pickZ, radius) {
     var numAnchors = this._Anchors.length;
     var selAnchorIndex = -1;
-    var retCode = this.SEL_NONE;
     var radSq = radius * radius;
     var minDistance = Infinity;
     //check if the clicked location is close to the currently selected anchor position
@@ -515,9 +514,23 @@ GLSubpath.prototype.pickAnchor = function (pickX, pickY, pickZ, radius) {
         if (distSq < minDistance && distSq < radSq) {
             selAnchorIndex = this._selectedAnchorIndex;
             minDistance = distSq;
-            retCode = retCode | this.SEL_ANCHOR;
+        } else {
+            //check the prev and next of the selected anchor if the above did not register a hit
+            distSq = this._Anchors[this._selectedAnchorIndex].getPrevDistanceSq(pickX, pickY, pickZ);
+            if (distSq < minDistance && distSq < radSq){
+                selAnchorIndex = this._selectedAnchorIndex;
+                minDistance = distSq;
+            } else {
+                //check the next for this anchor point
+                distSq = this._Anchors[this._selectedAnchorIndex].getNextDistanceSq(pickX, pickY, pickZ);
+                if (distSq<minDistance && distSq<radSq){
+                    selAnchorIndex = this._selectedAnchorIndex;
+                    minDistance = distSq;
+                }
+            }
         }
     }
+    
     //now check if the click location is close to any anchor position
     if (selAnchorIndex===-1) {
         for (var i = 0; i < numAnchors; i++) {
@@ -532,12 +545,97 @@ GLSubpath.prototype.pickAnchor = function (pickX, pickY, pickZ, radius) {
     return selAnchorIndex;
 }
 
+GLSubpath.prototype.isWithinBBox =function(x,y,z){
+    if (this._BBoxMin[0]>x || this._BBoxMin[1]>y || this._BBoxMin[2]>z){
+        return false;
+    }
+    if (this._BBoxMax[0]<x || this._BBoxMax[1]<y || this._BBoxMax[2]<z){
+        return false;
+    }
+    return true;
+}
+
+//pick the path point closest to the specified location, return null if some anchor point (or its handles) is within radius, else return the parameter distance
+GLSubpath.prototype.pathHitTest = function (pickX, pickY, pickZ, radius) {
+    var numAnchors = this._Anchors.length;
+    var selAnchorIndex = -1;
+    var retParam = null;
+    var radSq = radius * radius;
+    var minDistance = Infinity;
+    
+    //check if the location is close to the currently selected anchor position
+    if (this._selectedAnchorIndex>=0 && this._selectedAnchorIndex<this._Anchors.length){
+        var distSq = this._Anchors[this._selectedAnchorIndex].getDistanceSq(pickX, pickY, pickZ);
+        //check the anchor point
+        if (distSq < minDistance && distSq < radSq) {
+            selAnchorIndex = this._selectedAnchorIndex;
+            minDistance = distSq;
+        }
+    }
+    //check the prev and next of the selected anchor if the above did not register a hit
+    if (this._selectedAnchorIndex>=0 && selAnchorIndex === -1) {
+        var distSq = this._Anchors[this._selectedAnchorIndex].getPrevDistanceSq(pickX, pickY, pickZ);
+        if (distSq < minDistance && distSq < radSq){
+            selAnchorIndex = this._selectedAnchorIndex;
+            minDistance = distSq;
+        } else {
+            //check the next for this anchor point
+            distSq = this._Anchors[this._selectedAnchorIndex].getNextDistanceSq(pickX, pickY, pickZ);
+            if (distSq<minDistance && distSq<radSq){
+                selAnchorIndex = this._selectedAnchorIndex;
+                minDistance = distSq;
+            }
+        }
+    }
+
+    //now check if the location is close to any anchor position
+    if (selAnchorIndex===-1) {
+        for (var i = 0; i < numAnchors; i++) {
+            var distSq = this._Anchors[i].getDistanceSq(pickX, pickY, pickZ);
+            //check the anchor point
+            if (distSq < minDistance && distSq < radSq) {
+                selAnchorIndex = i;
+                minDistance = distSq;
+            }
+        }//for every anchor i
+    }
+
+    //finally check if the location is close to the curve itself
+    if (selAnchorIndex===-1) {
+        //first check if the input location is within the bounding box
+        if (this.isWithinBBox(pickX,pickY,pickZ)){
+            var numSegments = this._isClosed ? numAnchors : numAnchors-1;
+            for (var i = 0; i < numSegments; i++) {
+                var nextIndex = (i+1)%numAnchors;
+                //check if the point is close to the bezier segment between anchor i and anchor nextIndex
+                var controlPoints = Vector.create([Vector.create([this._Anchors[i].getPosX(),this._Anchors[i].getPosY(),this._Anchors[i].getPosZ()]),
+                    Vector.create([this._Anchors[i].getNextX(),this._Anchors[i].getNextY(),this._Anchors[i].getNextZ()]),
+                    Vector.create([this._Anchors[nextIndex].getPrevX(),this._Anchors[nextIndex].getPrevY(),this._Anchors[nextIndex].getPrevZ()]),
+                    Vector.create([this._Anchors[nextIndex].getPosX(),this._Anchors[nextIndex].getPosY(),this._Anchors[nextIndex].getPosZ()])]);
+                var point = Vector.create([pickX, pickY, pickZ]);
+                if (this._isWithinBoundingBox(point, controlPoints, radius)) {
+                    //var intersectParam = this._checkIntersection(controlPoints, 0.0, 1.0, point, radius);
+                    var intersectParam = this._checkIntersectionWithSamples(this._anchorSampleIndex[i], this._anchorSampleIndex[nextIndex], point, radius);
+                    console.log("intersectParam:"+intersectParam);
+                    if (intersectParam){
+                        selAnchorIndex=i;
+                        retParam = intersectParam-i; //make the retParam go from 0 to 1
+                        break;
+                    }
+                }
+            }//for every anchor i
+        }//if is within bbox
+    }
+    return [selAnchorIndex,retParam];
+}     //GLSubpath.pathHitTest function
+
 
 //pick the path point closest to the specified location, return null if some anchor point (or its handles) is within radius, else return the parameter distance
 GLSubpath.prototype.pickPath = function (pickX, pickY, pickZ, radius) {
     var numAnchors = this._Anchors.length;
     var selAnchorIndex = -1;
     var retCode = this.SEL_NONE;
+    var retParam = null;
     var radSq = radius * radius;
     var minDistance = Infinity;
     //check if the clicked location is close to the currently selected anchor position
@@ -580,33 +678,36 @@ GLSubpath.prototype.pickPath = function (pickX, pickY, pickZ, radius) {
             }
         }
     }
-    var retParam = null;
+
     if (retCode !== this.SEL_NONE) {
         retCode = retCode | this.SEL_PATH; //ensure that path is also selected if anything else is selected
         this._selectedAnchorIndex = selAnchorIndex;
     } else {
         this._selectedAnchorIndex = -1;
-        var numSegments = this._isClosed ? numAnchors : numAnchors-1;
-        for (var i = 0; i < numSegments; i++) {
-            var nextIndex = (i+1)%numAnchors;
-            //check if the point is close to the bezier segment between anchor i and anchor nextIndex
-            var controlPoints = Vector.create([Vector.create([this._Anchors[i].getPosX(),this._Anchors[i].getPosY(),this._Anchors[i].getPosZ()]),
-                Vector.create([this._Anchors[i].getNextX(),this._Anchors[i].getNextY(),this._Anchors[i].getNextZ()]),
-                Vector.create([this._Anchors[nextIndex].getPrevX(),this._Anchors[nextIndex].getPrevY(),this._Anchors[nextIndex].getPrevZ()]),
-                Vector.create([this._Anchors[nextIndex].getPosX(),this._Anchors[nextIndex].getPosY(),this._Anchors[nextIndex].getPosZ()])]);
-            var point = Vector.create([pickX, pickY, pickZ]);
-            if (this._isWithinBoundingBox(point, controlPoints, radius)) {
-                //var intersectParam = this._checkIntersection(controlPoints, 0.0, 1.0, point, radius);
-                var intersectParam = this._checkIntersectionWithSamples(this._anchorSampleIndex[i], this._anchorSampleIndex[nextIndex], point, radius);
-                console.log("intersectParam:"+intersectParam);
-                if (intersectParam){
-                    retCode = retCode | this.SEL_PATH;
-                    retParam = intersectParam-i; //make the retParam go from 0 to 1
-                    this._selectedAnchorIndex = i;
-                    break;
+        //first check if the input location is within the bounding box
+        if (this.isWithinBBox(pickX,pickY,pickZ)){
+            var numSegments = this._isClosed ? numAnchors : numAnchors-1;
+            for (var i = 0; i < numSegments; i++) {
+                var nextIndex = (i+1)%numAnchors;
+                //check if the point is close to the bezier segment between anchor i and anchor nextIndex
+                var controlPoints = Vector.create([Vector.create([this._Anchors[i].getPosX(),this._Anchors[i].getPosY(),this._Anchors[i].getPosZ()]),
+                    Vector.create([this._Anchors[i].getNextX(),this._Anchors[i].getNextY(),this._Anchors[i].getNextZ()]),
+                    Vector.create([this._Anchors[nextIndex].getPrevX(),this._Anchors[nextIndex].getPrevY(),this._Anchors[nextIndex].getPrevZ()]),
+                    Vector.create([this._Anchors[nextIndex].getPosX(),this._Anchors[nextIndex].getPosY(),this._Anchors[nextIndex].getPosZ()])]);
+                var point = Vector.create([pickX, pickY, pickZ]);
+                if (this._isWithinBoundingBox(point, controlPoints, radius)) {
+                    //var intersectParam = this._checkIntersection(controlPoints, 0.0, 1.0, point, radius);
+                    var intersectParam = this._checkIntersectionWithSamples(this._anchorSampleIndex[i], this._anchorSampleIndex[nextIndex], point, radius);
+                    console.log("intersectParam:"+intersectParam);
+                    if (intersectParam){
+                        retCode = retCode | this.SEL_PATH;
+                        retParam = intersectParam-i; //make the retParam go from 0 to 1
+                        this._selectedAnchorIndex = i;
+                        break;
+                    }
                 }
-            }
-        }//for every anchor i
+            }//for every anchor i
+        }//is within bounding box
     }
     this._selectMode = retCode;
     return retParam;
-- 
cgit v1.2.3


From 0b7f2f54738d2c1ea480b9bac7d3a750b1ef4df6 Mon Sep 17 00:00:00 2001
From: Pushkar Joshi
Date: Thu, 1 Mar 2012 15:29:17 -0800
Subject: first attempt at rendering the brush stroke as a collection of
 polylines (number of polylines equals the stroke width)

---
 js/helper-classes/RDGE/GLBrushStroke.js | 47 +++++++++++++++++++++++++++++++--
 1 file changed, 45 insertions(+), 2 deletions(-)

(limited to 'js/helper-classes')

diff --git a/js/helper-classes/RDGE/GLBrushStroke.js b/js/helper-classes/RDGE/GLBrushStroke.js
index 5d773c2d..f5b0bce1 100755
--- a/js/helper-classes/RDGE/GLBrushStroke.js
+++ b/js/helper-classes/RDGE/GLBrushStroke.js
@@ -139,7 +139,8 @@ function GLBrushStroke() {
             var numPoints = this._Points.length;
 
             //**** add samples to the path if needed...linear interpolation for now
-            if (numPoints>1) {
+            //if (numPoints>1) {
+            if (0){
                 var threshold = this._WETNESS_FACTOR*this._strokeWidth;
                 var prevPt = this._Points[0];
                 var prevIndex = 0;
@@ -331,7 +332,7 @@ function GLBrushStroke() {
         }
         */
 
-
+        /*
         var R2 = this._strokeWidth;
         var R = R2*0.5;
         var hardness = 0; //for a pencil, this is always 1 //TODO get hardness parameter from user interface
@@ -359,6 +360,48 @@ function GLBrushStroke() {
             //ctx.globalCompositeOperation = 'source-in';
             //ctx.rect(x-R, y-R, R2, R2);
         }
+        */
+
+        //todo test how to render the path as a bunch of moveTo and lineTos (for calligraphic brush styles)
+        var numTraces = this._strokeWidth;
+        var halfNumTraces = numTraces/2;
+        var deltaDisplacement = [1,0];//[this._strokeWidth/numTraces, 0]; //a horizontal line brush
+        var startPos = [-this._strokeWidth/2,0];
+        for (var t=0;t<numTraces;t++){
+            var disp = [startPos[0]+t*deltaDisplacement[0], startPos[1]+t*deltaDisplacement[1]];
+            //ctx.globalCompositeOperation = 'source-over';
+            var distFromMiddle = Math.abs(halfNumTraces-t);
+            var alphaVal = 1.0 - (distFromMiddle/halfNumTraces);
+            ctx.save();
+            ctx.lineWidth=this._strokeWidth/10;//4;
+            if (ctx.lineWidth<2)
+                ctx.lineWidth=2;
+            ctx.lineJoin="bevel";
+            ctx.lineCap="butt";
+            if (t<numTraces/2)
+                ctx.strokeStyle="rgba("+parseInt(255*this._strokeColor[0])+","+parseInt(255*this._strokeColor[1])+","+parseInt(255*this._strokeColor[2])+","+alphaVal+")";
+            else
+                ctx.strokeStyle="rgba("+255+","+parseInt(255*this._strokeColor[1])+","+parseInt(255*this._strokeColor[2])+","+alphaVal+")";
+            ctx.translate(disp[0],disp[1]);
+            ctx.beginPath();
+            ctx.moveTo(this._Points[0][0]-bboxMin[0], this._Points[0][1]-bboxMin[1]);
+            for (var i=0;i<numPoints;i++){
+                ctx.lineTo(this._Points[i][0]-bboxMin[0], this._Points[i][1]-bboxMin[1]);
+            }
+            ctx.stroke();
+            ctx.restore();
+        }
+
+        /*
+        ctx.beginPath();
+        ctx.moveTo(this._Points[0][0]-bboxMin[0], this._Points[0][1]-bboxMin[1]);
+        for (var i=1;i<numPoints;i++){
+            ctx.lineTo(this._Points[i][0]-bboxMin[0], this._Points[i][1]-bboxMin[1]);
+        }
+        ctx.lineWidth=1.0;
+        ctx.strokeStyle = "black";
+        ctx.stroke();
+        */
 
         ctx.restore();
     } //render()
-- 
cgit v1.2.3


From 1b68bb87c458877cb850a96d8a093d6064bc41dc Mon Sep 17 00:00:00 2001
From: Pushkar Joshi
Date: Fri, 2 Mar 2012 12:23:44 -0800
Subject: Catmull-Rom spline sampling for the brush stroke, and options for
 stroke size, stroke hardness and both stroke colors (left and right ---
 temporarily using the stroke and fill colors respectively)

---
 js/helper-classes/RDGE/GLBrushStroke.js | 72 ++++++++++++++++++++++++++++++---
 1 file changed, 66 insertions(+), 6 deletions(-)

(limited to 'js/helper-classes')

diff --git a/js/helper-classes/RDGE/GLBrushStroke.js b/js/helper-classes/RDGE/GLBrushStroke.js
index f5b0bce1..c1469977 100755
--- a/js/helper-classes/RDGE/GLBrushStroke.js
+++ b/js/helper-classes/RDGE/GLBrushStroke.js
@@ -31,6 +31,8 @@ function GLBrushStroke() {
     //stroke information
     this._strokeWidth = 0.0;
     this._strokeColor = [0.4, 0.4, 0.4, 1.0];
+    this._secondStrokeColor = this._strokeColor;
+    this._strokeHardness = 100;
     this._strokeMaterial;
     this._strokeStyle = "Solid";
 
@@ -39,7 +41,7 @@ function GLBrushStroke() {
     this._WETNESS_FACTOR = 0.25;
 
     //prevent extremely long paths that can take a long time to render
-    this._MAX_ALLOWED_SAMPLES = 500;
+    this._MAX_ALLOWED_SAMPLES = 5000;
 
     //drawing context
     this._world = null;
@@ -106,6 +108,8 @@ function GLBrushStroke() {
     this.setStrokeMaterial = function (m) { this._strokeMaterial = m; }
     this.getStrokeColor = function () { return this._strokeColor; }
     this.setStrokeColor = function (c) { this._strokeColor = c; }
+    this.setSecondStrokeColor = function(c){this._secondStrokeColor=c;}
+    this.setStrokeHardness = function(h){this._strokeHardness=h;}
     this.getStrokeStyle = function () { return this._strokeStyle; }
     this.setStrokeStyle = function (s) { this._strokeStyle = s; }
 
@@ -133,7 +137,7 @@ function GLBrushStroke() {
             this._Points[i][2]+=tz;
         }
     }
-
+    
     this.computeMetaGeometry = function(){
         if (this._dirty){
             var numPoints = this._Points.length;
@@ -172,6 +176,44 @@ function GLBrushStroke() {
                 }
             }
 
+            //**** add samples to the long sections of the path --- Catmull-Rom spline interpolation
+            if (numPoints>1) {
+                var numInsertedPoints = 0;
+                var threshold = 5;//0.25*this._strokeWidth; //this determines whether a segment between two sample is too long
+                var prevPt = this._Points[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){
+                        //build the control polygon for the Catmull-Rom spline (prev. 2 points and next 2 points)
+                        var prev = (i===1) ? i-1 : i-2;
+                        var next = (i===numPoints-1) ? i : i+1;
+                        var ctrlPts = [this._Points[prev], this._Points[i-1], this._Points[i], this._Points[next]];
+                        //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 = this._CatmullRomSplineInterpolate(ctrlPts, param);
+                            //insert new point before point i
+                            this._Points.splice(i, 0, newpt);
+                            i++;
+                            numInsertedPoints++;
+                        }
+                        this._dirty=true;
+                    }
+                    prevPt=pt;
+                    //update numPoints to match the new length
+                    numPoints = this._Points.length;
+
+                    //end this function if the numPoints has gone above the max. size specified
+                    if (numPoints> this._MAX_ALLOWED_SAMPLES){
+                        console.log("leaving the resampling because numPoints is greater than limit:"+this._MAX_ALLOWED_SAMPLES);
+                        break;
+                    }
+                }
+                console.log("Inserted "+numInsertedPoints+" additional CatmullRom points");
+            }
             // *** compute the bounding box *********
             this._BBoxMin = [Infinity, Infinity, Infinity];
             this._BBoxMax = [-Infinity, -Infinity, -Infinity];
@@ -362,7 +404,6 @@ function GLBrushStroke() {
         }
         */
 
-        //todo test how to render the path as a bunch of moveTo and lineTos (for calligraphic brush styles)
         var numTraces = this._strokeWidth;
         var halfNumTraces = numTraces/2;
         var deltaDisplacement = [1,0];//[this._strokeWidth/numTraces, 0]; //a horizontal line brush
@@ -371,17 +412,20 @@ function GLBrushStroke() {
             var disp = [startPos[0]+t*deltaDisplacement[0], startPos[1]+t*deltaDisplacement[1]];
             //ctx.globalCompositeOperation = 'source-over';
             var distFromMiddle = Math.abs(halfNumTraces-t);
-            var alphaVal = 1.0 - (distFromMiddle/halfNumTraces);
+            var alphaVal = 1.0 - (100-this._strokeHardness)*(distFromMiddle/halfNumTraces)/100;
             ctx.save();
             ctx.lineWidth=this._strokeWidth/10;//4;
             if (ctx.lineWidth<2)
                 ctx.lineWidth=2;
+            if (t===numTraces-1){
+                ctx.lineWidth = 1; 
+            }
             ctx.lineJoin="bevel";
             ctx.lineCap="butt";
             if (t<numTraces/2)
                 ctx.strokeStyle="rgba("+parseInt(255*this._strokeColor[0])+","+parseInt(255*this._strokeColor[1])+","+parseInt(255*this._strokeColor[2])+","+alphaVal+")";
             else
-                ctx.strokeStyle="rgba("+255+","+parseInt(255*this._strokeColor[1])+","+parseInt(255*this._strokeColor[2])+","+alphaVal+")";
+                ctx.strokeStyle="rgba("+parseInt(255*this._secondStrokeColor[0])+","+parseInt(255*this._secondStrokeColor[1])+","+parseInt(255*this._secondStrokeColor[2])+","+alphaVal+")";
             ctx.translate(disp[0],disp[1]);
             ctx.beginPath();
             ctx.moveTo(this._Points[0][0]-bboxMin[0], this._Points[0][1]-bboxMin[1]);
@@ -437,4 +481,20 @@ function GLBrushStroke() {
         return true;
     }
 
-} //function GLSubpath ...class definition
\ No newline at end of file
+} //function GLBrushStroke ...class definition
+
+GLBrushStroke.prototype._CatmullRomSplineInterpolate = function(ctrlPts, t)
+{
+    //perform CatmullRom interpolation on the spline...assume t is in [0,1]
+    var t2 = t*t;
+    var t3 = t2*t;
+    var retPoint = [0,0,0];
+    for (var i=0;i<3;i++){
+        retPoint[i] = 0.5 *(
+            (2*ctrlPts[1][i]) +
+            (-ctrlPts[0][i] + ctrlPts[2][i]) * t +
+            (2*ctrlPts[0][i] - 5*ctrlPts[1][i] + 4*ctrlPts[2][i] - ctrlPts[3][i]) * t2 +
+            (-ctrlPts[0][i] + 3*ctrlPts[1][i]- 3*ctrlPts[2][i] + ctrlPts[3][i]) * t3);
+    }
+    return retPoint;
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 2346d8ab9db06573d8672c64988c46b6c672e015 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Tue, 6 Mar 2012 11:28:16 -0800
Subject: Create drag plane parallel to working plane and offset by where the
 user clicked in z.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/helper-classes/3D/snap-manager.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'js/helper-classes')

diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index 596ba56a..5eef8b5c 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -1990,12 +1990,20 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
 	},
 
 	setupDragPlanes : {
-		value: function( hitRec ) {
+		value: function( hitRec, inGlobalMode ) {
 			// get the location of the point in stage world space
 			var elt = hitRec.getElt();
 			var localPt = hitRec.getLocalPoint();
 			var planeMat = hitRec.getPlaneMatrix();
-			var stageWorldPt = viewUtils.postViewToStageWorld( MathUtils.transformPoint(localPt,planeMat),  elt );
+            var stageWorldPt;
+            if(inGlobalMode)
+            {
+                stageWorldPt = MathUtils.transformPoint(localPt,planeMat);
+            }
+            else
+            {
+                stageWorldPt = viewUtils.postViewToStageWorld( MathUtils.transformPoint(localPt,planeMat),  elt );
+            }
 
 			/*
 			 // get a working plane parallel to the current working plane through the stage world point
-- 
cgit v1.2.3


From 264e3d8e6d3624083d2fab9fe2560234553bb2ad Mon Sep 17 00:00:00 2001
From: Pushkar Joshi
Date: Tue, 6 Mar 2012 17:03:06 -0800
Subject: draw brush stroke as concentric paths overlaid on top of each
 other...allows us to simulate softness for circular brushes

---
 js/helper-classes/RDGE/GLBrushStroke.js | 135 +++++++++++++++++++++++---------
 1 file changed, 98 insertions(+), 37 deletions(-)

(limited to 'js/helper-classes')

diff --git a/js/helper-classes/RDGE/GLBrushStroke.js b/js/helper-classes/RDGE/GLBrushStroke.js
index c1469977..26c922a3 100755
--- a/js/helper-classes/RDGE/GLBrushStroke.js
+++ b/js/helper-classes/RDGE/GLBrushStroke.js
@@ -81,7 +81,7 @@ function GLBrushStroke() {
         //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 threshold = 1;//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]);
@@ -375,46 +375,58 @@ function GLBrushStroke() {
         */
 
         /*
-        var R2 = this._strokeWidth;
-        var R = R2*0.5;
-        var hardness = 0; //for a pencil, this is always 1 //TODO get hardness parameter from user interface
-        var innerRadius = (hardness*R)-1;
-        if (innerRadius<1)
-            innerRadius=1;
-
-        var r = ctx.createRadialGradient(0,0,innerRadius, 0,0,R);
-        var midColor = "rgba("+parseInt(255*this._strokeColor[0])+","+parseInt(255*this._strokeColor[1])+","+parseInt(255*this._strokeColor[2])+",1)";
-        r.addColorStop(0, midColor);
-        var endColor = "rgba("+parseInt(255*this._strokeColor[0])+","+parseInt(255*this._strokeColor[1])+","+parseInt(255*this._strokeColor[2])+",0.0)";
-        r.addColorStop(1, endColor);
-        ctx.fillStyle = r;
-
-        for (var i = 0; i < numPoints; i++) {
-            var pt = this._Points[i];
-            ctx.globalCompositeOperation = 'source-over';
-            var x = pt[0]-bboxMin[0];
-            var y = pt[1]-bboxMin[1];
-            ctx.save();
-            ctx.translate(x,y);
-            ctx.arc(0, 0, R, 0, 2 * Math.PI, false);
-            ctx.fill();
-            ctx.restore();
-            //ctx.globalCompositeOperation = 'source-in';
-            //ctx.rect(x-R, y-R, R2, R2);
-        }
-        */
-
+        //build the stamp for the brush stroke
+        //todo get this directly from the UI
+        var t=0;
         var numTraces = this._strokeWidth;
         var halfNumTraces = numTraces/2;
-        var deltaDisplacement = [1,0];//[this._strokeWidth/numTraces, 0]; //a horizontal line brush
         var startPos = [-this._strokeWidth/2,0];
-        for (var t=0;t<numTraces;t++){
-            var disp = [startPos[0]+t*deltaDisplacement[0], startPos[1]+t*deltaDisplacement[1]];
+        var brushStamp = [];
+
+        //build an angled (calligraphic) brush stamp
+        var deltaDisplacement = [1,1];//[this._strokeWidth/numTraces, 0]; //a horizontal line brush
+        for (t=0;t<numTraces;t++){
+            var brushPt = [startPos[0]+t*deltaDisplacement[0], startPos[1]+t*deltaDisplacement[1]];
+            brushStamp.push(brushPt);
+        }
+
+
+        //make a circular brush stamp
+        brushStamp=[];
+        numTraces = this._strokeWidth*Math.PI; //figure out how to
+        var radius = this._strokeWidth/2;
+        for (t=0;t<numTraces;t++)
+        {
+            var angle = Math.PI*(360*t/numTraces)/180;
+            var brushPt = [radius*Math.cos(angle), radius*Math.sin(angle)];
+            brushStamp.push(brushPt);
+        }
+        
+//        //make a square brush stamp
+//        STOPPED HERE
+//        brushStamp = [];
+//        numTraces = 4*strokeWidth;
+//        for (t=0;t<numTraces;t++){
+//            if (t<numTraces*0.25){
+//                var brushPt = [startPos[0]+t*deltaDisplacement[0], startPos[1]+t*deltaDisplacement[1]];
+//            } else if (t<numTraces*0.5){
+//
+//            } else if (t<numTraces*0.75){
+//
+//            } else {
+//
+//            }
+//            brushStamp.push(brushPt);
+//        }
+
+        for (t=0;t<numTraces;t++){
+            var disp = [brushStamp[t][0], brushStamp[t][1]];
             //ctx.globalCompositeOperation = 'source-over';
             var distFromMiddle = Math.abs(halfNumTraces-t);
             var alphaVal = 1.0 - (100-this._strokeHardness)*(distFromMiddle/halfNumTraces)/100;
+            alphaVal = 0.2;
             ctx.save();
-            ctx.lineWidth=this._strokeWidth/10;//4;
+            ctx.lineWidth=this._strokeWidth/10;//todo figure out the correct formula for the line width
             if (ctx.lineWidth<2)
                 ctx.lineWidth=2;
             if (t===numTraces-1){
@@ -422,10 +434,10 @@ function GLBrushStroke() {
             }
             ctx.lineJoin="bevel";
             ctx.lineCap="butt";
-            if (t<numTraces/2)
+            //if (t<numTraces/2)
                 ctx.strokeStyle="rgba("+parseInt(255*this._strokeColor[0])+","+parseInt(255*this._strokeColor[1])+","+parseInt(255*this._strokeColor[2])+","+alphaVal+")";
-            else
-                ctx.strokeStyle="rgba("+parseInt(255*this._secondStrokeColor[0])+","+parseInt(255*this._secondStrokeColor[1])+","+parseInt(255*this._secondStrokeColor[2])+","+alphaVal+")";
+            //else
+            //    ctx.strokeStyle="rgba("+parseInt(255*this._secondStrokeColor[0])+","+parseInt(255*this._secondStrokeColor[1])+","+parseInt(255*this._secondStrokeColor[2])+","+alphaVal+")";
             ctx.translate(disp[0],disp[1]);
             ctx.beginPath();
             ctx.moveTo(this._Points[0][0]-bboxMin[0], this._Points[0][1]-bboxMin[1]);
@@ -435,8 +447,10 @@ function GLBrushStroke() {
             ctx.stroke();
             ctx.restore();
         }
+        */
 
         /*
+        //debugging path
         ctx.beginPath();
         ctx.moveTo(this._Points[0][0]-bboxMin[0], this._Points[0][1]-bboxMin[1]);
         for (var i=1;i<numPoints;i++){
@@ -447,6 +461,53 @@ function GLBrushStroke() {
         ctx.stroke();
         */
 
+        var numlayers = this._strokeWidth/2;
+        var alphaVal = 1.0/(numlayers-1);
+        for (var l=0;l<numlayers;l++){
+            ctx.beginPath();
+            ctx.moveTo(this._Points[0][0]-bboxMin[0], this._Points[0][1]-bboxMin[1]);
+            for (var i=1;i<numPoints;i++){
+                ctx.lineTo(this._Points[i][0]-bboxMin[0], this._Points[i][1]-bboxMin[1]);
+            }
+            ctx.lineCap = "round";
+            ctx.lineJoin="round";
+            ctx.lineWidth=l+1;
+            ctx.strokeStyle="rgba("+parseInt(255*this._strokeColor[0])+","+parseInt(255*this._strokeColor[1])+","+parseInt(255*this._strokeColor[2])+","+alphaVal+")";
+            ctx.stroke();
+        }
+
+        /*
+        var R2 = this._strokeWidth;
+        var R = R2*0.5;
+        var hardness = 0; //for a pencil, this is always 1 //TODO get hardness parameter from user interface
+        var innerRadius = (hardness*R)-1;
+        if (innerRadius<1)
+            innerRadius=1;
+
+        var r = ctx.createRadialGradient(0,0,innerRadius, 0,0,R);
+        var midColor = "rgba("+parseInt(255*this._strokeColor[0])+","+parseInt(255*this._strokeColor[1])+","+parseInt(255*this._strokeColor[2])+",1)";
+        r.addColorStop(0, midColor);
+        var endColor = "rgba("+parseInt(255*this._strokeColor[0])+","+parseInt(255*this._strokeColor[1])+","+parseInt(255*this._strokeColor[2])+",0.0)";
+        r.addColorStop(1, endColor);
+        ctx.fillStyle = r;
+
+        for (var i = 0; i < numPoints; i++) {
+            var pt = this._Points[i];
+            ctx.globalCompositeOperation = 'source-over';
+            var x = pt[0]-bboxMin[0];
+            var y = pt[1]-bboxMin[1];
+            ctx.save();
+            ctx.translate(x,y);
+            ctx.arc(0, 0, R, 0, 2 * Math.PI, false);
+            ctx.fill();
+            ctx.restore();
+            break;
+            //ctx.globalCompositeOperation = 'source-in';
+            //ctx.rect(x-R, y-R, R2, R2);
+        }
+        */
+
+
         ctx.restore();
     } //render()
 
-- 
cgit v1.2.3


From 44669fc4401eeb8a211b7485d2c20015fc6c477e Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Tue, 13 Mar 2012 15:22:57 -0700
Subject: Fixed drawing of multiple selection bounds when in flat case.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/helper-classes/3D/draw-utils.js | 136 +++++++++++--------------------------
 1 file changed, 39 insertions(+), 97 deletions(-)

(limited to 'js/helper-classes')

diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index 59da411f..1c00f7ea 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -721,8 +721,17 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 	drawSelectionBounds : {
 		value: function( eltArray ) {
 			this._selectionCtr = null;
+            var len = eltArray.length,
+                i,
+                j,
+                bounds,
+                bounds3D,
+                pt,
+                tmpPt,
+                ssMat,
+                elt;
 			
-			if (eltArray.length == 0)  return;
+			if (len === 0)  return;
 			var context = this._drawingContext;
 			if (!context)  return;
 
@@ -731,18 +740,19 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 			context.lineWidth = 2;
 
 			// handle the single element case
-			if (eltArray.length == 1)
+            // TODO - Currently, the stage draws its own selection bounds for single selection case
+			if (len === 1)
 			{
 				// single selection case
 				//console.log( "single selection" );
 
-				var elt = eltArray[0];
+				elt = eltArray[0];
 
 				this.viewUtils.pushViewportObj( elt );
 
 				// get the element bounds in world space
-				var bounds3D = this.viewUtils.getElementViewBounds3D( elt );
-				for (var j=0;  j<4;  j++) {
+				bounds3D = this.viewUtils.getElementViewBounds3D( elt );
+				for (j=0;  j<4;  j++) {
 					bounds3D[j] = this.viewUtils.localToGlobal( bounds3D[j],  elt );
 				}
 
@@ -766,19 +776,12 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 			}
 			else
 			{
-				// the multiple selection case.
-				//console.log( "multiple selection" );
-
-				// we set the root to "the world".
-				var saveRoot = this.viewUtils.getRootElement();
-				this.viewUtils.setRootElement( this.viewUtils.getStageElement() );
-
 				// get the plane from the first element to compare against the other elements
 				var flat = true;
 				var plane = this.viewUtils.getElementPlane( eltArray[0] );
-				for (var i=1;  i<eltArray.length;  i++)
+				for (i=1;  i<len;  i++)
 				{
-					var elt = eltArray[i];
+					elt = eltArray[i];
 					var plane2 = this.viewUtils.getElementPlane( elt );
 					var dot = MathUtils.dot3(plane,plane2);
 					if (MathUtils.fpCmp(dot, 1) != 0)
@@ -796,34 +799,23 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 					}
 				}
 
-				// construct a matrix from world space to 'plane' space
-				var ptOnPlane = this.viewUtils.localToGlobal( [0,0,0], eltArray[0]);
-				var planeToWorld = this.getPlaneToWorldMatrix( plane, ptOnPlane );
-				//var worldToPlane = planeToWorld.inverse();
-				var worldToPlane = glmat4.inverse(planeToWorld, []);
-
-                var ssMat = this.viewUtils.getLocalToGlobalMatrix( this._sourceSpaceElt );
 				// if all the elements share the same plane, draw the 2D rectangle
 				if (flat)
 				{
 					// make a 2D rectangle on the plane
 					var rect;
-					for (var i=0;  i<eltArray.length;  i++)
+					for (i=0;  i<len;  i++)
 					{
-						var elt = eltArray[i];
+						elt = eltArray[i];
 
 						// get the element bounds in 'plane' space
-						var bounds = this.viewUtils.getElementViewBounds3D( elt );
-						for (var j=0;  j<4;  j++)
+						bounds = this.viewUtils.getElementViewBounds3D( elt );
+                        ssMat = this.viewUtils.getLocalToGlobalMatrix( elt );
+						for (j=0;  j<4;  j++)
 						{
-//							var gPt = MathUtils.makeDimension4( this.viewUtils.localToGlobal( bounds[j],  elt ) );
-//							//var pt = worldToPlane.multiply( gPt );
-//							var pt    = glmat4.multiplyVec3( worldToPlane, gPt, [] );
-//							var tmpPt = glmat4.multiplyVec3( planeToWorld,  pt, [] );
-
                             var localPt = bounds[j];
-                            var tmpPt = this.viewUtils.localToGlobal2(localPt, ssMat);
-                            var pt = glmat4.multiplyVec3( worldToPlane, tmpPt, [] );
+                            tmpPt = this.viewUtils.localToGlobal2(localPt, ssMat);
+                            pt = tmpPt;
 
 							if (!rect)
 							{
@@ -837,30 +829,18 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 						}
 					}
 
-					// restore the rootct
-					this.viewUtils.setRootElement (saveRoot );
-
-					// draw the reectangle
+					// draw the rectangle
 					context.beginPath();
 
-					var pt4 = MathUtils.makeDimension4(rect.getPoint(3));
-					var viewPt = glmat4.multiplyVec3( planeToWorld, pt4, [] );
-					MathUtils.makeDimension3( viewPt );
-//					var pt = this.viewUtils.localToGlobal( viewPt, this._sourceSpaceElt );
-					var pt = this.viewUtils.localToGlobal2(viewPt, ssMat);
+                    pt = MathUtils.makeDimension3(rect.getPoint(3));
 
-					var bounds3D = [[0,0], [0,0], [0,0], [0,0]];
+					bounds3D = [[0,0], [0,0], [0,0], [0,0]];
 					this._selectionCtr = pt.slice(0);
 
 					context.moveTo( pt[0],  pt[1] );
-					for (var i=0;  i<4;  i++)
+					for (i=0;  i<4;  i++)
 					{
-						pt4 = MathUtils.makeDimension4(rect.getPoint(i));
-						//viewPt = planeToWorld.multiply( pt4 );
-						viewPt = glmat4.multiplyVec3( planeToWorld, pt4, [] );
-						MathUtils.makeDimension3( viewPt );
-//						pt = this.viewUtils.localToGlobal( viewPt, this._sourceSpaceElt );
-						pt = this.viewUtils.localToGlobal2( viewPt, ssMat );
+                        pt = rect.getPoint(i);
 						context.lineTo( pt[0],  pt[1] );
 						bounds3D[i] = pt.slice(0);
 					}
@@ -870,8 +850,6 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 					var dir = vecUtils.vecSubtract(2, bounds3D[1], bounds3D[3]);
 					var ctr = vecUtils.vecNormalize(2, dir, vecUtils.vecDist(2, bounds3D[1], bounds3D[3])/2);
 
-//					this._selectionCtr[0] += ctr[0] - window.stageManager.userContentLeft;
-//					this._selectionCtr[1] += ctr[1] - window.stageManager.userContentTop;
 					this._selectionCtr[0] += ctr[0] - this.application.ninja.stage.userContentLeft;
 					this._selectionCtr[1] += ctr[1] - this.application.ninja.stage.userContentTop;
 				}
@@ -879,16 +857,19 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 				{
 					var minPt,  maxPt;
 
-					for (var i=0;  i<eltArray.length;  i++)
+                    // we set the root to "the world".
+                    var saveRoot = this.viewUtils.getRootElement();
+                    this.viewUtils.setRootElement( this.viewUtils.getStageElement() );
+                    ssMat = this.viewUtils.getLocalToGlobalMatrix( this._sourceSpaceElt );
+
+					for (i=0;  i<len;  i++)
 					{
-						var elt = eltArray[i];
-						var bounds = this.viewUtils.getElementViewBounds3D( elt );
+						elt = eltArray[i];
+						bounds = this.viewUtils.getElementViewBounds3D( elt );
                         var eltMat = this.viewUtils.getLocalToGlobalMatrix( elt );
-						for (var j=0;  j<4;  j++)
+						for (j=0;  j<4;  j++)
 						{
-							//var pt = worldToPlane.multiply( MathUtils.makeDimension4( this.viewUtils.localToGlobal( bounds[j],  elt )) );
-//							var pt = this.viewUtils.localToGlobal( bounds[j],  elt );
-							var pt = this.viewUtils.localToGlobal2( bounds[j],  eltMat );
+							pt = this.viewUtils.localToGlobal2( bounds[j],  eltMat );
 							if (!minPt)
 							{
 								minPt = pt.slice(0);
@@ -925,15 +906,6 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 
 					// get the 8 corners of the parallelpiped in world space
 					var wc = new Array();   // wc == world cube
-//					wc.push(  this.viewUtils.localToGlobal( [x0,y0,z1], this._sourceSpaceElt ) );
-//					wc.push(  this.viewUtils.localToGlobal( [x0,y1,z1], this._sourceSpaceElt ) );
-//					wc.push(  this.viewUtils.localToGlobal( [x1,y1,z1], this._sourceSpaceElt ) );
-//					wc.push(  this.viewUtils.localToGlobal( [x1,y0,z1], this._sourceSpaceElt ) );
-//					wc.push(  this.viewUtils.localToGlobal( [x0,y0,z0], this._sourceSpaceElt ) );
-//					wc.push(  this.viewUtils.localToGlobal( [x0,y1,z0], this._sourceSpaceElt ) );
-//					wc.push(  this.viewUtils.localToGlobal( [x1,y1,z0], this._sourceSpaceElt ) );
-//					wc.push(  this.viewUtils.localToGlobal( [x1,y0,z0], this._sourceSpaceElt ) );
-
                     wc.push(  this.viewUtils.localToGlobal2( [x0,y0,z1], ssMat ) );
 					wc.push(  this.viewUtils.localToGlobal2( [x0,y1,z1], ssMat ) );
 					wc.push(  this.viewUtils.localToGlobal2( [x1,y1,z1], ssMat ) );
@@ -944,17 +916,11 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 					wc.push(  this.viewUtils.localToGlobal2( [x1,y0,z0], ssMat ) );
 
 					// determine the signs of the normals of the faces relative to the view direction.
-					//var front   = -MathUtils.fpSign(  MathUtils.cross(wc[2].subtract(wc[1]), wc[0].subtract(wc[1]))[2] ),
 					var front	= -MathUtils.fpSign( vecUtils.vecCross(3, vecUtils.vecSubtract(3,wc[2],wc[1]), vecUtils.vecSubtract(3,wc[0],wc[1]))[2] ),
-						//right   = -MathUtils.fpSign(  MathUtils.cross(wc[6].subtract(wc[2]), wc[3].subtract(wc[2]))[2] ),
 						right   = -MathUtils.fpSign( vecUtils.vecCross(3, vecUtils.vecSubtract(3,wc[6],wc[2]), vecUtils.vecSubtract(3,wc[3],wc[2]))[2] ),
-						//back    = -MathUtils.fpSign(  MathUtils.cross(wc[5].subtract(wc[6]), wc[7].subtract(wc[6]))[2] ),
 						back    = -MathUtils.fpSign( vecUtils.vecCross(3, vecUtils.vecSubtract(3,wc[5],wc[6]), vecUtils.vecSubtract(3,wc[7],wc[6]))[2] ),
-						//left    = -MathUtils.fpSign( MathUtils.cross(wc[1].subtract(wc[5]), wc[4].subtract(wc[5]))[2] ),
 						left    = -MathUtils.fpSign( vecUtils.vecCross(3, vecUtils.vecSubtract(3,wc[1],wc[5]), vecUtils.vecSubtract(3,wc[4],wc[5]))[2] ),
-						//top     = -MathUtils.fpSign( MathUtils.cross(wc[3].subtract(wc[0]), wc[4].subtract(wc[0]))[2] ),
 						top     = -MathUtils.fpSign( vecUtils.vecCross(3, vecUtils.vecSubtract(3,wc[3],wc[0]), vecUtils.vecSubtract(3,wc[4],wc[0]))[2] ),
-						//bottom  = -MathUtils.fpSign( MathUtils.cross(wc[5].subtract(wc[1]), wc[2].subtract(wc[1]))[2] );
 						bottom  = -MathUtils.fpSign( vecUtils.vecCross(3, vecUtils.vecSubtract(3,wc[5],wc[1]), vecUtils.vecSubtract(3,wc[2],wc[1]))[2] );
 
 					// draw the side faces
@@ -963,8 +929,6 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 					//context.strokeStyle = ((front > 0) || (right > 0)) ? dark : light;  context.beginPath();
 					if ((front > 0) || (right > 0)) {
 						context.beginPath();
-//						p = this.viewUtils.localToGlobal( [x1, y0, z1], this._sourceSpaceElt );  context.moveTo( p[0], p[1] );
-//						p = this.viewUtils.localToGlobal( [x1, y1, z1], this._sourceSpaceElt );  context.lineTo( p[0], p[1] );
 						p = this.viewUtils.localToGlobal2( [x1, y0, z1], ssMat );  context.moveTo( p[0], p[1] );
 						p = this.viewUtils.localToGlobal2( [x1, y1, z1], ssMat );  context.lineTo( p[0], p[1] );
 						context.closePath();  context.stroke();
@@ -973,8 +937,6 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 					//context.strokeStyle = ((right > 0) || (back > 0)) ? dark : light;  context.beginPath();
 					if ((right > 0) || (back > 0)) {
 						context.beginPath();
-//						p = this.viewUtils.localToGlobal( [x1, y0, z0], this._sourceSpaceElt );  context.moveTo( p[0], p[1] );
-//						p = this.viewUtils.localToGlobal( [x1, y1, z0], this._sourceSpaceElt );  context.lineTo( p[0], p[1] );
                         p = this.viewUtils.localToGlobal2( [x1, y0, z0], ssMat );  context.moveTo( p[0], p[1] );
 						p = this.viewUtils.localToGlobal2( [x1, y1, z0], ssMat );  context.lineTo( p[0], p[1] );
 						context.closePath();  context.stroke();
@@ -983,8 +945,6 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 					//context.strokeStyle = ((back > 0) || (left > 0)) ? dark : light;  context.beginPath();
 					if ((back > 0) || (left > 0)) {
 						context.beginPath();
-//						p = this.viewUtils.localToGlobal( [x0, y0, z0], this._sourceSpaceElt );  context.moveTo( p[0], p[1] );
-//						p = this.viewUtils.localToGlobal( [x0, y1, z0], this._sourceSpaceElt );  context.lineTo( p[0], p[1] );
 						p = this.viewUtils.localToGlobal2( [x0, y0, z0], ssMat );  context.moveTo( p[0], p[1] );
 						p = this.viewUtils.localToGlobal2( [x0, y1, z0], ssMat );  context.lineTo( p[0], p[1] );
 						context.closePath();  context.stroke();
@@ -993,8 +953,6 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 					//context.strokeStyle = ((left > 0) || (front > 0)) ? dark : light;  context.beginPath();
 					if ((left > 0) || (front > 0)) {
 						context.beginPath();
-//						p = this.viewUtils.localToGlobal( [x0, y0, z1], this._sourceSpaceElt );  context.moveTo( p[0], p[1] );
-//						p = this.viewUtils.localToGlobal( [x0, y1, z1], this._sourceSpaceElt );  context.lineTo( p[0], p[1] );
 						p = this.viewUtils.localToGlobal2( [x0, y0, z1], ssMat );  context.moveTo( p[0], p[1] );
 						p = this.viewUtils.localToGlobal2( [x0, y1, z1], ssMat );  context.lineTo( p[0], p[1] );
 						context.closePath();  context.stroke();
@@ -1004,8 +962,6 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 					//context.strokeStyle = ((front > 0) || (top > 0)) ? dark : light;  context.beginPath();
 					if ((front > 0) || (top > 0)) {
 						context.beginPath();
-//						p = this.viewUtils.localToGlobal( [x0, y0, z1], this._sourceSpaceElt );  context.moveTo( p[0], p[1] );
-//						p = this.viewUtils.localToGlobal( [x1, y0, z1], this._sourceSpaceElt );  context.lineTo( p[0], p[1] );
 						p = this.viewUtils.localToGlobal2( [x0, y0, z1], ssMat );  context.moveTo( p[0], p[1] );
 						p = this.viewUtils.localToGlobal2( [x1, y0, z1], ssMat );  context.lineTo( p[0], p[1] );
 						context.closePath();  context.stroke();
@@ -1014,8 +970,6 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 					//context.strokeStyle = ((top > 0) || (back > 0)) ? dark : light;  context.beginPath();
 					if ((top > 0) || (back > 0)) {
 						context.beginPath();
-//						p = this.viewUtils.localToGlobal( [x0, y0, z0], this._sourceSpaceElt );  context.moveTo( p[0], p[1] );
-//						p = this.viewUtils.localToGlobal( [x1, y0, z0], this._sourceSpaceElt );  context.lineTo( p[0], p[1] );
 						p = this.viewUtils.localToGlobal2( [x0, y0, z0], ssMat );  context.moveTo( p[0], p[1] );
 						p = this.viewUtils.localToGlobal2( [x1, y0, z0], ssMat );  context.lineTo( p[0], p[1] );
 						context.closePath();  context.stroke();
@@ -1024,8 +978,6 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 					//context.strokeStyle = ((back > 0) || (bottom > 0)) ? dark : light;  context.beginPath();
 					if ((back > 0) || (bottom > 0)) {
 						context.beginPath();
-//						p = this.viewUtils.localToGlobal( [x0, y1, z0], this._sourceSpaceElt );  context.moveTo( p[0], p[1] );
-//						p = this.viewUtils.localToGlobal( [x1, y1, z0], this._sourceSpaceElt );  context.lineTo( p[0], p[1] );
 						p = this.viewUtils.localToGlobal2( [x0, y1, z0], ssMat );  context.moveTo( p[0], p[1] );
 						p = this.viewUtils.localToGlobal2( [x1, y1, z0], ssMat );  context.lineTo( p[0], p[1] );
 						context.closePath();  context.stroke();
@@ -1034,8 +986,6 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 					//context.strokeStyle = ((bottom > 0) || (front > 0)) ? dark : light;  context.beginPath();
 					if ((bottom > 0) || (front > 0)) {
 						context.beginPath();
-//						p = this.viewUtils.localToGlobal( [x0, y1, z1], this._sourceSpaceElt );  context.moveTo( p[0], p[1] );
-//						p = this.viewUtils.localToGlobal( [x1, y1, z1], this._sourceSpaceElt );  context.lineTo( p[0], p[1] );
 						p = this.viewUtils.localToGlobal2( [x0, y1, z1], ssMat );  context.moveTo( p[0], p[1] );
 						p = this.viewUtils.localToGlobal2( [x1, y1, z1], ssMat );  context.lineTo( p[0], p[1] );
 						context.closePath();  context.stroke();
@@ -1044,8 +994,6 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 					// and the remaining lines - varying Z
 					if ((top > 0) || (right > 0)) {
 						context.beginPath();
-//						p = this.viewUtils.localToGlobal( [x1, y0, z0], this._sourceSpaceElt );  context.moveTo( p[0], p[1] );
-//						p = this.viewUtils.localToGlobal( [x1, y0, z1], this._sourceSpaceElt );  context.lineTo( p[0], p[1] );
 						p = this.viewUtils.localToGlobal2( [x1, y0, z0], ssMat );  context.moveTo( p[0], p[1] );
 						p = this.viewUtils.localToGlobal2( [x1, y0, z1], ssMat );  context.lineTo( p[0], p[1] );
 						context.closePath();  context.stroke();
@@ -1054,8 +1002,6 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 					//context.strokeStyle = ((right > 0) || (bottom > 0)) ? dark : light;  context.beginPath();
 					if ((right > 0) || (bottom > 0)) {
 						context.beginPath();
-//						p = this.viewUtils.localToGlobal( [x1, y1, z0], this._sourceSpaceElt );  context.moveTo( p[0], p[1] );
-//						p = this.viewUtils.localToGlobal( [x1, y1, z1], this._sourceSpaceElt );  context.lineTo( p[0], p[1] );
 						p = this.viewUtils.localToGlobal2( [x1, y1, z0], ssMat );  context.moveTo( p[0], p[1] );
 						p = this.viewUtils.localToGlobal2( [x1, y1, z1], ssMat );  context.lineTo( p[0], p[1] );
 						context.closePath();  context.stroke();
@@ -1064,8 +1010,6 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 					//context.strokeStyle = ((bottom > 0) || (left > 0)) ? dark : light;  context.beginPath();
 					if ((bottom > 0) || (left > 0)) {
 						context.beginPath();
-//						p = this.viewUtils.localToGlobal( [x0, y1, z0], this._sourceSpaceElt );  context.moveTo( p[0], p[1] );
-//						p = this.viewUtils.localToGlobal( [x0, y1, z1], this._sourceSpaceElt );  context.lineTo( p[0], p[1] );
 						p = this.viewUtils.localToGlobal2( [x0, y1, z0], ssMat );  context.moveTo( p[0], p[1] );
 						p = this.viewUtils.localToGlobal2( [x0, y1, z1], ssMat );  context.lineTo( p[0], p[1] );
 						context.closePath();  context.stroke();
@@ -1074,8 +1018,6 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 					//context.strokeStyle = ((left > 0) || (top > 0)) ? dark : light;  context.beginPath();
 					if ((left > 0) || (top > 0)) {
 						context.beginPath();
-//						p = this.viewUtils.localToGlobal( [x0, y0, z0], this._sourceSpaceElt );  context.moveTo( p[0], p[1] );
-//						p = this.viewUtils.localToGlobal( [x0, y0, z1], this._sourceSpaceElt );  context.lineTo( p[0], p[1] );
 						p = this.viewUtils.localToGlobal2( [x0, y0, z0], ssMat );  context.moveTo( p[0], p[1] );
 						p = this.viewUtils.localToGlobal2( [x0, y0, z1], ssMat );  context.lineTo( p[0], p[1] );
 						context.closePath();  context.stroke();
-- 
cgit v1.2.3


From 381e6b89a054d545519874fd5e828ef534287336 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Thu, 15 Mar 2012 01:09:01 -0700
Subject: Removing the backup-delete folder and the RDGE tools directory.

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 .../RDGE/src/tools/compile-rdge-core.bat           |    4 -
 .../RDGE/src/tools/compile-rdge-core.sh            |    3 -
 js/helper-classes/RDGE/src/tools/compiler.jar      |  Bin 4927265 -> 0 bytes
 js/helper-classes/RDGE/src/tools/rdge-compiled.js  |  452 -------
 js/helper-classes/backup-delete/GLAnchorPoint.js   |  168 ---
 js/helper-classes/backup-delete/GLBrushStroke.js   |  561 ---------
 js/helper-classes/backup-delete/GLCircle.js        |  711 -----------
 js/helper-classes/backup-delete/GLGeomObj.js       |  324 -----
 js/helper-classes/backup-delete/GLLight.js         |   30 -
 js/helper-classes/backup-delete/GLLine.js          |  507 --------
 js/helper-classes/backup-delete/GLMaterial.js      |  308 -----
 js/helper-classes/backup-delete/GLPath.js          |  232 ----
 js/helper-classes/backup-delete/GLRectangle.js     | 1238 -------------------
 js/helper-classes/backup-delete/GLSubpath.js       | 1286 --------------------
 js/helper-classes/backup-delete/GLWorld.js         | 1029 ----------------
 .../backup-delete/Materials/BumpMetalMaterial.js   |  307 -----
 .../backup-delete/Materials/DeformMaterial.js      |  133 --
 .../backup-delete/Materials/FlatMaterial.js        |  165 ---
 .../backup-delete/Materials/FlyMaterial.js         |  133 --
 .../backup-delete/Materials/JuliaMaterial.js       |  150 ---
 .../Materials/KeleidoscopeMaterial.js              |  149 ---
 .../Materials/LinearGradientMaterial.js            |  379 ------
 .../backup-delete/Materials/MandelMaterial.js      |  151 ---
 .../backup-delete/Materials/PlasmaMaterial.js      |  134 --
 .../backup-delete/Materials/PulseMaterial.js       |  266 ----
 .../backup-delete/Materials/RadialBlurMaterial.js  |  257 ----
 .../Materials/RadialGradientMaterial.js            |  305 -----
 .../Materials/ReliefTunnelMaterial.js              |  133 --
 .../Materials/SquareTunnelMaterial.js              |  133 --
 .../backup-delete/Materials/StarMaterial.js        |  133 --
 .../backup-delete/Materials/TaperMaterial.js       |  223 ----
 .../backup-delete/Materials/TunnelMaterial.js      |  133 --
 .../backup-delete/Materials/TwistMaterial.js       |  149 ---
 .../backup-delete/Materials/TwistVertMaterial.js   |  248 ----
 .../backup-delete/Materials/UberMaterial.js        |  744 -----------
 .../backup-delete/Materials/WaterMaterial.js       |  133 --
 .../backup-delete/Materials/ZInvertMaterial.js     |  133 --
 .../backup-delete/MaterialsLibrary.js              |  230 ----
 js/helper-classes/backup-delete/ParseUtils.js      |   84 --
 js/helper-classes/backup-delete/glUtils.js         |  319 -----
 40 files changed, 12177 deletions(-)
 delete mode 100644 js/helper-classes/RDGE/src/tools/compile-rdge-core.bat
 delete mode 100644 js/helper-classes/RDGE/src/tools/compile-rdge-core.sh
 delete mode 100644 js/helper-classes/RDGE/src/tools/compiler.jar
 delete mode 100644 js/helper-classes/RDGE/src/tools/rdge-compiled.js
 delete mode 100755 js/helper-classes/backup-delete/GLAnchorPoint.js
 delete mode 100755 js/helper-classes/backup-delete/GLBrushStroke.js
 delete mode 100755 js/helper-classes/backup-delete/GLCircle.js
 delete mode 100755 js/helper-classes/backup-delete/GLGeomObj.js
 delete mode 100755 js/helper-classes/backup-delete/GLLight.js
 delete mode 100755 js/helper-classes/backup-delete/GLLine.js
 delete mode 100755 js/helper-classes/backup-delete/GLMaterial.js
 delete mode 100755 js/helper-classes/backup-delete/GLPath.js
 delete mode 100755 js/helper-classes/backup-delete/GLRectangle.js
 delete mode 100755 js/helper-classes/backup-delete/GLSubpath.js
 delete mode 100755 js/helper-classes/backup-delete/GLWorld.js
 delete mode 100755 js/helper-classes/backup-delete/Materials/BumpMetalMaterial.js
 delete mode 100644 js/helper-classes/backup-delete/Materials/DeformMaterial.js
 delete mode 100755 js/helper-classes/backup-delete/Materials/FlatMaterial.js
 delete mode 100644 js/helper-classes/backup-delete/Materials/FlyMaterial.js
 delete mode 100644 js/helper-classes/backup-delete/Materials/JuliaMaterial.js
 delete mode 100644 js/helper-classes/backup-delete/Materials/KeleidoscopeMaterial.js
 delete mode 100755 js/helper-classes/backup-delete/Materials/LinearGradientMaterial.js
 delete mode 100644 js/helper-classes/backup-delete/Materials/MandelMaterial.js
 delete mode 100644 js/helper-classes/backup-delete/Materials/PlasmaMaterial.js
 delete mode 100644 js/helper-classes/backup-delete/Materials/PulseMaterial.js
 delete mode 100644 js/helper-classes/backup-delete/Materials/RadialBlurMaterial.js
 delete mode 100755 js/helper-classes/backup-delete/Materials/RadialGradientMaterial.js
 delete mode 100644 js/helper-classes/backup-delete/Materials/ReliefTunnelMaterial.js
 delete mode 100644 js/helper-classes/backup-delete/Materials/SquareTunnelMaterial.js
 delete mode 100644 js/helper-classes/backup-delete/Materials/StarMaterial.js
 delete mode 100644 js/helper-classes/backup-delete/Materials/TaperMaterial.js
 delete mode 100644 js/helper-classes/backup-delete/Materials/TunnelMaterial.js
 delete mode 100644 js/helper-classes/backup-delete/Materials/TwistMaterial.js
 delete mode 100644 js/helper-classes/backup-delete/Materials/TwistVertMaterial.js
 delete mode 100755 js/helper-classes/backup-delete/Materials/UberMaterial.js
 delete mode 100644 js/helper-classes/backup-delete/Materials/WaterMaterial.js
 delete mode 100644 js/helper-classes/backup-delete/Materials/ZInvertMaterial.js
 delete mode 100755 js/helper-classes/backup-delete/MaterialsLibrary.js
 delete mode 100755 js/helper-classes/backup-delete/ParseUtils.js
 delete mode 100755 js/helper-classes/backup-delete/glUtils.js

(limited to 'js/helper-classes')

diff --git a/js/helper-classes/RDGE/src/tools/compile-rdge-core.bat b/js/helper-classes/RDGE/src/tools/compile-rdge-core.bat
deleted file mode 100644
index b2933fa9..00000000
--- a/js/helper-classes/RDGE/src/tools/compile-rdge-core.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-java -jar ./compiler.jar --compilation_level SIMPLE_OPTIMIZATIONS --manage_closure_dependencies --js ../core/script/math/vec2.js --js ../core/script/math/vec3.js --js ../core/script/math/vec4.js --js ../core/script/math/mat4.js --js ../core/script/math/quat.js --js ../core/script/util/statTracker.js --js ../core/script/util/fpsTracker.js --js ../core/script/objectManager.js --js ../core/script/precompiled.js --js ../core/script/renderer.js --js ../core/script/renderUtils.js --js ../core/script/jshader.js --js ../core/script/jpass.js --js ../core/script/RenderProcs.js --js ../core/script/RenderInitProcs.js --js ../core/script/MeshManager.js --js ../core/script/TextureManager.js --js ../core/script/ShaderManager.js --js ../core/script/fx/blur.js --js ../core/script/fx/ssao.js --js ../core/script/ScreenQuad.js --js ../core/script/box.js --js ../core/script/camera.js --js ../core/script/shadowLight.js --js ../core/script/utilities.js --js ../core/script/input.js --js ../core/script/engine.js --js ../core/script/scenegraphNodes.js --js ../core/script/scenegraph.js --js ../core/script/lightmanager.js --js ../core/script/rendercontext.js --js ../core/script/animation.js --js ../core/script/particle.js --js ../core/script/run_state.js --js ../core/script/init_state.js --js ../core/script/runtime.js --js ../core/script/util/dbgpanel.js --js_output_file rdge-compiled.js
-cd ../core/script
-type precompiled.js >> ../../tools/rdge-compiled.js
-pause
diff --git a/js/helper-classes/RDGE/src/tools/compile-rdge-core.sh b/js/helper-classes/RDGE/src/tools/compile-rdge-core.sh
deleted file mode 100644
index 1a2c4676..00000000
--- a/js/helper-classes/RDGE/src/tools/compile-rdge-core.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-java -jar ./compiler.jar --compilation_level SIMPLE_OPTIMIZATIONS --manage_closure_dependencies --js ../core/script/math/vec2.js --js ../core/script/math/vec3.js --js ../core/script/math/vec4.js --js ../core/script/math/mat4.js --js ../core/script/math/quat.js --js ../core/script/util/statTracker.js --js ../core/script/util/fpsTracker.js --js ../core/script/objectManager.js --js ../core/script/precompiled.js --js ../core/script/renderer.js --js ../core/script/renderUtils.js --js ../core/script/jshader.js --js ../core/script/jpass.js --js ../core/script/RenderProcs.js --js ../core/script/RenderInitProcs.js --js ../core/script/MeshManager.js --js ../core/script/TextureManager.js --js ../core/script/ShaderManager.js --js ../core/script/fx/blur.js --js ../core/script/fx/ssao.js --js ../core/script/ScreenQuad.js --js ../core/script/box.js --js ../core/script/camera.js --js ../core/script/shadowLight.js --js ../core/script/utilities.js --js ../core/script/input.js --js ../core/script/engine.js --js ../core/script/scenegraphNodes.js --js ../core/script/scenegraph.js --js ../core/script/lightmanager.js --js ../core/script/rendercontext.js --js ../core/script/animation.js --js ../core/script/particle.js --js ../core/script/run_state.js --js ../core/script/init_state.js --js ../core/script/runtime.js --js ../core/script/util/dbgpanel.js --js ../core/script/ubershader.js --js_output_file rdge-compiled.js
-
-cat ../core/script/precompiled.js >> ./rdge-compiled.js
diff --git a/js/helper-classes/RDGE/src/tools/compiler.jar b/js/helper-classes/RDGE/src/tools/compiler.jar
deleted file mode 100644
index f361e9cd..00000000
Binary files a/js/helper-classes/RDGE/src/tools/compiler.jar and /dev/null differ
diff --git a/js/helper-classes/RDGE/src/tools/rdge-compiled.js b/js/helper-classes/RDGE/src/tools/rdge-compiled.js
deleted file mode 100644
index d1040d73..00000000
--- a/js/helper-classes/RDGE/src/tools/rdge-compiled.js
+++ /dev/null
@@ -1,452 +0,0 @@
-vec2={string:function(a){return"{ "+a[0]+", "+a[1]+" }"},verify:function(a){return a==void 0||a.length==void 0||a.length<2?!1:typeof a[0]!="number"||typeof a[1]!="number"?!1:!0},copy:function(a){return a.length==void 0?[a,a]:[a[0],a[1]]},inplace_copy:function(a,b){a[0]=b[0];a[1]=b[1]},zero:function(){return[0,0]},up:function(){return[0,1]},right:function(){return[1,0]},add:function(a,b){return[a[0]+b[0],a[1]+b[1]]},sub:function(a,b){return[a[0]-b[0],a[1]-b[1]]},mul:function(a,b){return[a[0]*b[0],
-a[1]*b[1]]},addMul:function(a,b,f){return f.length!=void 0&&f.length>=2?[a[0]+b[0]*f[0],a[1]+b[1]*f[1]]:[a[0]+b[0]*f,a[1]+b[1]*f]},scale:function(a,b){return b.length!=void 0&&b.length>=2?[a[0]*b[0],a[1]*b[1]]:[a[0]*b,a[1]*b]},negate:function(a){return[-a[0],-a[1]]},normalize:function(a){var b=Math.sqrt(a[0]*a[0],a[1]*a[1]);return Math.abs(1-b)>1.0E-4?(b=1/b,[a[0]*b,a[1]*b]):a},dot:function(a,b){return a[0]*b[0]+a[1]*b[1]},perp:function(a){return[a[1],-a[0]]},lengthSq:function(a){return a[0]*a[0]+
-a[1]*a[1]},length:function(a){return Math.sqrt(a[0]*a[0]+a[1]*a[1])},min:function(a,b){return[Math.min(a[0],b[0]),Math.min(a[1],b[1])]},max:function(a,b){return[Math.max(a[0],b[0]),Math.max(a[1],b[1])]}};vec2.clamp=function(a,b,f){return vec2.min(f,vec2.max(a,b))};vec3={string:function(a){return"{ "+a[0]+", "+a[1]+", "+a[2]+" }"},verify:function(a){return a==void 0||a.length==void 0||a.length<3?!1:typeof a[0]!="number"||typeof a[1]!="number"||typeof a[2]!="number"?!1:!0},inplace_copy:function(a,b){a[0]=b[0];a[1]=b[1];a[2]=b[2]},copy:function(a){return a.length==void 0?[a,a,a]:[a[0],a[1],a[2]]},translation:function(a){return[a[12],a[13],a[14]]},basisX:function(a){return[a[0],a[1],a[2]]},basisY:function(a){return[a[4],a[5],a[6]]},basisZ:function(a){return[a[8],
-a[9],a[10]]},zero:function(){return[0,0,0]},up:function(){return[0,1,0]},forward:function(){return[0,0,1]},right:function(){return[1,0,0]},random:function(a,b){return[a[0]+(b[0]-a[0])*Math.random(),a[1]+(b[1]-a[1])*Math.random(),a[2]+(b[2]-a[2])*Math.random()]},xy:function(a){return[a[0],a[1]]},xz:function(a){return[a[0],a[2]]},add:function(a,b){return[a[0]+b[0],a[1]+b[1],a[2]+b[2]]},plusEqual:function(a,b){a[0]+=b[0];a[1]+=b[1];a[2]+=b[2]},sub:function(a,b){return[a[0]-b[0],a[1]-b[1],a[2]-b[2]]},
-mul:function(a,b){return[a[0]*b[0],a[1]*b[1],a[2]*b[2]]},addMul:function(a,b,f){return f.length!=void 0&&f.length>=3?[a[0]+b[0]*f[0],a[1]+b[1]*f[1],a[2]+b[2]*f[2]]:[a[0]+b[0]*f,a[1]+b[1]*f,a[2]+b[2]*f]},plusEqualMul:function(a,b,f){f.length!==void 0&&f.length>=3?(a[0]+=b[0]*f[0],a[1]+=b[1]*f[1],a[2]+=b[2]*f[2]):(a[0]+=b[0]*f,a[1]+=b[1]*f,a[2]+=b[2]*f)},scale:function(a,b){return b.length!==void 0&&b.length>=3?[a[0]*b[0],a[1]*b[1],a[2]*b[2]]:[a[0]*b,a[1]*b,a[2]*b]},inplace_scale:function(a,b){b.length!==
-void 0&&b.length>=3?(a[0]*=b[0],a[1]*=b[1],a[2]*=b[2]):(a[0]*=b,a[1]*=b,a[2]*=b)},negate:function(a){return[-a[0],-a[1],-a[2]]},inplace_negate:function(a){a[0]=-a[0];a[1]=-a[1];a[2]=-a[2]},normalize:function(a){var b=Math.sqrt(a[0]*a[0]+a[1]*a[1]+a[2]*a[2]);return Math.abs(1-b)>1.0E-4?(b=1/b,[a[0]*b,a[1]*b,a[2]*b]):a},cross:function(a,b){return[a[1]*b[2]-b[1]*a[2],a[2]*b[0]-b[2]*a[0],a[0]*b[1]-b[0]*a[1]]},dot:function(a,b){return a[0]*b[0]+a[1]*b[1]+a[2]*b[2]},lengthSq:function(a){return a[0]*a[0]+
-a[1]*a[1]+a[2]*a[2]},length:function(a){return Math.sqrt(a[0]*a[0]+a[1]*a[1]+a[2]*a[2])},distanceSq:function(a,b){var f=[a[0]-b[0],a[1]-b[1],a[2]-b[2]];return f[0]*f[0]+f[1]*f[1]+f[2]*f[2]},distance:function(a,b){var f=[a[0]-b[0],a[1]-b[1],a[2]-b[2]];return Math.sqrt(f[0]*f[0]+f[1]*f[1]+f[2]*f[2])}};vec3.angle=function(a,b){return Math.acos(vec3.dot(a,b))/(vec3.length(a)*vec3.length(b))};vec3.direction=function(a,b){return vec3.normalize(vec3.sub(b,a))};
-vec3.abs=function(a){return[Math.abs(a[0]),Math.abs(a[1]),Math.abs(a[2])]};vec3.min=function(a,b){return[Math.min(a[0],b[0]),Math.min(a[1],b[1]),Math.min(a[2],b[2])]};vec3.max=function(a,b){return[Math.max(a[0],b[0]),Math.max(a[1],b[1]),Math.max(a[2],b[2])]};vec3.clamp=function(a,b,f){return vec3.min(f,vec3.max(a,b))};vec3.equal=function(a,b,f){f||(f=0.0010);return vec3.distanceSq(a,b)<f*f};vec3.lerp=function(a,b,f){return[a[0]+(b[0]-a[0])*f,a[1]+(b[1]-a[1])*f,a[2]+(b[2]-a[2])*f]};vec4={string:function(a){return"{ "+