diff options
author | Kris Kowal | 2012-07-06 11:53:10 -0700 |
---|---|---|
committer | Kris Kowal | 2012-07-06 15:01:48 -0700 |
commit | 04343eda8c2f870b0da55cfdc8003c99fe1cc4de (patch) | |
tree | 0a6048889b65bb16ff58822e55bc1346e9eb07bd /js/lib/rdge/materials/flag-material.js | |
parent | 648ee61ae84216d0236e0dbc211addc13b2cfa3a (diff) | |
download | ninja-04343eda8c2f870b0da55cfdc8003c99fe1cc4de.tar.gz |
Remove trailing spaces
Diffstat (limited to 'js/lib/rdge/materials/flag-material.js')
-rw-r--r-- | js/lib/rdge/materials/flag-material.js | 12 |
1 files changed, 6 insertions, 6 deletions
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() { | |||
70 | this._propValues[ this._propNames[3] ] = this._speed; | 70 | this._propValues[ this._propNames[3] ] = this._speed; |
71 | 71 | ||
72 | 72 | ||
73 | // a material can be animated or not. default is not. | 73 | // a material can be animated or not. default is not. |
74 | // Any material needing continuous rendering should override this method | 74 | // Any material needing continuous rendering should override this method |
75 | this.isAnimated = function() { return true; }; | 75 | this.isAnimated = function() { return true; }; |
76 | this.getShaderDef = function() { return flagMaterialDef; } | 76 | this.getShaderDef = function() { return flagMaterialDef; } |
@@ -106,16 +106,16 @@ var FlagMaterial = function FlagMaterial() { | |||
106 | 106 | ||
107 | /////////////////////////////////////////////////////////////////////////////////////// | 107 | /////////////////////////////////////////////////////////////////////////////////////// |
108 | // RDGE shader | 108 | // RDGE shader |
109 | 109 | ||
110 | // shader spec (can also be loaded from a .JSON file, or constructed at runtime) | 110 | // shader spec (can also be loaded from a .JSON file, or constructed at runtime) |
111 | var flagMaterialDef = | 111 | var flagMaterialDef = |
112 | {'shaders': | 112 | {'shaders': |
113 | { | 113 | { |
114 | 'defaultVShader':"assets/shaders/Flag.vert.glsl", | 114 | 'defaultVShader':"assets/shaders/Flag.vert.glsl", |
115 | 'defaultFShader':"assets/shaders/Flag.frag.glsl" | 115 | 'defaultFShader':"assets/shaders/Flag.frag.glsl" |
116 | }, | 116 | }, |
117 | 'techniques': | 117 | 'techniques': |
118 | { | 118 | { |
119 | 'default': | 119 | 'default': |
120 | [ | 120 | [ |
121 | { | 121 | { |
@@ -129,7 +129,7 @@ var flagMaterialDef = | |||
129 | 'texcoord' : { 'type' : 'vec2' } | 129 | 'texcoord' : { 'type' : 'vec2' } |
130 | }, | 130 | }, |
131 | // parameters | 131 | // parameters |
132 | 'params' : | 132 | 'params' : |
133 | { | 133 | { |
134 | 'u_tex0': { 'type' : 'tex2d' }, | 134 | 'u_tex0': { 'type' : 'tex2d' }, |
135 | 'u_time' : { 'type' : 'float' }, | 135 | 'u_time' : { 'type' : 'float' }, |
@@ -139,7 +139,7 @@ var flagMaterialDef = | |||
139 | }, | 139 | }, |
140 | 140 | ||
141 | // render states | 141 | // render states |
142 | 'states' : | 142 | 'states' : |
143 | { | 143 | { |
144 | 'depthEnable' : true, | 144 | 'depthEnable' : true, |
145 | 'offset':[1.0, 0.1] | 145 | 'offset':[1.0, 0.1] |