Merge branch 'refs/heads/master' into CSSPanelUpdates

1 files changed, 71 insertions, 2 deletions

diff --git a/js/lib/rdge/materials/radial-blur-material.js b/js/lib/rdge/materials/radial-blur-material.js
index 46cdda74..fee02a1d 100644
--- a/js/lib/rdge/materials/radial-blur-material.js
+++ b/js/lib/rdge/materials/radial-blur-material.js
@@ -157,6 +157,38 @@ var RadialBlurMaterial = function RadialBlurMaterial() {
                 }
         };
 
+        this.exportJSON = function()
+        {
+                var jObj =
+                {
+                        'material'              : this.getShaderName(),
+                        'name'                  : this.getName(),
+                        'color'                 : this._propValues["color"],
+                        'texture'               : this._propValues[this._propNames[0]]
+                };
+
+                return jObj;
+        };
+
+        this.importJSON = function( jObj )
+        {
+        if (this.getShaderName() != jObj.material)  throw new Error( "ill-formed material" );
+        this.setName( jObj.name );
+
+                var rtnStr;
+        try
+        {
+            this._propValues[this._propNames[0]] = jObj.texture;
+                        this.updateTexture();
+        }
+        catch (e)
+        {
+            throw new Error( "could not import material: " + importStr );
+        }
+                
+                return rtnStr;
+        }
+
         this.export = function() {
                 // every material needs the base type and instance name
                 var exportStr = "material: " + this.getShaderName() + "\n";
@@ -242,10 +274,47 @@ var radialBlurMaterialDef =
         }
 };
 
+
+var RaidersMaterial = function RaidersMaterial()
+{
+        // initialize the inherited members
+        this.inheritedFrom = RadialBlurMaterial;
+        this.inheritedFrom();
+
+        this._name = "RaidersMaterial";
+        this._shaderName = "raiders";
+
+        this._texMap = 'assets/images/raiders.png';
+        this._propValues[ this._propNames[0] ] = this._texMap.slice(0);
+
+
+    // duplcate method requirde
+    this.dup = function( world ) {
+        // allocate a new uber material
+        var newMat = new RaidersMaterial();
+
+        // copy over the current values;
+        var propNames = [],  propValues = [],  propTypes = [],  propLabels = [];
+        this.getAllProperties( propNames,  propValues,  propTypes,  propLabels);
+        var n = propNames.length;
+        for (var i=0;  i<n;  i++)
+            newMat.setProperty( propNames[i], propValues[i] );
+
+        return newMat;
+    };
+}
+
+RaidersMaterial.prototype = new Material();
+
+if (typeof exports === "object")
+{
+        exports.RaidersMaterial = RaidersMaterial;
+}
+
+
 RadialBlurMaterial.prototype = new Material();
 
-if (typeof exports === "object") {
+if (typeof exports === "object")
     exports.RadialBlurMaterial = RadialBlurMaterial;
-}