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/deform-material.js | 88 ++++++++++++++++---------------- 1 file changed, 44 insertions(+), 44 deletions(-) (limited to 'js/lib/rdge/materials/deform-material.js') diff --git a/js/lib/rdge/materials/deform-material.js b/js/lib/rdge/materials/deform-material.js index 234f22e4..6c5f93ad 100644 --- a/js/lib/rdge/materials/deform-material.js +++ b/js/lib/rdge/materials/deform-material.js @@ -51,21 +51,21 @@ var DeformMaterial = function DeformMaterial() { /////////////////////////////////////////////////////////////////////// // all defined in parent PulseMaterial.js // load the local default value - var u_tex0_index = 0; - this._propNames = ["u_tex0", "u_speed" ]; - this._propLabels = ["Texture map", "Speed" ]; - this._propTypes = ["file", "float" ]; - this._propValues = []; + var u_tex0_index = 0; + this._propNames = ["u_tex0", "u_speed" ]; + this._propLabels = ["Texture map", "Speed" ]; + this._propTypes = ["file", "float" ]; + this._propValues = []; this._propValues[this._propNames[0]] = this._defaultTexMap.slice(0); this._propValues[this._propNames[1]] = 1.0; - this._propValues[ this._propNames[ u_tex0_index] ] = this._defaultTexMap.slice(0); + this._propValues[ this._propNames[ u_tex0_index] ] = this._defaultTexMap.slice(0); /////////////////////////////////////////////////////////////////////// // Material Property Accessors /////////////////////////////////////////////////////////////////////// - this.isAnimated = function() { return true; }; - this.getShaderDef = function() { return pulseMaterialDef; } + this.isAnimated = function() { return true; }; + this.getShaderDef = function() { return pulseMaterialDef; } /////////////////////////////////////////////////////////////////////// @@ -106,42 +106,42 @@ var DeformMaterial = function DeformMaterial() { // shader spec (can also be loaded from a .JSON file, or constructed at runtime) var deformMaterialDef = {'shaders': - { - 'defaultVShader':"assets/shaders/Basic.vert.glsl", - 'defaultFShader':"assets/shaders/Deform.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/Deform.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] + } + } + ] + } }; DeformMaterial.prototype = new PulseMaterial(); -- cgit v1.2.3