Merge branch 'refs/heads/master' into CSSPanelUpdates

1 files changed, 103 insertions, 0 deletions

diff --git a/js/lib/rdge/materials/water-material.js b/js/lib/rdge/materials/water-material.js
index cac5a249..b7413f55 100644
--- a/js/lib/rdge/materials/water-material.js
+++ b/js/lib/rdge/materials/water-material.js
@@ -18,6 +18,7 @@ var WaterMaterial = function WaterMaterial() {
         this._shaderName = "water";
 
         this._texMap = 'assets/images/rocky-normal.jpg';
+        //this._texMap = 'assets/images/powderblue.png';
 
         this._time = 0.0;
         this._dTime = 0.01;
@@ -27,6 +28,7 @@ var WaterMaterial = function WaterMaterial() {
     ///////////////////////////////////////////////////////////////////////
         // all defined in parent PulseMaterial.js
         // load the local default value
+        this._propValues = [];
         this._propValues[ this._propNames[0] ] = this._texMap.slice(0);
 
     ///////////////////////////////////////////////////////////////////////
@@ -115,6 +117,107 @@ var waterMaterialDef =
         }
 };
 
+var ParisMaterial = function ParisMaterial()
+{
+        // initialize the inherited members
+        this.inheritedFrom = WaterMaterial;
+        this.inheritedFrom();
+
+        this._name = "ParisMaterial";
+        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();
 
 if (typeof exports === "object") {