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/tunnel-material.js | 86 ++++++++++++++++---------------- 1 file changed, 43 insertions(+), 43 deletions(-) (limited to 'js/lib/rdge/materials/tunnel-material.js') diff --git a/js/lib/rdge/materials/tunnel-material.js b/js/lib/rdge/materials/tunnel-material.js index 0a96e23e..fd2e28d5 100644 --- a/js/lib/rdge/materials/tunnel-material.js +++ b/js/lib/rdge/materials/tunnel-material.js @@ -50,19 +50,19 @@ var TunnelMaterial = function TunnelMaterial() { /////////////////////////////////////////////////////////////////////// // Material Property Accessors /////////////////////////////////////////////////////////////////////// - var u_tex0_index = 0, u_speed_index = 1; - this._propNames = ["u_tex0", "u_speed" ]; - this._propLabels = ["Texture map", "Speed" ]; - this._propTypes = ["file", "float" ]; - this._propValues = []; + var u_tex0_index = 0, u_speed_index = 1; + this._propNames = ["u_tex0", "u_speed" ]; + this._propLabels = ["Texture map", "Speed" ]; + this._propTypes = ["file", "float" ]; + this._propValues = []; this._propValues[this._propNames[u_tex0_index]] = this._defaultTexMap.slice(0); this._propValues[this._propNames[u_speed_index]] = 1.0; /////////////////////////////////////////////////////////////////////// // Material Property Accessors /////////////////////////////////////////////////////////////////////// - this.isAnimated = function() { return true; }; - this.getShaderDef = function() { return tunnelMaterialDef; }; + this.isAnimated = function() { return true; }; + this.getShaderDef = function() { return tunnelMaterialDef; }; /////////////////////////////////////////////////////////////////////// // Methods @@ -98,42 +98,42 @@ var TunnelMaterial = function TunnelMaterial() { // shader spec (can also be loaded from a .JSON file, or constructed at runtime) var tunnelMaterialDef = {'shaders': - { - 'defaultVShader':"assets/shaders/Basic.vert.glsl", - 'defaultFShader':"assets/shaders/Tunnel.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_resolution' : { 'type' : 'vec2' } - }, - - // render states - 'states' : - { - 'depthEnable' : true, - 'offset':[1.0, 0.1] - } - } - ] - } + { + 'defaultVShader':"assets/shaders/Basic.vert.glsl", + 'defaultFShader':"assets/shaders/Tunnel.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_resolution' : { 'type' : 'vec2' } + }, + + // render states + 'states' : + { + 'depthEnable' : true, + 'offset':[1.0, 0.1] + } + } + ] + } }; TunnelMaterial.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/tunnel-material.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'js/lib/rdge/materials/tunnel-material.js') diff --git a/js/lib/rdge/materials/tunnel-material.js b/js/lib/rdge/materials/tunnel-material.js index fd2e28d5..8a80cb85 100644 --- a/js/lib/rdge/materials/tunnel-material.js +++ b/js/lib/rdge/materials/tunnel-material.js @@ -94,16 +94,16 @@ var TunnelMaterial = function TunnelMaterial() { /////////////////////////////////////////////////////////////////////////////////////// // RDGE shader - + // shader spec (can also be loaded from a .JSON file, or constructed at runtime) var tunnelMaterialDef = -{'shaders': +{'shaders': { 'defaultVShader':"assets/shaders/Basic.vert.glsl", 'defaultFShader':"assets/shaders/Tunnel.frag.glsl" }, 'techniques': - { + { 'default': [ { @@ -117,7 +117,7 @@ var tunnelMaterialDef = 'texcoord' : { 'type' : 'vec2' } }, // parameters - 'params' : + 'params' : { 'u_tex0': { 'type' : 'tex2d' }, 'u_time' : { 'type' : 'float' }, @@ -126,7 +126,7 @@ var tunnelMaterialDef = }, // render states - 'states' : + 'states' : { 'depthEnable' : true, 'offset':[1.0, 0.1] -- cgit v1.2.3