Squashed commit of the following:

commit 1cd89d4d06e3a8f2c221628b19cf26a2c69f5d3f
Author: Jose Antonio Marquez <kgq387@motorola.com>
Date:   Tue Mar 6 11:24:25 2012 -0800

    Fixing WebGL not available bug

commit 84332ab81c1b445195f1d9be8bbeae0725c8e758
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Tue Mar 6 10:58:25 2012 -0800

    Squashed commit of preload-fix into Master

    - Requiring all the previously pre-loaded files
    - RDGE, Codemirror and gl-matrix are not included via a script tag.

    Signed-off-by: Valerio Virgillito <valerio@motorola.com>

commit 13f52cf0c74f53a919fa864f86669e8155f82961
Merge: dced508 abc04f3
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Fri Mar 2 15:46:11 2012 -0800

    Merge pull request #93 from imix23ways/Timeline

    Timeline: Critical bug fixes

commit dced508bb19a7bcd467ff1b86b5df5bbec4be794
Merge: 0aeb400 cc772ef
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Fri Mar 2 15:45:35 2012 -0800

    Merge pull request #92 from mqg734/WebGLFixes

    Selection Tool Fixes for elements flying off into space when they overlap

commit 0aeb400070762cf01d83cf9f9ee25a5595098b7f
Merge: ff0a956 aabb48a
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Fri Mar 2 14:05:21 2012 -0800

    Merge pull request #94 from ericguzman/PresetsPanel

    Presets Panel - Fix single-click activation, and transition cut-off bug.

commit cc772ef3333ed419d269a2bda7aea5b0150a7bd9
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date:   Fri Mar 2 11:34:58 2012 -0800

    Fixing flying off into space bug for translate tool too.

    Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

commit abc04f3d50311ed1c21067344bc7e448686f8c5c
Author: Jonathan Duran <jduran@motorola.com>
Date:   Fri Mar 2 11:26:25 2012 -0800

    Timeline Fix timing function

    Signed-off-by: Jonathan Duran <jduran@motorola.com>

commit aabb48a1c8d34bc968f4c6b0ffee4e31c1d5d286
Author: Eric Guzman <ericg@motorola.com>
Date:   Fri Mar 2 11:22:44 2012 -0800

    Presets Panel - Fix single-click activation, and transition cut-off bug.

    Use double-click as the activation event for transition presets. Also fixed the bug when applying a style preset before the transition preset, which disabled transitions after the first one.

commit f3207f39ea9d8c1c34246217a23d3a689671903d
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date:   Fri Mar 2 11:21:29 2012 -0800

    Don't draw transform handles if the stage is the target element.

    Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

commit 5425be91e7125c22955b4459a62412ff574e49a8
Author: Jonathan Duran <jduran@motorola.com>
Date:   Fri Mar 2 11:11:48 2012 -0800

    Timeline: Fix for animation iteration count

    Add default webkit css properties to allow animations with integer iteration counts.

    Signed-off-by: Jonathan Duran <jduran@motorola.com>

commit 1760bac1da9218315ad1bacdcf3a157495a049e8
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date:   Fri Mar 2 10:48:41 2012 -0800

    Fix for jumping issue when moving items that have any 3d on them.

    We can't translate 3d moves into 2d space due to perspective, so we must update the matrix3d values instead of the top-left values if items have 3d.

    Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

commit 2c04935f0ccb1cb7c98371fc10b43155f2d956c4
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date:   Thu Mar 1 22:20:06 2012 -0800

    Fix for elements flying off into space when moving elements that overlap.

    This was happening because our hit record's element and the browser's element from point did not match.

    Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

commit 50058746779f714ed9b0287f49e56c9f0d35593e
Merge: 500426d ff0a956
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date:   Thu Mar 1 21:49:44 2012 -0800

    Merge branch 'refs/heads/ninja-internal' into WebGLFixes

commit 500426dea0ca95a6b45be8ea8d132cfdb4d2c940
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date:   Thu Mar 1 10:11:39 2012 -0800

    Fixed logic error when resizing with the top-left transform handles.

    Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

commit 7980d9bde2b43aa5a494ddf6f1db5c4959a57b91
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date:   Thu Mar 1 10:04:15 2012 -0800

    Re-fixing IKNinja-940 - Can't select objects when in side/top view.

    Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

commit f04cc0146d8f7573628678613a99c270116768e4
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date:   Wed Feb 29 16:45:40 2012 -0800

    Last-used material (instead of FlatMaterial) is applied to shape when turning on use WebGL checkbox in the PI.

    Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

Signed-off-by: Jonathan Duran <jduran@motorola.com>

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]);