From 648ee61ae84216d0236e0dbc211addc13b2cfa3a Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 11:52:06 -0700 Subject: Expand tabs --- js/lib/rdge/materials/plasma-material.js | 160 +++++++++++++++---------------- 1 file changed, 80 insertions(+), 80 deletions(-) (limited to 'js/lib/rdge/materials/plasma-material.js') diff --git a/js/lib/rdge/materials/plasma-material.js b/js/lib/rdge/materials/plasma-material.js index 0b4923aa..8e51a9b0 100644 --- a/js/lib/rdge/materials/plasma-material.js +++ b/js/lib/rdge/materials/plasma-material.js @@ -34,37 +34,37 @@ var PlasmaMaterial = function PlasmaMaterial() { /////////////////////////////////////////////////////////////////////// // Instance variables /////////////////////////////////////////////////////////////////////// - this._name = "Plasma"; - this._shaderName = "plasma"; + this._name = "Plasma"; + this._shaderName = "plasma"; - this._time = 0.0; - this._dTime = 0.01; - this._speed = 1.0; + this._time = 0.0; + this._dTime = 0.01; + this._speed = 1.0; - this._wave = 0.0; - this._wave1 = 0.6; - this._wave2 = 0.8; + this._wave = 0.0; + this._wave1 = 0.6; + this._wave2 = 0.8; /////////////////////////////////////////////////////////////////////// // Properties /////////////////////////////////////////////////////////////////////// - this._propNames = ["u_wave", "u_wave1", "u_wave2", "u_speed"]; - this._propLabels = ["Wave", "Wave 1", "Wave 2", "Speed"]; - this._propTypes = ["float", "float", "float", "float"]; + this._propNames = ["u_wave", "u_wave1", "u_wave2", "u_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; + 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 /////////////////////////////////////////////////////////////////////// - this.getShaderName = function() { return this._shaderName; }; - this.isAnimated = function() { return true; }; - this.getShaderDef = function() { return plasmaShaderDef; }; + this.getShaderName = function() { return this._shaderName; }; + this.isAnimated = function() { return true; }; + this.getShaderDef = function() { return plasmaShaderDef; }; /////////////////////////////////////////////////////////////////////// // Material Property Accessors @@ -73,37 +73,37 @@ var PlasmaMaterial = function PlasmaMaterial() { /////////////////////////////////////////////////////////////////////// // Methods /////////////////////////////////////////////////////////////////////// - // duplcate method requirde + // duplcate method requirde - this.init = function( world) - { - this.setWorld( world ); + this.init = function( world) + { + this.setWorld( world ); - // set up the shader - this._shader = new RDGE.jshader(); - this._shader.def = plasmaShaderDef; - this._shader.init(); + // set up the shader + this._shader = new RDGE.jshader(); + this._shader.def = plasmaShaderDef; + this._shader.init(); - // set the default value - this._time = 0; - this._shader['default'].u_time.set( [this._time] ); + // set the default value + this._time = 0; + this._shader['default'].u_time.set( [this._time] ); - // set up the material node - this._materialNode = RDGE.createMaterialNode("plasmaMaterial" + "_" + world.generateUniqueNodeID()); - this._materialNode.setShader(this._shader); + // set up the material node + this._materialNode = RDGE.createMaterialNode("plasmaMaterial" + "_" + world.generateUniqueNodeID()); + this._materialNode.setShader(this._shader); - this._time = 0; - if (this._shader && this._shader['default']) { - this._shader['default'].u_time.set( [this._time] ); - } + this._time = 0; + if (this._shader && this._shader['default']) { + this._shader['default'].u_time.set( [this._time] ); + } - this.setShaderValues(); - }; + this.setShaderValues(); + }; - this.update = function( time ) { - this._shader['default'].u_time.set( [this._time] ); - this._time += this._dTime; - }; + this.update = function( time ) { + this._shader['default'].u_time.set( [this._time] ); + this._time += this._dTime; + }; }; /////////////////////////////////////////////////////////////////////////////////////// @@ -112,43 +112,43 @@ var PlasmaMaterial = function PlasmaMaterial() { // shader spec (can also be loaded from a .JSON file, or constructed at runtime) var plasmaShaderDef = {'shaders': - { - 'defaultVShader':"assets/shaders/plasma.vert.glsl", - 'defaultFShader':"assets/shaders/plasma.frag.glsl" - }, - 'techniques': - { - 'default': - [ - { - 'vshader' : 'defaultVShader', - 'fshader' : 'defaultFShader', - // attributes - 'attributes' : - { - 'vert' : { 'type' : 'vec3' }, - 'normal' : { 'type' : 'vec3' }, - 'texcoord' : { 'type' : 'vec2' } - }, - // parameters - 'params' : - { - 'u_time' : { 'type' : 'float' }, - 'u_speed': { 'type' : 'float' }, - 'u_wave' : { 'type' : 'float' }, - 'u_wave1': { 'type' : 'float' }, - 'u_wave2': { 'type' : 'float' } - }, - - // render states - 'states' : - { - 'depthEnable' : true, - 'offset':[1.0, 0.1] - } - } - ] - } + { + 'defaultVShader':"assets/shaders/plasma.vert.glsl", + 'defaultFShader':"assets/shaders/plasma.frag.glsl" + }, + 'techniques': + { + 'default': + [ + { + 'vshader' : 'defaultVShader', + 'fshader' : 'defaultFShader', + // attributes + 'attributes' : + { + 'vert' : { 'type' : 'vec3' }, + 'normal' : { 'type' : 'vec3' }, + 'texcoord' : { 'type' : 'vec2' } + }, + // parameters + 'params' : + { + 'u_time' : { 'type' : 'float' }, + 'u_speed': { 'type' : 'float' }, + 'u_wave' : { 'type' : 'float' }, + 'u_wave1': { 'type' : 'float' }, + 'u_wave2': { 'type' : 'float' } + }, + + // render states + 'states' : + { + 'depthEnable' : true, + 'offset':[1.0, 0.1] + } + } + ] + } }; PlasmaMaterial.prototype = new Material(); -- cgit v1.2.3 From 04343eda8c2f870b0da55cfdc8003c99fe1cc4de Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 11:53:10 -0700 Subject: Remove trailing spaces --- js/lib/rdge/materials/plasma-material.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'js/lib/rdge/materials/plasma-material.js') diff --git a/js/lib/rdge/materials/plasma-material.js b/js/lib/rdge/materials/plasma-material.js index 8e51a9b0..cb8c881f 100644 --- a/js/lib/rdge/materials/plasma-material.js +++ b/js/lib/rdge/materials/plasma-material.js @@ -108,16 +108,16 @@ var PlasmaMaterial = function PlasmaMaterial() { /////////////////////////////////////////////////////////////////////////////////////// // RDGE shader - + // shader spec (can also be loaded from a .JSON file, or constructed at runtime) var plasmaShaderDef = -{'shaders': +{'shaders': { 'defaultVShader':"assets/shaders/plasma.vert.glsl", 'defaultFShader':"assets/shaders/plasma.frag.glsl" }, 'techniques': - { + { 'default': [ { @@ -131,7 +131,7 @@ var plasmaShaderDef = 'texcoord' : { 'type' : 'vec2' } }, // parameters - 'params' : + 'params' : { 'u_time' : { 'type' : 'float' }, 'u_speed': { 'type' : 'float' }, @@ -141,7 +141,7 @@ var plasmaShaderDef = }, // render states - 'states' : + 'states' : { 'depthEnable' : true, 'offset':[1.0, 0.1] -- cgit v1.2.3