1 files changed, 672 insertions, 664 deletions

diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js
index 104c22cc..17f8cda8 100644
--- a/assets/canvas-runtime.js
+++ b/assets/canvas-runtime.js
@@ -305,16 +305,19 @@ NinjaCvsRt.GLRuntime = function ( canvas, jObj,  assetPath )
                 {
                         case 1:
                                 obj = new NinjaCvsRt.RuntimeRectangle();
+                obj._materials = [];
                                 obj.importJSON( jObj );
                                 break;
 
                         case 2:         // circle
                                 obj = new NinjaCvsRt.RuntimeOval();
+                obj._materials = [];
                                 obj.importJSON( jObj );
                                 break;
 
                         case 3:         // line
                                 obj = new NinjaCvsRt.RuntimeLine();
+                obj._materials = [];
                                 obj.importJSON( jObj );
                                 break;
 
@@ -481,204 +484,205 @@ NinjaCvsRt.RuntimeGeomObj = function ()
 
         // array of materials
         this._materials = [];
+};
 
-    ///////////////////////////////////////////////////////////////////////
-    // Property accessors
-    ///////////////////////////////////////////////////////////////////////
-
-        this.geomType   = function()            {  return this.GEOM_TYPE_UNDEFINED;     };
-
-        this.setWorld   = function(w)           {  this._world = w;                                     };
-        this.getWorld   = function()            {  return this._world;                          };
+//NinjaCvsRt.RuntimeGeomObj.prototype = Object.create(Object.prototype, {});
+///////////////////////////////////////////////////////////////////////
+// Property accessors
+///////////////////////////////////////////////////////////////////////
 
-    ///////////////////////////////////////////////////////////////////////
-    // Methods
-    ///////////////////////////////////////////////////////////////////////    
-        this.addChild = function( child )
-        {
-                if (!this._children)  this._children = [];
-                this._children.push( child );
-        };
+NinjaCvsRt.RuntimeGeomObj.prototype.geomType    = function()            {  return this.GEOM_TYPE_UNDEFINED;     };
 
-    this.importJSON = function()
-    {
-        };
+NinjaCvsRt.RuntimeGeomObj.prototype.setWorld    = function(w)           {  this._world = w;                                     };
+NinjaCvsRt.RuntimeGeomObj.prototype.getWorld    = function()            {  return this._world;                          };
 
-        this.importMaterials = function(jObj)
-        {
-                if (!jObj || !jObj.materials)  return;
 
-                var nMaterials = jObj.nMaterials;
-                var matArray = jObj.materials;
-                for (var i=0;  i<nMaterials;  i++)
-                {
-                        var mat;
-                        var matObj = matArray[i].material;
-                        var matNodeName = matArray[i].materialNodeName;
-                        var shaderName = matObj.material;
-                        switch (shaderName)
-                        {
-                                case "flat":                    mat = new NinjaCvsRt.RuntimeFlatMaterial();                             break;
-                                case "radialGradient":  mat = new NinjaCvsRt.RuntimeRadialGradientMaterial();           break;
-                                case "linearGradient":  mat = new NinjaCvsRt.RuntimeLinearGradientMaterial();           break;
-                                case "bumpMetal":               mat = new NinjaCvsRt.RuntimeBumpMetalMaterial();                        break;
-                                case "uber":                    mat = new NinjaCvsRt.RuntimeUberMaterial();                             break;
-                                case "plasma":                  mat = new NinjaCvsRt.RuntimePlasmaMaterial();                           break;
-
-                                case "deform":
-                                case "water":
-                                case "paris":
-                                case "raiders":
-                                case "tunnel":
-                                case "reliefTunnel":
-                                case "squareTunnel":
-                                case "twist":
-                                case "fly":
-                                case "julia":
-                                case "mandel":
-                                case "star":
-                                case "zinvert":
-                                case "keleidoscope":
-                                case "radialBlur":
-                                case "pulse":                   mat = new NinjaCvsRt.RuntimePulseMaterial();                            break;
-
-                                default:
-                                        console.log( "material type: " + shaderName + " is not supported" );
-                                        break;
-                        }
+///////////////////////////////////////////////////////////////////////
+// Methods
+///////////////////////////////////////////////////////////////////////
+NinjaCvsRt.RuntimeGeomObj.prototype.addChild = function( child )
+{
+    if (!this._children)  this._children = [];
+    this._children.push( child );
+};
 
-                        if (mat)
-                        {
-                                mat.importJSON( matObj );
-                                mat._materialNodeName = matNodeName;
-                                this._materials.push( mat );
-                        }
-                }
-        };
+NinjaCvsRt.RuntimeGeomObj.prototype.importJSON = function()
+{
+};
 
-        ////////////////////////////////////////////////////////////////////
-        // vector function
+NinjaCvsRt.RuntimeGeomObj.prototype.importMaterials = function(jObj)
+{
+    if (!jObj || !jObj.materials)  return;
 
-        this.vecAdd = function( dimen,  a, b )
-        {
-        var rtnVec;
-        if ((a.length < dimen) || (b.length < dimen))
+    var nMaterials = jObj.nMaterials;
+    var matArray = jObj.materials;
+    for (var i=0;  i<nMaterials;  i++)
+    {
+        var mat;
+        var matObj = matArray[i].material;
+        var matNodeName = matArray[i].materialNodeName;
+        var shaderName = matObj.material;
+        switch (shaderName)
         {
-            throw new Error( "dimension error in vecAdd" );
+            case "flat":                        mat = new NinjaCvsRt.RuntimeFlatMaterial();                             break;
+            case "radialGradient":  mat = new NinjaCvsRt.RuntimeRadialGradientMaterial();               break;
+            case "linearGradient":  mat = new NinjaCvsRt.RuntimeLinearGradientMaterial();               break;
+            case "bumpMetal":           mat = new NinjaCvsRt.RuntimeBumpMetalMaterial();                        break;
+            case "uber":                        mat = new NinjaCvsRt.RuntimeUberMaterial();                             break;
+            case "plasma":                      mat = new NinjaCvsRt.RuntimePlasmaMaterial();                           break;
+
+            case "deform":
+            case "water":
+            case "paris":
+            case "raiders":
+            case "tunnel":
+            case "reliefTunnel":
+            case "squareTunnel":
+            case "twist":
+            case "fly":
+            case "julia":
+            case "mandel":
+            case "star":
+            case "zinvert":
+            case "keleidoscope":
+            case "radialBlur":
+            case "pulse":                       mat = new NinjaCvsRt.RuntimePulseMaterial();                            break;
+
+            default:
+                console.log( "material type: " + shaderName + " is not supported" );
+                break;
         }
 
-        rtnVec = [];
-        for (var i=0;  i<dimen;  i++)
-            rtnVec[i] = a[i] + b[i];
+        if (mat)
+        {
+            mat.importJSON( matObj );
+            mat._materialNodeName = matNodeName;
+            this._materials.push( mat );
+        }
+    }
+};
 
-        return rtnVec;
-    };
+////////////////////////////////////////////////////////////////////
+// vector function
+NinjaCvsRt.RuntimeGeomObj.prototype.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];
 
-        this.vecSubtract =  function( dimen, a, b )
-        {
-        var rtnVec;
-        if ((a.length < dimen) || (b.length < dimen))
-        {
-            throw new Error( "dimension error in vecSubtract" );
-        }
+    return rtnVec;
+};
 
-        rtnVec = [];
-        for (var i=0;  i<dimen;  i++)
-            rtnVec[i] = a[i] - b[i];
 
-        return rtnVec;
-    };
+NinjaCvsRt.RuntimeGeomObj.prototype.vecSubtract =  function( dimen, a, b )
+{
+    var rtnVec;
+    if ((a.length < dimen) || (b.length < dimen))
+    {
+        throw new Error( "dimension error in vecSubtract" );
+    }
 
-    this.vecDot = function( dimen,  v0, v1 )
-        {
-        if ((v0.length < dimen) || (v1.length < dimen))
-        {
-            throw new Error( "dimension error in vecDot" );
-        }
+    rtnVec = [];
+    for (var i=0;  i<dimen;  i++)
+        rtnVec[i] = a[i] - b[i];
 
-        var sum = 0.0;
-        for (var i=0;  i<dimen;  i++)
-            sum += v0[i] * v1[i];
+    return rtnVec;
+};