diff options
author | John Mayhew | 2012-04-02 14:57:31 -0700 |
---|---|---|
committer | John Mayhew | 2012-04-02 14:57:31 -0700 |
commit | fb0a659c9ca3479fd6799325498b11f074689936 (patch) | |
tree | 46342298281aa93e48756e040715f42770ccc526 /js/lib/rdge/materials/keleidoscope-material.js | |
parent | c24f58c10231c30d3a8a4c9fb9a4f395dd746180 (diff) | |
download | ninja-fb0a659c9ca3479fd6799325498b11f074689936.tar.gz |
-Namespaced all RDGE javascript.
-Removed the following unused files from the build script
/core/script/fx/blur.js
/core/script/fx/ssao.js
/core/script/animation.js
- Fully removed the following from the build and from source control as they are unused or no longer needed
/core/script/util/dbgpanel.js
/core/script/util/fpsTracker.js
/core/script/util/statTracker.js
/core/script/input.js
/core/script/TextureManager.js
/core/script/ubershader.js
Diffstat (limited to 'js/lib/rdge/materials/keleidoscope-material.js')
-rw-r--r-- | js/lib/rdge/materials/keleidoscope-material.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/lib/rdge/materials/keleidoscope-material.js b/js/lib/rdge/materials/keleidoscope-material.js index 3ef5d613..e1f4841f 100644 --- a/js/lib/rdge/materials/keleidoscope-material.js +++ b/js/lib/rdge/materials/keleidoscope-material.js | |||
@@ -55,12 +55,12 @@ var KeleidoscopeMaterial = function KeleidoscopeMaterial() { | |||
55 | if (world) this.setWorld( world ); | 55 | if (world) this.setWorld( world ); |
56 | 56 | ||
57 | // set up the shader | 57 | // set up the shader |
58 | this._shader = new jshader(); | 58 | this._shader = new RDGE.jshader(); |
59 | this._shader.def = keleidoscopeMaterialDef; | 59 | this._shader.def = keleidoscopeMaterialDef; |
60 | this._shader.init(); | 60 | this._shader.init(); |
61 | 61 | ||
62 | // set up the material node | 62 | // set up the material node |
63 | this._materialNode = createMaterialNode("keleidoscopeMaterial"); | 63 | this._materialNode = RDGE.createMaterialNode("keleidoscopeMaterial"); |
64 | this._materialNode.setShader(this._shader); | 64 | this._materialNode.setShader(this._shader); |
65 | 65 | ||
66 | this._time = 0; | 66 | this._time = 0; |
@@ -80,7 +80,7 @@ var KeleidoscopeMaterial = function KeleidoscopeMaterial() { | |||
80 | if (material) | 80 | if (material) |
81 | { | 81 | { |
82 | var technique = material.shaderProgram['default']; | 82 | var technique = material.shaderProgram['default']; |
83 | var renderer = g_Engine.getContext().renderer; | 83 | var renderer = RDGE.globals.engine.getContext().renderer; |
84 | if (renderer && technique) | 84 | if (renderer && technique) |
85 | { | 85 | { |
86 | if (this._shader && this._shader['default']) { | 86 | if (this._shader && this._shader['default']) { |