diff options
Diffstat (limited to 'js/lib/rdge/materials/pulse-material.js')
-rw-r--r-- | js/lib/rdge/materials/pulse-material.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/js/lib/rdge/materials/pulse-material.js b/js/lib/rdge/materials/pulse-material.js index 4356c911..2ad174a3 100644 --- a/js/lib/rdge/materials/pulse-material.js +++ b/js/lib/rdge/materials/pulse-material.js | |||
@@ -42,7 +42,7 @@ var PulseMaterial = function PulseMaterial() | |||
42 | // initialize the inherited members | 42 | // initialize the inherited members |
43 | this.inheritedFrom = Material; | 43 | this.inheritedFrom = Material; |
44 | this.inheritedFrom(); | 44 | this.inheritedFrom(); |
45 | 45 | ||
46 | /////////////////////////////////////////////////////////////////////// | 46 | /////////////////////////////////////////////////////////////////////// |
47 | // Instance variables | 47 | // Instance variables |
48 | /////////////////////////////////////////////////////////////////////// | 48 | /////////////////////////////////////////////////////////////////////// |
@@ -160,16 +160,16 @@ var PulseMaterial = function PulseMaterial() | |||
160 | 160 | ||
161 | /////////////////////////////////////////////////////////////////////////////////////// | 161 | /////////////////////////////////////////////////////////////////////////////////////// |
162 | // RDGE shader | 162 | // RDGE shader |
163 | 163 | ||
164 | // shader spec (can also be loaded from a .JSON file, or constructed at runtime) | 164 | // shader spec (can also be loaded from a .JSON file, or constructed at runtime) |
165 | var pulseMaterialDef = | 165 | var pulseMaterialDef = |
166 | {'shaders': | 166 | {'shaders': |
167 | { | 167 | { |
168 | 'defaultVShader':"assets/shaders/Basic.vert.glsl", | 168 | 'defaultVShader':"assets/shaders/Basic.vert.glsl", |
169 | 'defaultFShader':"assets/shaders/Pulse.frag.glsl" | 169 | 'defaultFShader':"assets/shaders/Pulse.frag.glsl" |
170 | }, | 170 | }, |
171 | 'techniques': | 171 | 'techniques': |
172 | { | 172 | { |
173 | 'default': | 173 | 'default': |
174 | [ | 174 | [ |
175 | { | 175 | { |
@@ -183,7 +183,7 @@ var pulseMaterialDef = | |||
183 | 'texcoord' : { 'type' : 'vec2' } | 183 | 'texcoord' : { 'type' : 'vec2' } |
184 | }, | 184 | }, |
185 | // parameters | 185 | // parameters |
186 | 'params' : | 186 | 'params' : |
187 | { | 187 | { |
188 | 'u_tex0' : { 'type' : 'tex2d' }, | 188 | 'u_tex0' : { 'type' : 'tex2d' }, |
189 | 'u_time' : { 'type' : 'float' }, | 189 | 'u_time' : { 'type' : 'float' }, |
@@ -194,7 +194,7 @@ var pulseMaterialDef = | |||
194 | }, | 194 | }, |
195 | 195 | ||
196 | // render states | 196 | // render states |
197 | 'states' : | 197 | 'states' : |
198 | { | 198 | { |
199 | 'depthEnable' : true, | 199 | 'depthEnable' : true, |
200 | 'offset':[1.0, 0.1] | 200 | 'offset':[1.0, 0.1] |