diff options
author | John Mayhew | 2012-04-03 09:36:14 -0700 |
---|---|---|
committer | John Mayhew | 2012-04-03 09:36:14 -0700 |
commit | 8d1cc709340da845d76f84220fe92c11e6217ff3 (patch) | |
tree | e2f8cfac9c0dcd64ce2b06f55d3a3981795c2fe3 /js/lib/rdge/materials/fly-material.js | |
parent | b4155fb4c33675a8a7cd37473513718043fdf0ba (diff) | |
download | ninja-8d1cc709340da845d76f84220fe92c11e6217ff3.tar.gz |
Made use of semicolons consistent and updated new files to use the new RDGE namespace
Diffstat (limited to 'js/lib/rdge/materials/fly-material.js')
-rw-r--r-- | js/lib/rdge/materials/fly-material.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/js/lib/rdge/materials/fly-material.js b/js/lib/rdge/materials/fly-material.js index a28fcaee..37bef66a 100644 --- a/js/lib/rdge/materials/fly-material.js +++ b/js/lib/rdge/materials/fly-material.js | |||
@@ -65,7 +65,7 @@ var FlyMaterial = function FlyMaterial() { | |||
65 | this.updateTexture(); | 65 | this.updateTexture(); |
66 | this.setResolution( [world.getViewportWidth(),world.getViewportHeight()] ); | 66 | this.setResolution( [world.getViewportWidth(),world.getViewportHeight()] ); |
67 | this.update( 0 ); | 67 | this.update( 0 ); |
68 | } | 68 | }; |
69 | }; | 69 | }; |
70 | 70 | ||
71 | /////////////////////////////////////////////////////////////////////////////////////// | 71 | /////////////////////////////////////////////////////////////////////////////////////// |
@@ -73,7 +73,8 @@ var FlyMaterial = function FlyMaterial() { | |||
73 | 73 | ||
74 | // shader spec (can also be loaded from a .JSON file, or constructed at runtime) | 74 | // shader spec (can also be loaded from a .JSON file, or constructed at runtime) |
75 | var flyMaterialDef = | 75 | var flyMaterialDef = |
76 | {'shaders': | 76 | { |
77 | 'shaders': | ||
77 | { | 78 | { |
78 | 'defaultVShader':"assets/shaders/Basic.vert.glsl", | 79 | 'defaultVShader':"assets/shaders/Basic.vert.glsl", |
79 | 'defaultFShader':"assets/shaders/Fly.frag.glsl" | 80 | 'defaultFShader':"assets/shaders/Fly.frag.glsl" |