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/flag-material.js | 160 ++++++++++++++++----------------- 1 file changed, 80 insertions(+), 80 deletions(-) (limited to 'js/lib/rdge/materials/flag-material.js') diff --git a/js/lib/rdge/materials/flag-material.js b/js/lib/rdge/materials/flag-material.js index b87013ba..5cd361df 100644 --- a/js/lib/rdge/materials/flag-material.js +++ b/js/lib/rdge/materials/flag-material.js @@ -37,19 +37,19 @@ var FlagMaterial = function FlagMaterial() { /////////////////////////////////////////////////////////////////////// // Instance variables /////////////////////////////////////////////////////////////////////// - this._name = "Flag"; - this._shaderName = "flag"; + this._name = "Flag"; + this._shaderName = "flag"; - this._texMap = 'assets/images/us_flag.png'; + this._texMap = 'assets/images/us_flag.png'; - this._time = 0.0; - this._dTime = 0.1; + this._time = 0.0; + this._dTime = 0.1; - this._speed = 1.0; + this._speed = 1.0; this._waveWidth = 1.0; this._waveHeight = 1.0; - this._hasVertexDeformation = true; + this._hasVertexDeformation = true; // array textures indexed by shader uniform name this._glTextures = []; @@ -57,51 +57,51 @@ var FlagMaterial = function FlagMaterial() { /////////////////////////////////////////////////////////////////////// // Properties /////////////////////////////////////////////////////////////////////// - // all defined in parent PulseMaterial.js - // load the local default value - this._propNames = ["u_tex0", "u_waveWidth", "u_waveHeight", "u_speed" ]; - this._propLabels = ["Texture map", "Wave Width", "Wave Height", "Speed" ]; - this._propTypes = ["file", "float", "float", "float" ]; - this._propValues = []; - - this._propValues[ this._propNames[0] ] = this._texMap.slice(0); + // all defined in parent PulseMaterial.js + // load the local default value + this._propNames = ["u_tex0", "u_waveWidth", "u_waveHeight", "u_speed" ]; + this._propLabels = ["Texture map", "Wave Width", "Wave Height", "Speed" ]; + this._propTypes = ["file", "float", "float", "float" ]; + this._propValues = []; + + this._propValues[ this._propNames[0] ] = this._texMap.slice(0); this._propValues[ this._propNames[1] ] = this._waveWidth; this._propValues[ this._propNames[2] ] = this._waveHeight; this._propValues[ this._propNames[3] ] = this._speed; - // a material can be animated or not. default is not. - // Any material needing continuous rendering should override this method - this.isAnimated = function() { return true; }; - this.getShaderDef = function() { return flagMaterialDef; } + // a material can be animated or not. default is not. + // Any material needing continuous rendering should override this method + this.isAnimated = function() { return true; }; + this.getShaderDef = function() { return flagMaterialDef; } /////////////////////////////////////////////////////////////////////// // Methods /////////////////////////////////////////////////////////////////////// - // duplcate method requirde - - this.init = function( world ) - { - // save the world - if (world) this.setWorld( world ); - - // set up the shader - this._shader = new RDGE.jshader(); - this._shader.def = flagMaterialDef; - this._shader.init(); - - // set up the material node - this._materialNode = RDGE.createMaterialNode("flagMaterial" + "_" + 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.setShaderValues(); - this.update( 0 ); - } + // duplcate method requirde + + this.init = function( world ) + { + // save the world + if (world) this.setWorld( world ); + + // set up the shader + this._shader = new RDGE.jshader(); + this._shader.def = flagMaterialDef; + this._shader.init(); + + // set up the material node + this._materialNode = RDGE.createMaterialNode("flagMaterial" + "_" + 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.setShaderValues(); + this.update( 0 ); + } }; /////////////////////////////////////////////////////////////////////////////////////// @@ -110,43 +110,43 @@ var FlagMaterial = function FlagMaterial() { // shader spec (can also be loaded from a .JSON file, or constructed at runtime) var flagMaterialDef = {'shaders': - { - 'defaultVShader':"assets/shaders/Flag.vert.glsl", - 'defaultFShader':"assets/shaders/Flag.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_speed' : { 'type' : 'float' }, - 'u_waveWidth' : { 'type' : 'float' }, - 'u_waveHeight' : { 'type' : 'float' } - }, - - // render states - 'states' : - { - 'depthEnable' : true, - 'offset':[1.0, 0.1] - } - } - ] - } + { + 'defaultVShader':"assets/shaders/Flag.vert.glsl", + 'defaultFShader':"assets/shaders/Flag.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_speed' : { 'type' : 'float' }, + 'u_waveWidth' : { 'type' : 'float' }, + 'u_waveHeight' : { 'type' : 'float' } + }, + + // render states + 'states' : + { + 'depthEnable' : true, + 'offset':[1.0, 0.1] + } + } + ] + } }; FlagMaterial.prototype = new PulseMaterial(); -- 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/flag-material.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'js/lib/rdge/materials/flag-material.js') diff --git a/js/lib/rdge/materials/flag-material.js b/js/lib/rdge/materials/flag-material.js index 5cd361df..f0d9b84c 100644 --- a/js/lib/rdge/materials/flag-material.js +++ b/js/lib/rdge/materials/flag-material.js @@ -70,7 +70,7 @@ var FlagMaterial = function FlagMaterial() { this._propValues[ this._propNames[3] ] = this._speed; - // a material can be animated or not. default is not. + // a material can be animated or not. default is not. // Any material needing continuous rendering should override this method this.isAnimated = function() { return true; }; this.getShaderDef = function() { return flagMaterialDef; } @@ -106,16 +106,16 @@ var FlagMaterial = function FlagMaterial() { /////////////////////////////////////////////////////////////////////////////////////// // RDGE shader - + // shader spec (can also be loaded from a .JSON file, or constructed at runtime) var flagMaterialDef = -{'shaders': +{'shaders': { 'defaultVShader':"assets/shaders/Flag.vert.glsl", 'defaultFShader':"assets/shaders/Flag.frag.glsl" }, 'techniques': - { + { 'default': [ { @@ -129,7 +129,7 @@ var flagMaterialDef = 'texcoord' : { 'type' : 'vec2' } }, // parameters - 'params' : + 'params' : { 'u_tex0': { 'type' : 'tex2d' }, 'u_time' : { 'type' : 'float' }, @@ -139,7 +139,7 @@ var flagMaterialDef = }, // render states - 'states' : + 'states' : { 'depthEnable' : true, 'offset':[1.0, 0.1] -- cgit v1.2.3