4 files changed, 251 insertions, 83 deletions

diff --git a/assets/shaders/Pulse.frag.glsl b/assets/shaders/Pulse.frag.glsl
index b24c9bef..9aeb05c9 100644
--- a/assets/shaders/Pulse.frag.glsl
+++ b/assets/shaders/Pulse.frag.glsl
@@ -6,16 +6,22 @@ uniform float u_time;
 uniform vec2 u_resolution;
 uniform sampler2D u_tex0;
 
+uniform float u_speed;
+uniform float u_xscale;
+uniform float u_yscale;
+
 void main(void)
 {
     vec2 halfres = u_resolution.xy/2.0;
     vec2 cPos = gl_FragCoord.xy;
 
-    cPos.x -= 0.5*halfres.x*sin(u_time/2.0)+0.3*halfres.x*cos(u_time)+halfres.x;
-    cPos.y -= 0.4*halfres.y*sin(u_time/5.0)+0.3*halfres.y*cos(u_time)+halfres.y;
+        float time = u_time * u_speed;
+
+    cPos.x -= u_xscale*halfres.x*sin(time/2.0)+0.3*halfres.x*cos(time)+halfres.x;
+    cPos.y -= u_yscale*halfres.y*sin(time/5.0)+0.3*halfres.y*cos(time)+halfres.y;
     float cLength = length(cPos);
 
-    vec2 uv = gl_FragCoord.xy/u_resolution.xy+(cPos/cLength)*sin(cLength/30.0-u_time*10.0)/25.0;
+    vec2 uv = gl_FragCoord.xy/u_resolution.xy+(cPos/cLength)*sin(cLength/30.0-time*10.0)/25.0;
     vec3 col = texture2D(u_tex0,uv).xyz*50.0/cLength;
 
     gl_FragColor = vec4(col,1.0);
diff --git a/assets/shaders/plasma.frag.glsl b/assets/shaders/plasma.frag.glsl
index 248288a6..4a5ac3da 100644
--- a/assets/shaders/plasma.frag.glsl
+++ b/assets/shaders/plasma.frag.glsl
@@ -16,15 +16,21 @@ precision highp float;
 
 varying vec2    v_uv;
 uniform float   u_time;
-uniform vec4    color;
+
+uniform float u_wave;
+uniform float u_wave1;
+uniform float u_wave2;
+uniform float u_speed;
 
 void main(void)
 {
         float x = v_uv.x ;
         float y = v_uv.y ;
-        float time = u_time;
-        float wave =    (cos(time + y / 0.2  + cos(x / 0.3 + cos((y / 0.1)))));
-        float wave1 =   (sin(abs(wave + y/0.6)));
-        float wave2 =   (sin(abs(wave1 + y/0.8)));
+        float time = u_time*u_speed;
+
+        float wave =    (cos(time + y / (u_wave+0.2)  + cos(x / (u_wave+0.3) + cos((y / (u_wave+0.1))))));
+        float wave1 =   (sin(abs(wave + y/u_wave1)));
+        float wave2 =   (sin(abs(wave1 + y/u_wave2)));
+
         gl_FragColor = vec4( abs(vec3(wave2,wave1,wave)),1.0);
 }       
diff --git a/js/lib/rdge/materials/plasma-material.js b/js/lib/rdge/materials/plasma-material.js
index 02172a6b..1db207d6 100644
--- a/js/lib/rdge/materials/plasma-material.js
+++ b/js/lib/rdge/materials/plasma-material.js
@@ -17,6 +17,23 @@ var PlasmaMaterial = function PlasmaMaterial() {
         this._dTime = 0.01;
         this._speed = 1.0;
 
+        this._wave  = 0.0;
+        this._wave1 = 0.6;
+        this._wave2 = 0.8;
+
+    ///////////////////////////////////////////////////////////////////////
+    // Properties
+    ///////////////////////////////////////////////////////////////////////
+        this._propNames                 = ["wave",              "wave1",        "wave2",                "speed"];
+        this._propLabels                = ["Wave",              "Wave 1",       "Wave 2",               "Speed"];
+        this._propTypes                 = ["float",             "float",        "float",                "float"];
+
+        this._propValues                = [];
+        this._propValues[ this._propNames[0] ] = this._wave;
+        this._propValues[ this._propNames[1] ] = this._wave1;
+        this._propValues[ this._propNames[2] ] = this._wave2;
+        this._propValues[ this._propNames[3] ] = this._speed;
+
 
     ///////////////////////////////////////////////////////////////////////
     // Property Accessors
@@ -28,10 +45,51 @@ var PlasmaMaterial = function PlasmaMaterial() {
     ///////////////////////////////////////////////////////////////////////
     // Material Property Accessors
     ///////////////////////////////////////////////////////////////////////
+    // duplcate method requirde
+    this.dup = function (world) {
+        // get the current values;
+        var propNames = [], propValues = [], propTypes = [], propLabels = [];
+        this.getAllProperties(propNames, propValues, propTypes, propLabels);
+        
+        // allocate a new material
+        var newMat = new PlasmaMaterial();
+
+                // copy over the current values;
+        var n = propNames.length;
+        for (var i = 0; i < n; i++)
+            newMat.setProperty(propNames[i], propValues[i]);
+
+        return newMat;
+    };
 
     this.setProperty = function( prop, value )
         {
-                // plasma has no properties
+                // make sure we have legitimate imput
+                var ok = this.validateProperty( prop, value );
+                if (!ok) {
+                        console.log( "invalid property in Water Material:" + prop + " : " + value );
+                }
+
+                switch (prop)
+                {
+                        case "wave":
+                                this._wave = value;
+                                break;
+
+                        case "wave1":
+                                this._wave1 = value;
+                                break;
+
+                        case "wave2":
+                                this._wave2 = value;
+                                break;
+
+                        case "speed":
+                                this._speed = value;
+                                break;
+                }
+
+                this.updateParameters();
         };
 
     ///////////////////////////////////////////////////////////////////////
@@ -56,12 +114,37 @@ var PlasmaMaterial = function PlasmaMaterial() {
                 // set the default value
                 this._time = 0;
                 this._shader['default'].u_time.set( [this._time] );
+                this._shader['default'].u_speed.set( [this._speed] );
+
+                this._shader['default'].u_wave.set( [this._wave] );
+                this._shader['default'].u_wave1.set( [this._wave1] );
+                this._shader['default'].u_wave2.set( [this._wave2] );
 
                 // set up the material node
                 this._materialNode = RDGE.createMaterialNode("plasmaMaterial" + "_" + world.generateUniqueNodeID());
                 this._materialNode.setShader(this._shader);
         };
 
+        this.updateParameters = function()
+        {
+                this._propValues[ this._propNames[0] ] = this._wave;
+                this._propValues[ this._propNames[1] ] = this._wave1;
+                this._propValues[ this._propNames[2] ] = this._wave2;
+                this._propValues[ this._propNames[3] ] = this._speed;
+
+                var material = this._materialNode;
+                if (material) {
+                        var technique = material.shaderProgram['default'];
+                        var renderer = RDGE.globals.engine.getContext().renderer;
+                        if (renderer && technique) {
+                                        technique.u_wave.set( [this._wave] );
+                                        technique.u_wave1.set( [this._wave1] );
+                                        technique.u_wave2.set( [this._wave2] );
+                                        technique.u_speed.set( [this._speed] );
+                        }
+                }
+        };
+
         this.update = function( time ) {
                 this._shader['default'].u_time.set( [this._time] );
                 this._time += this._dTime;
@@ -74,7 +157,10 @@ var PlasmaMaterial = function PlasmaMaterial() {
                         'material'              : this.getShaderName(),
                         'name'                  : this.getName(),
                         'speed'                 : this._speed,
-                        'dTime'                 : this._dTime
+                        'dTime'                 : this._dTime,
+                        'wave'                  : this._wave,
+                        'wave1'                 : this._wave1,
+                        'wave2'                 : this._wave2
                 };
 
                 return jObj;
@@ -84,6 +170,10 @@ var PlasmaMaterial = function PlasmaMaterial() {
         {
                 this._speed = jObj.speed;
                 this._dTime = jObj.dTime;
+
+                this._wave  = jObj.wave;
+                this._wave1 = jObj.wave1;
+                this._wave2 = jObj.wave2;
         };
 };
 
@@ -115,6 +205,10 @@ var plasmaShaderDef =
                                 'params' : 
                                 {
                                         'u_time' : { 'type' : 'float' },
+                                        'u_speed': { 'type' : 'float' },
+                                        'u_wave' : { 'type' : 'float' },