1 files changed, 324 insertions, 7 deletions

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;
+        for (var i=0;  i<dimen;  i++)
+            sum += vec[i]*vec[i];
+        sum = Math.sqrt( sum );
+
+        if (Math.abs(sum) >= 0.001)
+        {
+            var scale = len/sum;
+            rtnVec = [];
+            for (var i=0;  i<dimen;  i++)
+                rtnVec[i] = vec[i]*scale;
+        }
+
+        return rtnVec;
+    },
+
+        this.transformPoint = function( srcPt, mat )
+    {
+        var pt = srcPt.slice(0);
+        var     x = this.vecDot(3,  pt, [mat[0], mat[4], mat[ 8]] ) + mat[12],
+            y = this.vecDot(3,  pt, [mat[1], mat[5], mat[ 9]] ) + mat[13],
+            z = this.vecDot(3,  pt, [mat[2], mat[6], mat[10]] ) + mat[14];
+
+        return [x, y, z];
+    }
 }
 
 function getPropertyFromString( prop, str )
@@ -183,7 +278,7 @@ function RuntimeRectangle()
                         rad = tlRad - inset;
                         if (rad < 0)  rad = 0;
                         pt[1] += rad;
-                        if (MathUtils.fpSign(rad) == 0)  pt[1] = inset;
+                        if (Math.abs(rad) < 0.001)  pt[1] = inset;
                         ctx.moveTo( pt[0],  pt[1] );
 
                         // get the bottom left point
@@ -194,7 +289,7 @@ function RuntimeRectangle()
                         ctx.lineTo( pt[0],  pt[1] );
 
                         // get the bottom left curve
-                        if (MathUtils.fpSign(rad) > 0)
+                        if (rad > 0.001)
                                 ctx.quadraticCurveTo( inset, height-inset,  inset+rad, height-inset );
 
                         // do the bottom of the rectangle
@@ -205,7 +300,7 @@ function RuntimeRectangle()
                         ctx.lineTo( pt[0], pt[1] );
 
                         // get the bottom right arc
-                        if (MathUtils.fpSign(rad) > 0)
+                        if (rad > 0.001)
                                 ctx.quadraticCurveTo( width-inset, height-inset,  width-inset, height-inset-rad );
 
                         // get the right of the rectangle
@@ -216,7 +311,7 @@ function RuntimeRectangle()
                         ctx.lineTo( pt[0], pt[1] );
 
                         // do the top right corner
-                        if (MathUtils.fpSign(rad) > 0)
+                        if (rad > 0.001)
                                 ctx.quadraticCurveTo( width-inset, inset,  width-inset-rad, inset );
 
                         // do the top of the rectangle
@@ -227,7 +322,7 @@ function RuntimeRectangle()
                         ctx.lineTo( pt[0], pt[1] );
 
                         // do the top left corner
-                        if (MathUtils.fpSign(rad) > 0)
+                        if (rad > 0.001)
                                 ctx.quadraticCurveTo( inset, inset, inset, inset+rad );
                         else
                                 ctx.lineTo( inset, 2*inset );
@@ -287,5 +382,227 @@ function RuntimeOval()
         // inherit the members of RuntimeGeomObj
         this.inheritedFrom = RuntimeGeomObj;
         this.inheritedFrom();
+
+        this.import = function( importStr )
+        {
+                this._xOffset                   = Number( getPropertyFromString( "xoff: ",                      importStr ) );
+                this._yOffset                   = Number( getPropertyFromString( "yoff: ",                      importStr ) );
+                this._width                             = Number( getPropertyFromString( "width: ",             importStr ) );
+                this._height                    = Number( getPropertyFromString( "height: ",            importStr ) );
+                this._strokeWidth               = Number( getPropertyFromString( "strokeWidth: ",       importStr ) );
+                this._innerRadius               = Number( getPropertyFromString( "innerRadius: ",       importStr ) );
+                this._strokeStyle               = getPropertyFromString( "strokeStyle: ",       importStr );
+                var strokeMaterialName  = getPropertyFromString( "strokeMat: ", importStr );
+                var fillMaterialName    = getPropertyFromString( "fillMat: ",           importStr );
+                this._fillColor                 =  eval( "[" + getPropertyFromString( "fillColor: ",    importStr ) + "]" );
+                this._strokeColor               =  eval( "[" + getPropertyFromString( "strokeColor: ",  importStr ) + "]" );
+                
+                this.importMaterials( importStr );
+        }
+
+        this.render = function()
+        {
+                // get the world
+                var world = this.getWorld();
+                if (!world)  throw( "null world in buildBuffers" );
+
+                 // get the context
+                var ctx = world.get2DContext();
+                if (!ctx)  return;
+
+                // declare some variables
+                var p0, p1;
+                var x0, y1,   x1, y1;
+
+                // create the matrix
+                var lineWidth = this._strokeWidth;
+                var innerRad  = this._innerRadius;