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/mandel-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/mandel-material.js')
-rw-r--r-- | js/lib/rdge/materials/mandel-material.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/lib/rdge/materials/mandel-material.js b/js/lib/rdge/materials/mandel-material.js index 07e009a2..c4d5bf6f 100644 --- a/js/lib/rdge/materials/mandel-material.js +++ b/js/lib/rdge/materials/mandel-material.js | |||
@@ -61,12 +61,12 @@ var MandelMaterial = function MandelMaterial() { | |||
61 | if (world) this.setWorld( world ); | 61 | if (world) this.setWorld( world ); |
62 | 62 | ||
63 | // set up the shader | 63 | // set up the shader |
64 | this._shader = new jshader(); | 64 | this._shader = new RDGE.jshader(); |
65 | this._shader.def = MandelMaterialDef; | 65 | this._shader.def = MandelMaterialDef; |
66 | this._shader.init(); | 66 | this._shader.init(); |
67 | 67 | ||
68 | // set up the material node | 68 | // set up the material node |
69 | this._materialNode = createMaterialNode("mandelMaterial"); | 69 | this._materialNode = RDGE.createMaterialNode("mandelMaterial"); |
70 | this._materialNode.setShader(this._shader); | 70 | this._materialNode.setShader(this._shader); |
71 | 71 | ||
72 | this._time = 0; | 72 | this._time = 0; |
@@ -83,7 +83,7 @@ var MandelMaterial = function MandelMaterial() { | |||
83 | var material = this._materialNode; | 83 | var material = this._materialNode; |
84 | if (material) { | 84 | if (material) { |
85 | var technique = material.shaderProgram['default']; | 85 | var technique = material.shaderProgram['default']; |
86 | var renderer = g_Engine.getContext().renderer; | 86 | var renderer = RDGE.globals.engine.getContext().renderer; |
87 | if (renderer && technique) { | 87 | if (renderer && technique) { |
88 | if (this._shader && this._shader['default']) | 88 | if (this._shader && this._shader['default']) |
89 | this._shader['default'].u_time.set( [this._time] ); | 89 | this._shader['default'].u_time.set( [this._time] ); |