29 files changed, 663 insertions, 246 deletions

diff --git a/js/lib/NJUtils.js b/js/lib/NJUtils.js
index e16715a4..4f1082f9 100755
--- a/js/lib/NJUtils.js
+++ b/js/lib/NJUtils.js
@@ -116,7 +116,39 @@ exports.NJUtils = Object.create(Object.prototype, {
     ///// TODO: Selection and model should be based on the element type
     makeModelFromElement: {
         value: function(el) {
-            this.makeElementModel(el, "Div", "block", false);
+            var selection = "div",
+                controller = "block",
+                isShape = false;
+            switch(el.nodeName.toLowerCase())
+            {
+                case "div":
+                    break;
+                case "img":
+                    selection = "image";
+                    controller = "image";
+                    break;
+                case "video":
+                    selection = "video";
+                    controller = "video";
+                    break;
+                case "canvas":
+                    isShape = el.getAttribute("data-RDGE-id");
+                    if(isShape)
+                    {
+                        // TODO - Need more info about the shape
+                        selection = "canvas";
+                        controller = "shape";
+                    }
+                    else
+                    {
+                        selection = "canvas";
+                        controller = "canvas";
+                    }
+                    break;
+                case "shape":
+                    break;
+            }
+            this.makeElementModel(el, selection, controller, isShape);
         }
     },
 
diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index 04e4d96b..df24f556 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
@@ -80,6 +71,12 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
         // no animated materials
         this._firstRender = true;
 
+        this._worldCount = worldCounter;
+        worldCounter++;
+
+        // keep a counter for generating node names
+        this._nodeCounter = 0;
+
     ///////////////////////////////////////////////////////////////////////
     // Property accessors
     ///////////////////////////////////////////////////////////////////////
@@ -354,9 +351,12 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
                 return false;
         };
 
-
-        // END RDGE
-        ////////////////////////////////////////////////////////////////////////////////////
+        this.generateUniqueNodeID = function()
+        {
+                var str = "" + this._nodeCounter;
+                this._nodeCounter++;
+                return str;
+        }
 
     
     // start RDGE passing your runtime object, and false to indicate we don't need a an initialization state
@@ -395,7 +395,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 );
                 }
@@ -405,7 +405,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]);
     }
         
@@ -424,12 +424,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]);
     }
 };
@@ -731,7 +731,8 @@ World.prototype.getShapeFromPoint = function( offsetX, offsetY ) {
         }
 };
 
-World.prototype.export = function() {
+World.prototype.export = function()
+{
         var exportStr = "GLWorld 1.0\n";
         var id = this.getCanvas().getAttribute( "data-RDGE-id" );
         exportStr += "id: " + id + "\n";
@@ -740,17 +741,29 @@ World.prototype.export = function() {
         exportStr += "zNear: " + this._zNear + "\n";
         exportStr += "zFar: " + this._zFar + "\n";
         exportStr += "viewDist: " + this._viewDist + "\n";
+        if (this._useWebGL)
+                exportStr += "webGL: true\n";
 
         // we need 2 export modes:  One for save/restore, one for publish.
         // hardcoding for now
-        var exportForPublish = false;
+        //var exportForPublish = false;
+        //if (!exportForPublish)  exportForPublish = false;
+        var exportForPublish = true;
         exportStr += "publish: " + exportForPublish + "\n";
 
-        if (exportForPublish) {
+        if (exportForPublish && this._useWebGL)
+        {
                 exportStr += "scenedata: " + this.myScene.exportJSON() + "endscene\n";
-        } else {
+
+                // write out all of the objects
+                exportStr += "tree\n";
+                exportStr += this.exportObjects( this._geomRoot );
+                exportStr += "endtree\n";
+        }
+        else
+        {