Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uber

10 files changed, 304 insertions, 108 deletions

diff --git a/js/tools/BrushTool.js b/js/tools/BrushTool.js
index fec89eb2..752aa2a3 100644
--- a/js/tools/BrushTool.js
+++ b/js/tools/BrushTool.js
@@ -13,6 +13,8 @@ var ElementMediator = require("js/mediators/element-mediator").ElementMediator;
 var TagTool = require("js/tools/TagTool").TagTool;
 var snapManager = require("js/helper-classes/3D/snap-manager").SnapManager;
 
+var BrushStroke = require("js/lib/geom/brush-stroke").BrushStroke;
+
 exports.BrushTool = Montage.create(ShapeTool, {
     hasReel: { value: false },
         _toolID: { value: "brushTool" },
@@ -63,7 +65,7 @@ exports.BrushTool = Montage.create(ShapeTool, {
                 }
                 //start a new brush stroke
                 if (this._selectedBrushStroke === null){
-                    this._selectedBrushStroke = new GLBrushStroke();
+                    this._selectedBrushStroke = new BrushStroke();
                     if (this.application.ninja.colorController.colorToolbar.stroke.webGlColor){
                         this._selectedBrushStroke.setStrokeColor(this.application.ninja.colorController.colorToolbar.stroke.webGlColor);
                     }
@@ -192,7 +194,7 @@ exports.BrushTool = Montage.create(ShapeTool, {
                     var bboxMax = this._selectedBrushStroke.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])]);
+                    var bboxMid = [0.5 * (bboxMax[0] + bboxMin[0]), 0.5 * (bboxMax[1] + bboxMin[1]), 0.5 * (bboxMax[2] + bboxMin[2])];
 
                     this._selectedBrushStroke.setCanvasX(bboxMid[0]);
                     this._selectedBrushStroke.setCanvasY(bboxMid[1]);
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index 0a7c0534..a61f8f79 100755
--- a/js/tools/LineTool.js
+++ b/js/tools/LineTool.js
@@ -13,6 +13,9 @@ var Montage = 	require("montage/core/core").Montage,
     ShapesController =  require("js/controllers/elements/shapes-controller").ShapesController,
     ShapeModel = require("js/models/shape-model").ShapeModel;
 
+var Line = require("js/lib/geom/line").Line;
+var MaterialsModel = require("js/models/materials-model").MaterialsModel;
+
 exports.LineTool = Montage.create(ShapeTool, {
         _toolID: { value: "lineTool" },
         _imageID: { value: "lineToolImg" },
@@ -206,10 +209,13 @@ exports.LineTool = Montage.create(ShapeTool, {
             // for default stroke and fill/no materials
             var strokeMaterial = null;
 
-            var strokeM = this.options.strokeMaterial;
-            if(strokeM)
+            if(this.options.use3D)
             {
-                strokeMaterial = Object.create(MaterialsLibrary.getMaterial(strokeM));
+                var strokeM = this.options.strokeMaterial;
+                if(strokeM)
+                {
+                    strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM));
+                }
             }
 
             var world = this.getGLWorld(canvas, this.options.use3D);
@@ -217,7 +223,7 @@ exports.LineTool = Montage.create(ShapeTool, {
             var xOffset = ((left - canvas.offsetLeft + w/2) - canvas.width/2);
             var yOffset = (canvas.height/2 - (top - canvas.offsetTop + h/2));
 
-            var line = new GLLine(world, xOffset, yOffset, w, h, slope, strokeSize, strokeColor, strokeMaterial, strokeStyle, xAdj, yAdj);
+            var line = new Line(world, xOffset, yOffset, w, h, slope, strokeSize, strokeColor, strokeMaterial, strokeStyle, xAdj, yAdj);
 
             world.addObject(line);
             world.render();
diff --git a/js/tools/OvalTool.js b/js/tools/OvalTool.js
index 14655312..a10e0bb5 100755
--- a/js/tools/OvalTool.js
+++ b/js/tools/OvalTool.js
@@ -8,6 +8,9 @@ var Montage = 	require("montage/core/core").Montage,
     ShapeTool = require("js/tools/ShapeTool").ShapeTool,
     ShapesController =  require("js/controllers/elements/shapes-controller").ShapesController;
 
+var Circle = require("js/lib/geom/circle").Circle;
+var MaterialsModel = require("js/models/materials-model").MaterialsModel;
+
 exports.OvalTool = Montage.create(ShapeTool, {
 
         _toolID: { value: "ovalTool" },
@@ -43,25 +46,27 @@ exports.OvalTool = Montage.create(ShapeTool, {
             var strokeMaterial = null;
             var fillMaterial = null;
 
-            var strokeM = this.options.strokeMaterial;
-            if(strokeM)
+            if(this.options.use3D)
             {
-                strokeMaterial = Object.create(MaterialsLibrary.getMaterial(strokeM));
-            }
+                var strokeM = this.options.strokeMaterial;
+                if(strokeM)
+                {
+                    strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM));
+                }
 
-            var fillM = this.options.fillMaterial;
-            if(fillM)
-            {
-                fillMaterial = Object.create(MaterialsLibrary.getMaterial(fillM));
+                var fillM = this.options.fillMaterial;
+                if(fillM)
+                {
+                    fillMaterial = Object.create(MaterialsModel.getMaterial(fillM));
+                }
             }
 
-
             var world = this.getGLWorld(canvas, this.options.use3D);
 
             var xOffset = ((left - canvas.offsetLeft + w/2) - canvas.width/2);
             var yOffset = (canvas.height/2 - (top - canvas.offsetTop + h/2));
 
-            var oval = new GLCircle();
+            var oval = new Circle(); //GLCircle();
             oval.init(world, xOffset, yOffset, w, h, strokeSize, strokeColor, fillColor, innerRadius, strokeMaterial, fillMaterial, strokeStyle);
 
             world.addObject(oval);
diff --git a/js/tools/PenTool.js b/js/tools/PenTool.js
index ddc8bc04..71a91870 100755
--- a/js/tools/PenTool.js
+++ b/js/tools/PenTool.js
@@ -15,6 +15,9 @@ var TagTool = require("js/tools/TagTool").TagTool;
 var ElementController = require("js/controllers/elements/element-controller").ElementController;
 var snapManager = require("js/helper-classes/3D/snap-manager").SnapManager;
 
+var AnchorPoint = require("js/lib/geom/anchor-point").AnchorPoint;
+var SubPath = require("js/lib/geom/sub-path").SubPath;
+
 //todo remove this global var
 var g_DoPenToolMouseMove = true;
 
@@ -146,7 +149,7 @@ exports.PenTool = Montage.create(ShapeTool, {
             if (mouseDownPos) {
                 //if we had closed the selected subpath previously, or if we have not yet started anything, create a subpath
                 if (this._selectedSubpath === null) {
-                    this._selectedSubpath = new GLSubpath();
+                    this._selectedSubpath = new SubPath();
                     this._isNewPath = true;
                     if (this._entryEditMode === this.ENTRY_SELECT_PATH){
                         //this should not happen, as ENTRY_SELECT_PATH implies there was a selected subpath
@@ -212,13 +215,13 @@ exports.PenTool = Montage.create(ShapeTool, {
                             this._penCanvas = null;
                             this._penPlaneMat = null;
                             this._snapTarget = null;
-                            this._selectedSubpath = new GLSubpath();
+                            this._selectedSubpath = new SubPath();
                             this._isNewPath = true;
                         }
 
                         //add an anchor point to end of the subpath, and make it the selected anchor point
                         if (!this._selectedSubpath.getIsClosed() || this._makeMultipleSubpaths) {
-                            this._selectedSubpath.addAnchor(new GLAnchorPoint());
+                            this._selectedSubpath.addAnchor(new AnchorPoint());
                             var newAnchor = this._selectedSubpath.getAnchor(this._selectedSubpath.getSelectedAnchorIndex());
                             newAnchor.setPos(mouseDownPos[0], mouseDownPos[1], mouseDownPos[2]);
                             newAnchor.setPrevPos(mouseDownPos[0], mouseDownPos[1], mouseDownPos[2]);
@@ -231,7 +234,7 @@ exports.PenTool = Montage.create(ShapeTool, {
                         if (this._isPickedEndPointInSelectPathMode){
                             //TODO clean up this code...very similar to the code block above
                             if (!this._selectedSubpath.getIsClosed()) {
-                                this._selectedSubpath.addAnchor(new GLAnchorPoint());
+                                this._selectedSubpath.addAnchor(new AnchorPoint());
                                 var newAnchor = this._selectedSubpath.getAnchor(this._selectedSubpath.getSelectedAnchorIndex());
                                 newAnchor.setPos(mouseDownPos[0], mouseDownPos[1], mouseDownPos[2]);
                                 newAnchor.setPrevPos(mouseDownPos[0], mouseDownPos[1], mouseDownPos[2]);
@@ -389,7 +392,7 @@ exports.PenTool = Montage.create(ShapeTool, {
                 var bboxMax = this._selectedSubpath.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])]);
+                var bboxMid = [0.5 * (bboxMax[0] + bboxMin[0]), 0.5 * (bboxMax[1] + bboxMin[1]), 0.5 * (bboxMax[2] + bboxMin[2])];
 
                 this._selectedSubpath.setCanvasX(bboxMid[0]);
                 this._selectedSubpath.setCanvasY(bboxMid[1]);
@@ -638,7 +641,7 @@ exports.PenTool = Montage.create(ShapeTool, {
             var baseline = VecUtils.vecNormalize(3, baselineOrig);
             var delta = VecUtils.vecSubtract(3, p2, p3);