WebGL & Canvas2D file IO

7 files changed, 433 insertions, 31 deletions

diff --git a/js/helper-classes/RDGE/GLCircle.js b/js/helper-classes/RDGE/GLCircle.js
index 15ed6b6d..59d0bdaf 100755
--- a/js/helper-classes/RDGE/GLCircle.js
+++ b/js/helper-classes/RDGE/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/RDGE/GLWorld.js b/js/helper-classes/RDGE/GLWorld.js
index 3a779b92..ce5f0516 100755
--- a/js/helper-classes/RDGE/GLWorld.js
+++ b/js/helper-classes/RDGE/GLWorld.js
@@ -379,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
@@ -395,13 +397,6 @@ function GLWorld( canvas, use3D )
                 RDGEStart( this._canvas );
                 this._canvas.task.stop()
         }
-
-        this.generateUniqueNodeID = function()
-        {
-                var str = String( this._nodeCounter );
-                this._nodeCounter++;
-                return str;
-        }
 }
 
 
diff --git a/js/helper-classes/RDGE/Materials/BumpMetalMaterial.js b/js/helper-classes/RDGE/Materials/BumpMetalMaterial.js
index 1a6c54c9..52332ab8 100755
--- a/js/helper-classes/RDGE/Materials/BumpMetalMaterial.js
+++ b/js/helper-classes/RDGE/Materials/BumpMetalMaterial.js
@@ -65,7 +65,7 @@ function BumpMetalMaterial()
     this.setProperty = function( prop, value )
         {
                 // every material should do something with the "color" property
-                if (prop === "color")  prop = "lightDiff";
+                if (prop === "color")  return;  //prop = "lightDiff";
 
                 // make sure we have legitimate imput
                 var ok = this.validateProperty( prop, value );
diff --git a/js/helper-classes/RDGE/Materials/RadialGradientMaterial.js b/js/helper-classes/RDGE/Materials/RadialGradientMaterial.js
index 4ebb1f30..45b260ef 100755
--- a/js/helper-classes/RDGE/Materials/RadialGradientMaterial.js
+++ b/js/helper-classes/RDGE/Materials/RadialGradientMaterial.js
@@ -146,8 +146,10 @@ function RadialGradientMaterial()
         // duplcate method requirde
         this.dup = function()   {  return new RadialGradientMaterial(); } 
 
-        this.init = function()
+        this.init = function( world )
         {
+                this.setWorld( world );
+
                 // set up the shader
                 this._shader = new jshader();
                 this._shader.def = radialGradientMaterialDef;
diff --git a/js/helper-classes/RDGE/runtime/GLRuntime.js b/js/helper-classes/RDGE/runtime/GLRuntime.js
index e0fff4a8..58cb4e33 100644
--- a/js/helper-classes/RDGE/runtime/GLRuntime.js
+++ b/js/helper-classes/RDGE/runtime/GLRuntime.js
@@ -131,7 +131,7 @@ function GLRuntime( canvas, importStr )
                         this.elapsed += dt;
         
                         // changed the global position uniform of light 0, another way to change behavior of a light
-                        //rdgeGlobalParameters.u_light0Pos.set( [5*Math.cos(this.elapsed), 5*Math.sin(this.elapsed), 20]);
+                        rdgeGlobalParameters.u_light0Pos.set( [5*Math.cos(this.elapsed), 5*Math.sin(this.elapsed), 20]);
         
                         // orbit the light nodes around the boxes
                         //this.light.setPosition([1.2*Math.cos(this.elapsed*2.0), 1.2*Math.sin(this.elapsed*2.0), 1.2*Math.cos(this.elapsed*2.0)]);
@@ -328,6 +328,8 @@ function GLRuntime( canvas, importStr )
         }
 
         // start RDGE or load Canvas 2D objects
+        var index = importStr.indexOf( "scenedata: " );
+        this._useWebGL = (index >= 0);
         if (this._useWebGL)
         {
                 var id = canvas.getAttribute( "data-RDGE-id" ); 
diff --git a/js/helper-classes/RDGE/runtime/RuntimeGeomObj.js b/js/helper-classes/RDGE/runtime/RuntimeGeomObj.js
index 2539abc1..253154f9 100644
--- a/js/helper-classes/RDGE/runtime/RuntimeGeomObj.js
+++ b/js/helper-classes/RDGE/runtime/RuntimeGeomObj.js
@@ -80,9 +80,9 @@ function RuntimeGeomObj()
                         switch (materialType)
                         {
                                 case "flat":                    mat = new RuntimeFlatMaterial();                                break;
-
-                                case "radialGradient":
+                                case "radialGradient":  mat = new RuntimeRadialGradientMaterial();              break;
                                 case "linearGradient":  mat = new RuntimeLinearGradientMaterial();              break;
+                                case "bumpMetal":               mat = new RuntimeBumpMetalMaterial();                   break;
 
                                 case "water":
                                 case "tunnel":
@@ -113,6 +113,101 @@ function RuntimeGeomObj()
                         importStr = importStr.substr( endIndex );
                 }
         }
+
+        ////////////////////////////////////////////////////////////////////
+        // vector function
+
+        this.vecAdd = function( dimen,  a, b )
+        {
+        var rtnVec;
+        if ((a.length < dimen) || (b.length < dimen))
+        {
+            throw new Error( "dimension error in vecAdd" );
+        }
+
+        rtnVec = [];
+        for (var i=0;  i<dimen;  i++)
+            rtnVec[i] = a[i] + b[i];
+
+        return rtnVec;
+    }
+
+
+        this.vecSubtract =  function( dimen, a, b )
+        {
+        var rtnVec;
+        if ((a.length < dimen) || (b.length < dimen))
+        {
+            throw new Error( "dimension error in vecSubtract" );
+        }
+
+        rtnVec = [];
+        for (var i=0;  i<dimen;  i++)
+            rtnVec[i] = a[i] - b[i];
+
+        return rtnVec;
+    }
+
+    this.vecDot = function( dimen,  v0, v1 )
+        {
+        if ((v0.length < dimen) || (v1.length < dimen))
+        {
+            throw new Error( "dimension error in vecDot" );
+        }
+
+        var sum = 0.0;
+        for (var i=0;  i<dimen;  i++)
+            sum += v0[i] * v1[i];
+
+        return sum;
+    }
+
+        this.vecMag = function( dimen, vec )
+        {
+        var sum = 0.0;
+        for (var i=0;  i<dimen;  i++)
+            sum += vec[i]*vec[i];
+        return Math.sqrt( sum );
+    }
+
+        this.vecScale = function(dimen, vec, scale)
+        {
+        for (var i=0;  i<dimen;  i++)
+            vec[i] *= scale;
+
+        return vec;
+    }
+
+    this.vecNormalize = function(dimen, vec, len)
+        {
+        var rtnVec;
+                if (!len)  len = 1.0;
+
+        var sum = 0.0;