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/relief-tunnel-material.js | 84 ++++++++++++------------- 1 file changed, 42 insertions(+), 42 deletions(-) (limited to 'js/lib/rdge/materials/relief-tunnel-material.js') diff --git a/js/lib/rdge/materials/relief-tunnel-material.js b/js/lib/rdge/materials/relief-tunnel-material.js index 202d7693..5f1c9c24 100644 --- a/js/lib/rdge/materials/relief-tunnel-material.js +++ b/js/lib/rdge/materials/relief-tunnel-material.js @@ -51,19 +51,19 @@ var ReliefTunnelMaterial = function ReliefTunnelMaterial() /////////////////////////////////////////////////////////////////////// // 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 reliefTunnelMaterialDef; }; + this.isAnimated = function() { return true; }; + this.getShaderDef = function() { return reliefTunnelMaterialDef; }; /////////////////////////////////////////////////////////////////////// // Methods @@ -99,42 +99,42 @@ var ReliefTunnelMaterial = function ReliefTunnelMaterial() // shader spec (can also be loaded from a .JSON file, or constructed at runtime) var reliefTunnelMaterialDef = { 'shaders': - { - 'defaultVShader': "assets/shaders/Basic.vert.glsl", - 'defaultFShader': "assets/shaders/ReliefTunnel.frag.glsl" - }, + { + 'defaultVShader': "assets/shaders/Basic.vert.glsl", + 'defaultFShader': "assets/shaders/ReliefTunnel.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] - } - } - ] - } + { + '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] + } + } + ] + } }; ReliefTunnelMaterial.prototype = new PulseMaterial(); -- cgit v1.2.3