aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials/twist-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/twist-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/twist-material.js')
-rw-r--r--js/lib/rdge/materials/twist-material.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/lib/rdge/materials/twist-material.js b/js/lib/rdge/materials/twist-material.js
index eb562e99..8648d60b 100644
--- a/js/lib/rdge/materials/twist-material.js
+++ b/js/lib/rdge/materials/twist-material.js
@@ -51,12 +51,12 @@ var TwistMaterial = function TwistMaterial() {
51 if (world) this.setWorld( world ); 51 if (world) this.setWorld( world );
52 52
53 // set up the shader 53 // set up the shader
54 this._shader = new jshader(); 54 this._shader = new RDGE.jshader();
55 this._shader.def = twistMaterialDef; 55 this._shader.def = twistMaterialDef;
56 this._shader.init(); 56 this._shader.init();
57 57
58 // set up the material node 58 // set up the material node
59 this._materialNode = createMaterialNode("twistMaterial"); 59 this._materialNode = RDGE.createMaterialNode("twistMaterial");
60 this._materialNode.setShader(this._shader); 60 this._materialNode.setShader(this._shader);
61 61
62 this._time = 0; 62 this._time = 0;
@@ -75,7 +75,7 @@ var TwistMaterial = function TwistMaterial() {
75 if (material) 75 if (material)
76 { 76 {
77 var technique = material.shaderProgram['default']; 77 var technique = material.shaderProgram['default'];
78 var renderer = g_Engine.getContext().renderer; 78 var renderer = RDGE.globals.engine.getContext().renderer;
79 if (renderer && technique) { 79 if (renderer && technique) {
80 if (this._shader && this._shader['default']) 80 if (this._shader && this._shader['default'])
81 this._shader['default'].u_time.set( [this._time] ); 81 this._shader['default'].u_time.set( [this._time] );