Merge branch 'refs/heads/Ninja-Internal' into FileIO

78 files changed, 10813 insertions, 14030 deletions

diff --git a/js/document/html-document.js b/js/document/html-document.js
index 42a7d537..e96c9943 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -212,7 +212,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                                 {
                                         /*
                                         // Use this code to test the runtime version of WebGL
-                                        var cdm = new CanvasDataManager();
+                                        var cdm = new NinjaCvsRt.CanvasDataManager();
                                         cdm.loadGLData(elt,  value,  null );
                                         */
 
@@ -276,13 +276,6 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                                                                         var world = new GLWorld( canvas, useWebGL );
                                                                         world.importJSON( jObj );
                                                                 }
-                                                                else
-                                                                {
-                                                                        var index = importStr.indexOf( "webGL: " );
-                                                                        var useWebGL = (index >= 0);
-                                                                        var world = new GLWorld( canvas, useWebGL );
-                                                                        world.import( importStr );
-                                                                }
 
                                                                 this.buildShapeModel( canvas.elementModel, world );
                                                         }
@@ -432,7 +425,6 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                         if (elt.elementModel && elt.elementModel.shapeModel && elt.elementModel.shapeModel.GLWorld)
                         {
                                 var data = elt.elementModel.shapeModel.GLWorld.exportJSON();
-                                //var data = elt.elementModel.shapeModel.GLWorld.export();
                                 dataArray.push( data );
                         }
 
@@ -877,11 +869,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                 //TODO: Add logic to handle save before preview
                 this.application.ninja.documentController.handleExecuteSaveAll(null);
                 //Temp check for webGL Hack
-                if (this.application.ninja.documentController.activeDocument.glData.length && this.application.ninja.documentController.activeDocument.glData.length > 1) {//TODO: Should be 0, temp hack fix
-                        setTimeout(function () {window.open(this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController._activeDocument.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1]);}.bind(this), 3500);
-                } else {
-                        window.open(this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController._activeDocument.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1]);
-                }
+                window.open(this.application.ninja.coreIoApi.rootUrl + this.application.ninja.documentController._activeDocument.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1]);
                 //chrome.tabs.create({url: this.application.ninja.coreIoApi.rootUrl+this.application.ninja.documentController._activeDocument.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1]});          
         }
     },
diff --git a/js/helper-classes/RDGE/precompiled.js b/js/helper-classes/RDGE/precompiled.js
deleted file mode 100755
index 7932444c..00000000
--- a/js/helper-classes/RDGE/precompiled.js
+++ /dev/null
@@ -1,17 +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> */
-
-/*
- *      A list of shared parameters that all shaders can support (the engine always try to bind these uniforms)
- *      These parameters are compiled into all jshaders and can be set from any jshader
- *      with a call to jshader.global.u_matDiffuse.set([1,0,0,1]) if the jshader depends on that parameter.
- *      To set directly call rdgeGlobalParameters.'param'.set(x), for example rdgeGlobalParameters.u_lightPos.set([1,1,1])
- *      The values can be added to a jshaders params list - this will creating local jshader memory that binds to the parameter
- *      this parameter can be used to set the value for that shader but will not override the global setting
- *      The values set here are the default global values.
- *      note: the rdge_lights substructure can be ignored, the final parameter list contains only the uniform objects
- */
-
diff --git a/js/helper-classes/RDGE/rdge-compiled.js b/js/helper-classes/RDGE/rdge-compiled.js
index caf58147..0bbcb05b 100755
--- a/js/helper-classes/RDGE/rdge-compiled.js
+++ b/js/helper-classes/RDGE/rdge-compiled.js
@@ -1,452 +1,329 @@
-vec2={string:function(a){return"{ "+a[0]+", "+a[1]+" }"},verify:function(a){return a==void 0||a.length==void 0||a.length<2?!1:typeof a[0]!="number"||typeof a[1]!="number"?!1:!0},copy:function(a){return a.length==void 0?[a,a]:[a[0],a[1]]},inplace_copy:function(a,b){a[0]=b[0];a[1]=b[1]},zero:function(){return[0,0]},up:function(){return[0,1]},right:function(){return[1,0]},add:function(a,b){return[a[0]+b[0],a[1]+b[1]]},sub:function(a,b){return[a[0]-b[0],a[1]-b[1]]},mul:function(a,b){return[a[0]*b[0],
+var RDGE=RDGE||{};RDGE.vec2={};RDGE.vec2.string=function(a){return"{ "+a[0]+", "+a[1]+" }"};RDGE.vec2.verify=function(a){return void 0==a||void 0==a.length||2>a.length||"number"!=typeof a[0]||"number"!=typeof a[1]?!1:!0};RDGE.vec2.copy=function(a){return void 0==a.length?[a,a]:[a[0],a[1]]};RDGE.vec2.inplace_copy=function(a,b){a[0]=b[0];a[1]=b[1]};RDGE.vec2.zero=function(){return[0,0]};RDGE.vec2.up=function(){return[0,1]};RDGE.vec2.right=function(){return[1,0]};