5 files changed, 89 insertions, 6 deletions

diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json
index 00ee7ed2..a863a135 100644
--- a/js/io/system/ninjalibrary.json
+++ b/js/io/system/ninjalibrary.json
@@ -1,6 +1,6 @@
 {
         "libraries": [
                 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.6.0.0"},
-                {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.1.0"}
+                {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.1.2"}
         ]
 }
\ No newline at end of file
diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index 75b7808b..dbef4859 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -301,6 +301,7 @@ var GeomObj = function GLGeomObj() {
                                 case "plasma":
                                 case "deform":
                                 case "water":
+                                case "paris":
                                 case "tunnel":
                                 case "reliefTunnel":
                                 case "squareTunnel":
@@ -373,6 +374,7 @@ var GeomObj = function GLGeomObj() {
                                 case "plasma":
                                 case "deform":
                                 case "water":
+                                case "paris":
                                 case "tunnel":
                                 case "reliefTunnel":
                                 case "squareTunnel":
diff --git a/js/lib/rdge/materials/radial-blur-material.js b/js/lib/rdge/materials/radial-blur-material.js
index 91eebcff..f4a4baa2 100644
--- a/js/lib/rdge/materials/radial-blur-material.js
+++ b/js/lib/rdge/materials/radial-blur-material.js
@@ -275,7 +275,6 @@ var radialBlurMaterialDef =
 };
 
 
-/*
 var RaidersMaterial = function RaidersMaterial()
 {
         // initialize the inherited members
@@ -295,7 +294,6 @@ if (typeof exports === "object")
 {
         exports.RaidersMaterial = RaidersMaterial;
 }
-*/
 
 
 RadialBlurMaterial.prototype = new Material();
diff --git a/js/lib/rdge/materials/water-material.js b/js/lib/rdge/materials/water-material.js
index 565055a1..b7413f55 100644
--- a/js/lib/rdge/materials/water-material.js
+++ b/js/lib/rdge/materials/water-material.js
@@ -117,7 +117,6 @@ var waterMaterialDef =
         }
 };
 
-/*
 var ParisMaterial = function ParisMaterial()
 {
         // initialize the inherited members
@@ -125,19 +124,98 @@ var ParisMaterial = function ParisMaterial()
         this.inheritedFrom();
 
         this._name = "ParisMaterial";
-        this._shaderName = "water";
+        this._shaderName = "paris";
 
         this._texMap = 'assets/images/paris.png';
         this._propValues[ this._propNames[0] ] = this._texMap.slice(0);
 
         this._diffuseColor = [0.5, 0.5, 0.5, 0.5];
         this._propValues[ this._propNames[1] ] = this._diffuseColor.slice();
+
+        // duplcate method requirde
+        this.dup = function( world ) {
+                // allocate a new uber material
+                var newMat = new ParisMaterial();
+
+                // 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;
+        };
+
+        this.init = function( world ) {
+                // save the world
+                if (world)  this.setWorld( world );
+
+                // set up the shader
+                this._shader = new jshader();
+                this._shader.def = parisMaterialDef;
+                this._shader.init();
+
+                // set up the material node
+                this._materialNode = createMaterialNode("parisMaterial" + "_" + world.generateUniqueNodeID());
+                this._materialNode.setShader(this._shader);
+
+                this._time = 0;
+                if (this._shader && this._shader['default']) {
+                        this._shader['default'].u_time.set( [this._time] );
+        }
+
+                // set the shader values in the shader
+                this.updateTexture();
+                this.setResolution( [world.getViewportWidth(),world.getViewportHeight()] );
+                this.update( 0 );
+        }
 }
+
 ParisMaterial.prototype = new PulseMaterial();
 if (typeof exports === "object") {
         exports.ParisMaterial = ParisMaterial;
 }
-*/
+ 
+// shader spec (can also be loaded from a .JSON file, or constructed at runtime)
+var parisMaterialDef =
+{'shaders': 
+        {
+                'defaultVShader':"assets/shaders/Basic.vert.glsl",
+                'defaultFShader':"assets/shaders/Paris.frag.glsl"
+        },
+        'techniques':
+        { 
+                'default':
+                [
+                        {
+                                'vshader' : 'defaultVShader',
+                                'fshader' : 'defaultFShader',
+                                // attributes
+                                'attributes' :
+                                {
+                                        'vert'  :   { 'type' : 'vec3' },
+                                        'normal' :  { 'type' : 'vec3' },
+                                        'texcoord'  :   { 'type' : 'vec2' }
+                                },
+                                // parameters
+                                'params' : 
+                                {
+                                        'u_tex0': { 'type' : 'tex2d' },
+                                        'u_time' : { 'type' : 'float' },
+                                        'u_resolution'  :   { 'type' : 'vec2' }
+                                },
+
+                                // render states
+                                'states' : 
+                                {
+                                        'depthEnable' : true,
+                                        'offset':[1.0, 0.1]
+                                }
+                        }
+                ]
+        }
+};
 
 
 WaterMaterial.prototype = new PulseMaterial();
diff --git a/js/models/materials-model.js b/js/models/materials-model.js
index 291f7567..692ac09a 100755
--- a/js/models/materials-model.js
+++ b/js/models/materials-model.js
@@ -17,6 +17,7 @@ var RadialGradientMaterial = require("js/lib/rdge/materials/radial-gradient-mate
 var BumpMetalMaterial = require("js/lib/rdge/materials/bump-metal-material").BumpMetalMaterial;
 var UberMaterial = require("js/lib/rdge/materials/uber-material").UberMaterial;
 var RadialBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").RadialBlurMaterial;
+var RaidersMaterial = require("js/lib/rdge/materials/radial-blur-material").RaidersMaterial;
 var PlasmaMaterial = require("js/lib/rdge/materials/plasma-material").PlasmaMaterial;
 var PulseMaterial = require("js/lib/rdge/materials/pulse-material").PulseMaterial;
 var TunnelMaterial = require("js/lib/rdge/materials/tunnel-material").TunnelMaterial;
@@ -24,6 +25,7 @@ var ReliefTunnelMaterial = require("js/lib/rdge/materials/relief-tunnel-material
 var SquareTunnelMaterial = require("js/lib/rdge/materials/square-tunnel-material").SquareTunnelMaterial;
 var FlyMaterial = require("js/lib/rdge/materials/fly-material").FlyMaterial;
 var WaterMaterial = require("js/lib/rdge/materials/water-material").WaterMaterial;
+var ParisMaterial = require("js/lib/rdge/materials/water-material").ParisMaterial;
 var ZInvertMaterial = require("js/lib/rdge/materials/z-invert-material").ZInvertMaterial;
 var DeformMaterial = require("js/lib/rdge/materials/deform-material").DeformMaterial;
 var StarMaterial = require("js/lib/rdge/materials/star-material").StarMaterial;
@@ -48,6 +50,7 @@ exports.MaterialsModel = Montage.create(Component, {
             this.addMaterial(new BumpMetalMaterial());
             this.addMaterial(new UberMaterial());
             this.addMaterial(new RadialBlurMaterial());
+            this.addMaterial(new RaidersMaterial());
             this.addMaterial(new PlasmaMaterial());
             this.addMaterial(new PulseMaterial());
             this.addMaterial(new TunnelMaterial());
@@ -55,6 +58,7 @@ exports.MaterialsModel = Montage.create(Component, {
             this.addMaterial(new SquareTunnelMaterial());
             this.addMaterial(new FlyMaterial());
             this.addMaterial(new WaterMaterial());
+            this.addMaterial(new ParisMaterial());