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/taper-material.js | 56 ++++++++++++++++----------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'js/lib/rdge/materials/taper-material.js') diff --git a/js/lib/rdge/materials/taper-material.js b/js/lib/rdge/materials/taper-material.js index 2dc3e120..d88b1e9e 100644 --- a/js/lib/rdge/materials/taper-material.js +++ b/js/lib/rdge/materials/taper-material.js @@ -38,7 +38,7 @@ var Texture = require("js/lib/rdge/texture").Texture; var TaperMaterial = function TaperMaterial() { // initialize the inherited members - this.inheritedFrom = Material; + this.inheritedFrom = Material; this.inheritedFrom(); /////////////////////////////////////////////////////////////////////// @@ -55,8 +55,8 @@ var TaperMaterial = function TaperMaterial() this.getShaderName = function () { return this._shaderName; }; this.isAnimated = function () { return true; }; - this.getShaderDef = function() { return taperShaderDef; }; - this.getTechniqueName = function() { return 'colorMe' }; + this.getShaderDef = function() { return taperShaderDef; }; + this.getTechniqueName = function() { return 'colorMe' }; this.hasVertexDeformation = function () { return this._hasVertexDeformation; }; this._hasVertexDeformation = true; @@ -117,7 +117,7 @@ var TaperMaterial = function TaperMaterial() } var t1 = this._propValues["u_limit1"] - this._deltaTime, - t2 = this._propValues["u_limit2"] - this._deltaTime; + t2 = this._propValues["u_limit2"] - this._deltaTime; this._shader.colorMe["u_limit1"].set([t1]); @@ -138,31 +138,31 @@ taperShaderDef = { }, 'techniques': { // rendering control 'colorMe': [ // simple color pass - { - 'vshader': 'defaultVShader', - 'fshader': 'defaultFShader', - - // attributes - 'attributes': - { - 'vert': { 'type': 'vec3' }, - 'normal': { 'type': 'vec3' }, - 'texcoord': { 'type': 'vec2' } - }, - // attributes - 'params': - { - 'u_limit1': { 'type': 'float' }, - 'u_limit2': { 'type': 'float' }, - 'u_limit3': { 'type': 'float' }, - 'u_minVal': { 'type': 'float' }, - 'u_maxVal': { 'type': 'float' }, - 'u_center': { 'type': 'float' }, - 'u_taperAmount': { 'type': 'float' }, - 'u_speed': { 'type': 'float' } - } + { + 'vshader': 'defaultVShader', + 'fshader': 'defaultFShader', + + // attributes + 'attributes': + { + 'vert': { 'type': 'vec3' }, + 'normal': { 'type': 'vec3' }, + 'texcoord': { 'type': 'vec2' } + }, + // attributes + 'params': + { + 'u_limit1': { 'type': 'float' }, + 'u_limit2': { 'type': 'float' }, + 'u_limit3': { 'type': 'float' }, + 'u_minVal': { 'type': 'float' }, + 'u_maxVal': { 'type': 'float' }, + 'u_center': { 'type': 'float' }, + 'u_taperAmount': { 'type': 'float' }, + 'u_speed': { 'type': 'float' } + } } - ] + ] } }; -- 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/taper-material.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/lib/rdge/materials/taper-material.js') diff --git a/js/lib/rdge/materials/taper-material.js b/js/lib/rdge/materials/taper-material.js index d88b1e9e..988381f1 100644 --- a/js/lib/rdge/materials/taper-material.js +++ b/js/lib/rdge/materials/taper-material.js @@ -76,7 +76,7 @@ var TaperMaterial = function TaperMaterial() // set up the material node this._materialNode = RDGE.createMaterialNode("taperMaterial" + "_" + world.generateUniqueNodeID()); this._materialNode.setShader(this._shader); - + this._time = 0; if (this._shader && this._shader['default']) { this._shader['default'].u_time.set([this._time]); -- cgit v1.2.3