30 files changed, 239 insertions, 344 deletions

diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index 63e7799a..59da411f 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -139,8 +139,8 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
     handleCloseDocument:{
         value: function() {
             if(this.application.ninja.documentController._documents.length === 0){
-                this._eltArray = [];
-                this._planesArray = [];
+                this._eltArray = null;
+                this._planesArray = null;
             }
         }
     },
diff --git a/js/helper-classes/3D/math-utils.js b/js/helper-classes/3D/math-utils.js
index 562a6e73..2f0283a9 100755
--- a/js/helper-classes/3D/math-utils.js
+++ b/js/helper-classes/3D/math-utils.js
@@ -729,7 +729,10 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
             // the area of the polygon is the length of the normal
             var area = VecUtils.vecMag(3, normal );
             if (this.fpSign(area) != 0)
-                vec3.scale(normal, 1.0/area);
+                        {
+                //vec3.scale(normal, 1.0/area);
+                                normal = VecUtils.vecNormalize(3, normal, 1.0);
+                        }
 
             return normal;
         }
diff --git a/js/helper-classes/RDGE/runtime/CanvasDataManager.js b/js/helper-classes/RDGE/runtime/CanvasDataManager.js
deleted file mode 100644
index 4985fc9a..00000000
--- a/js/helper-classes/RDGE/runtime/CanvasDataManager.js
+++ /dev/null
@@ -1,98 +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> */
-
-
-
-///////////////////////////////////////////////////////////////////////
-// Class ShapeRuntime
-//      Manages runtime shape display
-///////////////////////////////////////////////////////////////////////
-function CanvasDataManager()
-{
-        this.loadGLData = function(root,  valueArray)
-        {
-                var value = valueArray;
-                var nWorlds = value.length;
-                for (var i=0;  i<nWorlds;  i++)
-                {
-                        var importStr = value[i];
-                        var startIndex = importStr.indexOf( "id: " );
-                        if (startIndex >= 0)
-                        {
-                                var endIndex = importStr.indexOf( "\n", startIndex );
-                                if (endIndex > 0)
-                                {
-                                        var id = importStr.substring( startIndex+4, endIndex );
-                                        var canvas = this.findCanvasWithID( id, root );
-                                        if (canvas)
-                                        {
-                                                var loadForAuthoring = true;
-                                                var index = importStr.indexOf( "scenedata: " );
-                                                if (index >= 0)  loadForAuthoring = false;
-
-                                                if (loadForAuthoring)
-                                                {
-                                                        if (!canvas.elementModel)
-                                                        {
-                                                                NJUtils.makeElementModel(canvas, "Canvas", "shape", true);
-                                                        }
-                                                                
-                                                        if (canvas.elementModel)
-                                                        {
-                                                                if (canvas.elementModel.shapeModel.GLWorld)
-                                                                        canvas.elementModel.shapeModel.GLWorld.clearTree();
-
-                                                                var world = new GLWorld( canvas );
-                                                                canvas.elementModel.shapeModel.GLWorld = world;
-                                                                world.import( importStr );
-                                                        }
-                                                }
-                                                else
-                                                {
-                                                        var rt = new GLRuntime( canvas, importStr );
-                                                }
-                                        }
-                                }
-                        }
-                }
-        }
-
-        this.collectGLData = function( elt,  dataArray )
-        {
-                if (elt.elementModel && elt.elementModel.shapeModel && elt.elementModel.shapeModel.GLWorld)
-                {
-                        var data = elt.elementModel.shapeModel.GLWorld.export();
-                        dataArray.push( data );
-                }
-
-                if (elt.children)
-                {
-                        var nKids = elt.children.length;
-                        for (var i=0;  i<nKids;  i++)
-                        {
-                                var child = elt.children[i];
-                                this.collectGLData( child, dataArray );
-                        }
-                }
-        }
-
-        this.findCanvasWithID = function( id,  elt )
-        {
-                var cid = elt.getAttribute( "data-RDGE-id" );
-                if (cid == id)  return elt;
-
-                if (elt.children)
-                {
-                        var nKids = elt.children.length;
-                        for (var i=0;  i<nKids;  i++)
-                        {
-                                var child = elt.children[i];
-                                this.findCanvasWithID( id, child );
-                        }
-                }
-        }
-}
-
diff --git a/js/helper-classes/RDGE/runtime/GLRuntime.js b/js/helper-classes/RDGE/runtime/GLRuntime.js
deleted file mode 100644
index 5c99be02..00000000
--- a/js/helper-classes/RDGE/runtime/GLRuntime.js
+++ /dev/null
@@ -1,159 +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> */
-
-
-
-///////////////////////////////////////////////////////////////////////
-// Class GLRuntime
-//      Manages runtime fora WebGL canvas
-///////////////////////////////////////////////////////////////////////
-function GLRuntime( canvas, importStr )
-{
-    ///////////////////////////////////////////////////////////////////////
-    // Instance variables
-    ///////////////////////////////////////////////////////////////////////
-        this._canvas            = canvas;
-        this._importStr         = importStr;
-
-        this.renderer           = null;
-        this.myScene            = null;
-        this.light                      = null;
-        this.light2                     = null;
-        this._rootNode          = null;
-
-        this._firstRender       = true;
-