Merge branch 'refs/heads/WebGLFileIO' into ToolFixes

Conflicts:
	assets/canvas-runtime.js
	js/controllers/elements/shapes-controller.js
	js/lib/drawing/world.js
	js/lib/geom/geom-obj.js
	js/lib/geom/line.js
	js/mediators/element-mediator.js
	js/panels/presets/animations-presets.reel/animations-presets.js
	js/panels/presets/style-presets.reel/style-presets.js
	js/panels/presets/transitions-presets.reel/transitions-presets.js

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

4 files changed, 245 insertions, 187 deletions

diff --git a/js/lib/geom/circle.js b/js/lib/geom/circle.js
index 7fa78b12..1073c2db 100755
--- a/js/lib/geom/circle.js
+++ b/js/lib/geom/circle.js
@@ -42,8 +42,8 @@ var Circle = function GLCircle() {
         
                         this._strokeWidth = strokeSize;
                         this._innerRadius = innerRadius;
-                        if (strokeColor)  this._strokeColor = strokeColor;
-                        if (fillColor)  this._fillColor = fillColor;
+                        this._strokeColor = strokeColor;
+                        this._fillColor = fillColor;
 
                         this._strokeStyle = strokeStyle;
                 }
@@ -631,6 +631,21 @@ var Circle = function GLCircle() {
                 this._strokeStyle               = jObj.strokeStyle;
                 var strokeMaterialName  = jObj.strokeMat;
                 var fillMaterialName    = jObj.fillMat;
+
+        var strokeMat = MaterialsModel.getMaterial( strokeMaterialName );
+        if (!strokeMat) {
+            console.log( "object material not found in library: " + strokeMaterialName );
+            strokeMat = MaterialsModel.getMaterial(  MaterialsModel.getDefaultMaterialName() );
+        }
+        this._strokeMaterial = strokeMat;
+
+        var fillMat = MaterialsModel.getMaterial( fillMaterialName );
+        if (!fillMat) {
+            console.log( "object material not found in library: " + fillMaterialName );
+            fillMat = MaterialsModel.getMaterial(  MaterialsModel.getDefaultMaterialName() );
+        }
+        this._fillMaterial = fillMat;
+
                 this.importMaterialsJSON( jObj.materials );
         };
 
diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index bb5b4a9a..56cf7c98 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -14,19 +14,19 @@ var GeomObj = function GLGeomObj() {
     ///////////////////////////////////////////////////////////////////////
     // Constants
     ///////////////////////////////////////////////////////////////////////
-    this.GEOM_TYPE_RECTANGLE = 1;
-    this.GEOM_TYPE_CIRCLE = 2;
-    this.GEOM_TYPE_LINE = 3;
-    this.GEOM_TYPE_PATH = 4;
-    this.GEOM_TYPE_CUBIC_BEZIER = 5;
-    this.GEOM_TYPE_BRUSH_STROKE = 6;
-    this.GEOM_TYPE_UNDEFINED = -1;
+        this.GEOM_TYPE_RECTANGLE                =  1;
+        this.GEOM_TYPE_CIRCLE                   =  2;
+        this.GEOM_TYPE_LINE             =  3;
+        this.GEOM_TYPE_PATH                         =  4;
+        this.GEOM_TYPE_CUBIC_BEZIER     =  5;
+    this.GEOM_TYPE_BRUSH_STROKE     =  6;
+        this.GEOM_TYPE_UNDEFINED                = -1;
 
     // Needed for calculating dashed/dotted strokes
     this.DASH_LENGTH = 0.15;
     this.DOT_LENGTH = 0.05;
     this.GAP_LENGTH = 0.05;
-
+        
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
@@ -40,74 +40,74 @@ var GeomObj = function GLGeomObj() {
     this.m_world = null;
 
     // stroke and fill colors
-    this._strokeColor = [0, 0, 0, 0];
-    this._fillColor = [0, 0, 0, 0];
+    this._strokeColor   = [0,0,0,0];
+    this._fillColor             = [0,0,0,0];
 
-    // stroke and fill materials
-    this._fillMaterial = null;
-    this._strokeMaterial = null;
+        // stroke and fill materials
+        this._fillMaterial = null;
+        this._strokeMaterial = null;
 
-    // array of primitives - used in RDGE
-    this._primArray = [];
-    this._materialNodeArray = [];
-    this._materialArray = [];
-    this._materialTypeArray = [];
+        // array of primitives - used in RDGE
+        this._primArray = [];
+        this._materialNodeArray = [];
+        this._materialArray = [];
+        this._materialTypeArray = [];
 
-    // the transform node used by RDGE
-    this._trNode = null;
+        // the transform node used by RDGE
+        this._trNode = null;
 
     ///////////////////////////////////////////////////////////////////////
     // Property accessors
     ///////////////////////////////////////////////////////////////////////
-    this.setWorld = function (world) {
+    this.setWorld = function( world ) {
         this.m_world = world;
     };
 
-    this.getWorld = function () {
+    this.getWorld = function() {
         return this.m_world;
     };
 
-    this.getMatrix = function () {
+        this.getMatrix = function() {
         return this._matrix.slice(0);
     };
 
-    this.setMatrix = function (m) {
+        this.setMatrix = function(m) {
         this._matrix = m.slice(0);
     };
 
-    this.setNext = function (next) {
+    this.setNext = function( next ) {
         this._next = next;
     };
 
-    this.getNext = function () {
+    this.getNext = function() {
         return this._next;
     };
 
-    this.setPrev = function (prev) {
+    this.setPrev = function( prev ) {
         this._prev = prev;
     };
 
-    this.getPrev = function () {
+    this.getPrev = function() {
         return this._prev;
     };
 
-    this.setChild = function (child) {
+    this.setChild = function( child ) {
         this._child = child;
     };
 
-    this.getChild = function () {
+    this.getChild = function() {
         return this._child;
     };
 
-    this.setParent = function (parent) {
+    this.setParent = function( parent ) {
         this._parent = parent;
     };
 
-    this.getParent = function () {
+    this.getParent = function() {
         return this._parent;
     };
 
-    this.geomType = function () {
+        this.geomType = function() {
         return this.GEOM_TYPE_UNDEFINED;
     };
 
@@ -115,7 +115,7 @@ var GeomObj = function GLGeomObj() {
         return this._primArray;
     };
 
-    this.getMaterialNodeArray = function () {
+        this.getMaterialNodeArray = function() {
         return this._materialNodeArray;
     };
 
@@ -123,110 +123,130 @@ var GeomObj = function GLGeomObj() {
         return this._materialArray;
     };
 
-    this.getTransformNode = function () {
+        this.getTransformNode = function() {
         return this._trNode;
     };
 
-    this.setTransformNode = function (t) {
+        this.setTransformNode = function(t) {
         this._trNode = t;
     };
 
-    this.setFillColor = function (c) {
+    this.setFillColor = function(c) {
         this.setMaterialColor(c, "fill");
     };
 
-    this.setStrokeColor = function (c) {
+    this.setStrokeColor = function(c) {
         this.setMaterialColor(c, "stroke");
     };
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
-    this.setMaterialColor = function (c, type) {
+        this.setMaterialColor = function(c, type) {
         var i = 0,
             nMats = 0;