Merge branch 'pentool' into brushtool

26 files changed, 233 insertions, 84 deletions

diff --git a/js/helper-classes/backup-delete/GLCircle.js b/js/helper-classes/backup-delete/GLCircle.js
index 15ed6b6d..59d0bdaf 100755
--- a/js/helper-classes/backup-delete/GLCircle.js
+++ b/js/helper-classes/backup-delete/GLCircle.js
@@ -381,7 +381,6 @@ function GLCircle()
                 // translate
                 var xCtr = 0.5*world.getViewportWidth() + this._xOffset,
                         yCtr = 0.5*world.getViewportHeight() + this._yOffset;
-                //ctx.setTransform( xScale, 0.0,  0.0, yScale, xCtr, yCtr );
                 var mat = Matrix.create( [
                                                         [ xScale,     0.0,  0.0,  xCtr],
                                                         [    0.0,  yScale,  0.0,  yCtr],
@@ -538,6 +537,8 @@ function GLCircle()
                         rtnStr += "flatMaterial";
                 rtnStr += "\n";
 
+                rtnStr += this.exportMaterials();
+
                 return rtnStr;
         }
 
diff --git a/js/helper-classes/backup-delete/GLGeomObj.js b/js/helper-classes/backup-delete/GLGeomObj.js
index 8946470d..54933590 100755
--- a/js/helper-classes/backup-delete/GLGeomObj.js
+++ b/js/helper-classes/backup-delete/GLGeomObj.js
@@ -158,6 +158,52 @@ function GLGeomObj()
         return fillMaterial;
     }
 
+        this.exportMaterials = function()
+        {
+                var rtnStr = "";
+                if (this._materialArray && this._materialNodeArray)
+                {
+                        var nMats = this._materialArray.length;
+                        rtnStr += "nMaterials: " + nMats + "\n";
+                        for (var i=0;  i<nMats;  i++)
+                        {
+                                var matNode  = this._materialNodeArray[i];
+                                rtnStr += "materialNodeName: " + matNode.name + "\n";
+
+                                var material = this._materialArray[i];
+                                rtnStr += material.export();
+                        }
+                }
+                else
+                        rtnStr += "nMaterials: 0\n" ;
+
+                return rtnStr;
+        }
+
+        this.importMaterials = function(importStr)
+        {
+                var nMaterials = Number( this.getPropertyFromString( "nMaterials: ", importStr )  );
+                for (var i=0;  i<nMaterials;  i++)
+                {
+                        var mat;
+                        var materialType = this.getPropertyFromString( "material: ",    importStr );
+                        switch (materialType)
+                        {
+                                case "flat":            mat = new FlatMaterial();               break;
+
+                                default:
+                                        console.log( "material type: " + materialType + " is not supported" );
+                                        break;
+                        }
+
+                        if (mat)
+                                mat.import( importStr );
+
+                        var endIndex = importStr.indexOf( "endMaterial\n" );
+                        if (endIndex < 0)  break;
+                        importStr = importStr.substr( endIndex );
+                }
+        }
 
     this.translate   = function(v)
     {
diff --git a/js/helper-classes/backup-delete/GLRectangle.js b/js/helper-classes/backup-delete/GLRectangle.js
index a801d3c4..2caa7080 100755
--- a/js/helper-classes/backup-delete/GLRectangle.js
+++ b/js/helper-classes/backup-delete/GLRectangle.js
@@ -166,6 +166,8 @@ function GLRectangle()
                         rtnStr += "flatMaterial";
                 rtnStr += "\n";
 
+                rtnStr += this.exportMaterials();
+
                 return rtnStr;
         }
 
diff --git a/js/helper-classes/backup-delete/GLWorld.js b/js/helper-classes/backup-delete/GLWorld.js
index 8017207f..c8bc4c1c 100755
--- a/js/helper-classes/backup-delete/GLWorld.js
+++ b/js/helper-classes/backup-delete/GLWorld.js
@@ -13,7 +13,6 @@ var fragmentShaderSource = "";
 
 var rdgeStarted = false;
 
-var nodeCounter = 0;
 var worldCounter = 0;
 
 
@@ -74,6 +73,10 @@ function GLWorld( canvas, use3D )
         this._worldCount = worldCounter;
         worldCounter++;
 
+        // keep a counter for generating node names
+        this._nodeCounter = 0;
+
+
     ///////////////////////////////////////////////////////////////////////
     // Property accessors
     ///////////////////////////////////////////////////////////////////////
@@ -376,10 +379,12 @@ 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
     // in the case of a procedurally built scene an init state is not needed for loading data
@@ -418,7 +423,7 @@ GLWorld.prototype.updateObject = function (obj)
         ctrTrNode = obj.getTransformNode();
                 if (ctrTrNode == null)
                 {
-                        ctrTrNode = createTransformNode("objRootNode_" + nodeCounter++);
+                        ctrTrNode = createTransformNode("objRootNode_" + this._nodeCounter++);
                         this._rootNode.insertAsChild( ctrTrNode );
                         obj.setTransformNode( ctrTrNode );
                 }
@@ -428,7 +433,7 @@ GLWorld.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]);
     }
         
@@ -451,12 +456,12 @@ GLWorld.prototype.updateObject = function (obj)
                 }
                 else
                 {
-                        childTrNode = createTransformNode("objNode_" + nodeCounter++);
+                        childTrNode = createTransformNode("objNode_" + this._nodeCounter++);
                         ctrTrNode.insertAsChild(childTrNode);
                 }