aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials/plasma-material.js
diff options
context:
space:
mode:
authorJohn Mayhew2012-04-02 14:57:31 -0700
committerJohn Mayhew2012-04-02 14:57:31 -0700
commitfb0a659c9ca3479fd6799325498b11f074689936 (patch)
tree46342298281aa93e48756e040715f42770ccc526 /js/lib/rdge/materials/plasma-material.js
parentc24f58c10231c30d3a8a4c9fb9a4f395dd746180 (diff)
downloadninja-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/plasma-material.js')
-rw-r--r--js/lib/rdge/materials/plasma-material.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/lib/rdge/materials/plasma-material.js b/js/lib/rdge/materials/plasma-material.js
index 9ecc2b48..d52f4b88 100644
--- a/js/lib/rdge/materials/plasma-material.js
+++ b/js/lib/rdge/materials/plasma-material.js
@@ -56,7 +56,7 @@ var PlasmaMaterial = function PlasmaMaterial() {
56 56
57 this.init = function() { 57 this.init = function() {
58 // set up the shader 58 // set up the shader
59 this._shader = new jshader(); 59 this._shader = new RDGE.jshader();
60 this._shader.def = plasmaShaderDef; 60 this._shader.def = plasmaShaderDef;
61 this._shader.init(); 61 this._shader.init();
62 62
@@ -66,7 +66,7 @@ var PlasmaMaterial = function PlasmaMaterial() {
66 this.setProperty( "color", [this._time, 0, 0, 1] ); 66 this.setProperty( "color", [this._time, 0, 0, 1] );
67 67
68 // set up the material node 68 // set up the material node
69 this._materialNode = createMaterialNode("plasmaMaterial"); 69 this._materialNode = RDGE.createMaterialNode("plasmaMaterial");
70 this._materialNode.setShader(this._shader); 70 this._materialNode.setShader(this._shader);
71 }; 71 };
72 72