File IO

31 files changed, 336 insertions, 113 deletions

diff --git a/js/document/html-document.js b/js/document/html-document.js
index 8592a445..44f90d41 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -8,7 +8,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 //
 var Montage =           require("montage/core/core").Montage,
     TextDocument =      require("js/document/text-document").TextDocument,
-    NJUtils =           require("js/lib/NJUtils").NJUtils;
+    NJUtils =           require("js/lib/NJUtils").NJUtils,
+        CanvasDataManager =     require("js/lib/rdge/runtime/CanvasDataManager").CanvasDataManager,
+        GLWorld =                       require("js/lib/drawing/world").World;
 ////////////////////////////////////////////////////////////////////////
 //
 exports.HTMLDocument = Montage.create(TextDocument, {
@@ -185,7 +187,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                         var elt = this.documentRoot;
                         if (elt)
                         {
-                                var loadForRuntime = false;
+                                var loadForRuntime = true;
                                 if (loadForRuntime)
                                 {
                                         //console.log( "load canvas data: " , value );
@@ -224,7 +226,6 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                                                                                         var useWebGL = (index >= 0)
                                                                                         var world = new GLWorld( canvas, useWebGL );
                                                                                         world.import( importStr );
-                                                                                        canvas.elementModel.shapeModel.GLWorld = world;
 
                                                                                         this.buildShapeModel( canvas.elementModel, world );
                                                                                 }
@@ -789,8 +790,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                                 }
                         }
                 }
-                        //return {mode: 'html', document: this._userDocument, webgl: this.glData, styles: styles, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
-                        return {mode: 'html', document: this._userDocument, styles: styles, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
+                        return {mode: 'html', document: this._userDocument, webgl: this.glData, styles: styles, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
                 } else if (this.currentView === "code"){
                         //TODO: Would this get call when we are in code of HTML?
                 } else {
@@ -813,8 +813,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                                 }
                         }
                 }
-                        //return {mode: 'html', document: this._userDocument, webgl: this.glData, css: css, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
-                        return {mode: 'html', document: this._userDocument, css: css, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
+                        return {mode: 'html', document: this._userDocument, webgl: this.glData, css: css, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
                 } else if (this.currentView === "code"){
                         //TODO: Would this get call when we are in code of HTML?
                 } else {
diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index 3d6c6fc4..b8bceda6 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -4,17 +4,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> */
 
-// Useless Global variables.
-// TODO: Remove this as soon as QE test pass
-/*
-var shaderProgramArray = new Array;
-var glContextArray = new Array;
-var vertexShaderSource = "";
-var fragmentShaderSource = "";
-var rdgeStarted = false;
-*/
-
-var nodeCounter = 0;
 
 var GeomObj = require("js/lib/geom/geom-obj").GeomObj;
 var Line = require("js/lib/geom/line").Line;
@@ -22,6 +11,8 @@ var Rectangle = require("js/lib/geom/rectangle").Rectangle;
 var Circle = require("js/lib/geom/circle").Circle;
 var MaterialsModel = require("js/models/materials-model").MaterialsModel;
 
+var worldCounter = 0;
+
 ///////////////////////////////////////////////////////////////////////
 // Class GLWorld
 //      Manages display in a canvas
@@ -76,6 +67,12 @@ var World = function GLWorld( canvas, use3D ) {
         // no animated materials
         this._firstRender = true;
 
+        this._worldCount = worldCounter;
+        worldCounter++;
+
+        // keep a counter for generating node names
+        this._nodeCounter = 0;
+
     ///////////////////////////////////////////////////////////////////////
     // Property accessors
     ///////////////////////////////////////////////////////////////////////
@@ -350,9 +347,12 @@ var World = function GLWorld( canvas, use3D ) {
                 return false;
         };
 
-
-        // END RDGE
-        ////////////////////////////////////////////////////////////////////////////////////
+        this.generateUniqueNodeID = function()
+        {
+                var str = String( this._nodeCounter );
+                this._nodeCounter++;
+                return str;
+        }
 
     
     // start RDGE passing your runtime object, and false to indicate we don't need a an initialization state
@@ -391,7 +391,7 @@ World.prototype.updateObject = function (obj) {
     if (nPrims > 0) {
         ctrTrNode = obj.getTransformNode();
                 if (ctrTrNode == null) {
-                        ctrTrNode = createTransformNode("objRootNode_" + nodeCounter++);
+                        ctrTrNode = createTransformNode("objRootNode_" + this._nodeCounter++);
                         this._rootNode.insertAsChild( ctrTrNode );
                         obj.setTransformNode( ctrTrNode );
                 }
@@ -401,7 +401,7 @@ World.prototype.updateObject = function (obj) {
                 });
                 ctrTrNode.meshes = [];
 
-        ctrTrNode.attachMeshNode(this.renderer.id + "_prim_" + nodeCounter++, prims[0]);
+        ctrTrNode.attachMeshNode(this.renderer.id + "_prim_" + this._nodeCounter++, prims[0]);
         ctrTrNode.attachMaterial(materialNodes[0]);
     }
         
@@ -420,12 +420,12 @@ World.prototype.updateObject = function (obj) {
                         });
                         childTrNode.meshes = [];
                 } else {
-                        childTrNode = createTransformNode("objNode_" + nodeCounter++);
+                        childTrNode = createTransformNode("objNode_" + this._nodeCounter++);
                         ctrTrNode.insertAsChild(childTrNode);
                 }
 
         // attach the instanced box goe
-        childTrNode.attachMeshNode(this.renderer.id + "_prim_" + nodeCounter++, prim);
+        childTrNode.attachMeshNode(this.renderer.id + "_prim_" + this._nodeCounter++, prim);
         childTrNode.attachMaterial(materialNodes[i]);
     }
 };
@@ -727,7 +727,7 @@ World.prototype.getShapeFromPoint = function( offsetX, offsetY ) {
         }
 };