Merge branch 'refs/heads/master' into AddAnimationsLibrary

Conflicts:
	js/panels/presets/default-transition-presets.js

1 files changed, 0 insertions, 1185 deletions

diff --git a/js/helper-classes/backup-delete/GLSubpath.js b/js/helper-classes/backup-delete/GLSubpath.js
deleted file mode 100755
index f3d8ad36..00000000
--- a/js/helper-classes/backup-delete/GLSubpath.js
+++ /dev/null
@@ -1,1185 +0,0 @@
-/* <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;
-
-
-function SubpathOffsetPoint(pos, mapPos) {
-    this.Pos = Vector.create([pos[0],pos[1],pos[2]]);
-    this.CurveMapPos = Vector.create([mapPos[0], mapPos[1], mapPos[2]]);
-}
-
-function SubpathOffsetTriangle(v0, v1, v2) {
-    this.v0 = v0;
-    this.v1 = v1;
-    this.v2 = v2;
-    this.n = Vector.create([0,0,1]); //replace with the actual cross product later
-}
-
-function sortNumberAscending(a,b){
-    return a-b;
-}
-function sortNumberDescending(a,b){
-    return b-a;
-}
-function SegmentIntersections(){
-    this.paramArray = [];
-}
-
-///////////////////////////////////////////////////////////////////////
-// Class GLSubpath
-//      representation a sequence of cubic bezier curves.
-//      Derived from class GLGeomObj
-///////////////////////////////////////////////////////////////////////
-
-function GLSubpath() {
-    ///////////////////////////////////////////////////
-    // Instance variables
-    ///////////////////////////////////////////////////
-    this._Anchors = [];
-    this._BBoxMin = [0, 0, 0];
-    this._BBoxMax = [0, 0, 0];
-    this._isClosed = false;
-
-    this._samples = [];                 //polyline representation of this curve
-    this._sampleParam = [];            //parametric distance of samples, within [0, N], where N is # of Bezier curves (=# of anchor points if closed, =#anchor pts -1 if open)
-    this._anchorSampleIndex = [];       //index within _samples corresponding to anchor points
-    
-    this._UnprojectedAnchors = [];
-
-    //initially set the _dirty bit so we will construct samples
-    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;
-    this._strokeStyle = "Solid";
-    this._materialAmbient = [0.2, 0.2, 0.2, 1.0];
-    this._materialDiffuse = [0.4, 0.4, 0.4, 1.0];
-    this._materialSpecular = [0.4, 0.4, 0.4, 1.0];
-    this._fillColor = [0.4, 0.4, 0.4, 1.0];
-    this._fillMaterial;
-    this._DISPLAY_ANCHOR_RADIUS = 5;
-    //drawing context
-    this._world = null;
-
-    //tool that owns this subpath
-    this._drawingTool = null;
-    this._planeMat = null;
-    this._planeMatInv = null;
-    this._planeCenter = null;
-
-    this.inheritedFrom = GLGeomObj;
-    this.inheritedFrom();
-
-    //used to query what the user selected, OR-able for future extensions
-    this.SEL_NONE = 0;          //nothing was selected
-    this.SEL_ANCHOR = 1;        //anchor point was selected
-    this.SEL_PREV = 2;          //previous handle of anchor point was selected
-    this.SEL_NEXT = 4;          //next handle of anchor point was selected
-    this.SEL_PATH = 8;          //the path itself was selected
-    this._selectMode = this.SEL_NONE;
-    this._selectedAnchorIndex = -1;
-
-    this._SAMPLING_EPSILON = 0.5; //epsilon used for sampling the curve
-    this._DEFAULT_STROKE_WIDTH = 20; //use only if stroke width not specified
-    this._MAX_OFFSET_ANGLE = 10; //max angle (in degrees) between consecutive vectors from curve to offset path
-
-    // (current GLGeomObj complains if buildBuffers/render is added to GLSubpath prototype)
-    //buildBuffers
-    //  Build the stroke vertices, normals, textures and colors
-    //  Add that array data to the GPU using OpenGL data binding
-    this.buildBuffers = function () {
-        return; //no need to do anything for now
-    }//buildBuffers()
-
-    //render
-    //  specify how to render the subpath in Canvas2D
-    this.render = function () {
-        // get the world
-        var world = this.getWorld();
-        if (!world)  throw( "null world in subpath render" );
-
-         // get the context
-        var ctx = world.get2DContext();
-        if (!ctx)  throw ("null context in subpath render")
-
-        var numAnchors = this.getNumAnchors();
-        if (numAnchors === 0)
-            return; //nothing to do for empty paths
-
-        ctx.save();
-
-        this.createSamples(); //dirty bit checked in this function...will generate a polyline representation
-        var bboxMin = this.getBBoxMin();
-        var bboxMax = this.getBBoxMax();
-        var bboxWidth = bboxMax[0] - bboxMin[0];
-        var bboxHeight = bboxMax[1] - bboxMin[1];
-        var bboxMid = Vector.create([0.5 * (bboxMax[0] + bboxMin[0]), 0.5 * (bboxMax[1] + bboxMin[1]), 0.5 * (bboxMax[2] + bboxMin[2])]);
-
-        ctx.clearRect(0, 0, bboxWidth, bboxHeight);
-
-
-        ctx.lineWidth = this._strokeWidth;
-        ctx.strokeStyle = "black";
-        if (this._strokeColor)
-            ctx.strokeStyle = MathUtils.colorToHex( this._strokeColor );
-        ctx.fillStyle = "white";
-        if (this._fillColor){
-            //ctx.fillStyle = MathUtils.colorToHex( this._fillColor );
-            var fillColorStr = "rgba("+parseInt(255*this._fillColor[0])+","+parseInt(255*this._fillColor[1])+","+parseInt(255*this._fillColor[2])+","+this._fillColor[3]+")";
-            ctx.fillStyle = fillColorStr;
-        }
-        var lineCap = ['butt','round','square'];
-        ctx.lineCap = lineCap[1];
-        ctx.beginPath();
-
-        /*
-        commenting this out for now because of Chrome bug where coincident endpoints of bezier curve cause the curve to not be rendered
-        var prevAnchor = this.getAnchor(0);
-        ctx.moveTo(prevAnchor.getPosX()-bboxMin[0],prevAnchor.getPosY()-bboxMin[1]);
-        for (var i = 1; i < numAnchors; i++) {
-            var currAnchor = this.getAnchor(i);
-            ctx.bezierCurveTo(prevAnchor.getNextX()-bboxMin[0],prevAnchor.getNextY()-bboxMin[1], currAnchor.getPrevX()-bboxMin[0], currAnchor.getPrevY()-bboxMin[1], currAnchor.getPosX()-bboxMin[0], currAnchor.getPosY()-bboxMin[1]);
-            prevAnchor = currAnchor;
-        }
-        if (this._isClosed === true) {
-            var currAnchor = this.getAnchor(0);
-            ctx.bezierCurveTo(prevAnchor.getNextX()-bboxMin[0],prevAnchor.getNextY()-bboxMin[1], currAnchor.getPrevX()-bboxMin[0], currAnchor.getPrevY()-bboxMin[1], currAnchor.getPosX()-bboxMin[0], currAnchor.getPosY()-bboxMin[1]);
-            prevAnchor = currAnchor;
-            ctx.fill();
-        }
-        */
-
-
-        var numPoints = this._samples.length/3;
-        ctx.moveTo(this._samples[0]-bboxMin[0],this._samples[1]-bboxMin[1]);
-        for (var i=0;i<numPoints;i++){
-            ctx.lineTo(this._samples[3*i]-bboxMin[0],this._samples[3*i + 1]-bboxMin[1]);
-        }
-        if (this._isClosed === true) {
-            ctx.lineTo(this._samples[0]-bboxMin[0],this._samples[1]-bboxMin[1]);
-        }
-        ctx.fill();
-        ctx.stroke();
-        ctx.restore();
-    } //render()
-
-    this.geomType = function () { return this.GEOM_TYPE_CUBIC_BEZIER; }
-
-
-    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 anchor point positions such that the width of the bbox is the newW
-        var origX = this._BBoxMin[0];
-        var numAnchors = this._Anchors.length;
-        for (var i=0;i<numAnchors;i++){
-            //compute the distance from the bboxMin
-            var oldW = this._Anchors[i].getPosX() - origX;
-            var prevW = this._Anchors[i].getPrevX() - origX;
-            var nextW = this._Anchors[i].getNextX() - origX;
-
-            this._Anchors[i].setPos(origX + oldW*scaleX,this._Anchors[i].getPosY(),this._Anchors[i].getPosZ());
-            this._Anchors[i].setPrevPos(origX + prevW*scaleX,this._Anchors[i].getPrevY(),this._Anchors[i].getPrevZ());
-            this._Anchors[i].setNextPos(origX + nextW*scaleX,this._Anchors[i].getNextY(),this._Anchors[i].getNextZ());
-        }
-        this.makeDirty();
-    }
-    this.setHeight = function (newH) {
-        if (newH<1)
-            newH=1; //clamp minimum width to 1