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/twist-vert-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/twist-vert-material.js')
-rw-r--r-- | js/lib/rdge/materials/twist-vert-material.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/lib/rdge/materials/twist-vert-material.js b/js/lib/rdge/materials/twist-vert-material.js index c2573071..1f7b06b1 100644 --- a/js/lib/rdge/materials/twist-vert-material.js +++ b/js/lib/rdge/materials/twist-vert-material.js | |||
@@ -49,7 +49,7 @@ function TwistVertMaterial() | |||
49 | this.init = function() | 49 | this.init = function() |
50 | { | 50 | { |
51 | // set up the shader | 51 | // set up the shader |
52 | this._shader = new jshader(); | 52 | this._shader = new RDGE.jshader(); |
53 | this._shader.def = twistVertShaderDef; | 53 | this._shader.def = twistVertShaderDef; |
54 | this._shader.init(); | 54 | this._shader.init(); |
55 | 55 | ||
@@ -57,7 +57,7 @@ function TwistVertMaterial() | |||
57 | this._shader.twistMe.color.set( this.getColor() ); | 57 | this._shader.twistMe.color.set( this.getColor() ); |
58 | 58 | ||
59 | // set up the material node | 59 | // set up the material node |
60 | this._materialNode = createMaterialNode("twistVertMaterial"); | 60 | this._materialNode = RDGE.createMaterialNode("twistVertMaterial"); |
61 | this._materialNode.setShader(this._shader); | 61 | this._materialNode.setShader(this._shader); |
62 | 62 | ||
63 | // initialize the twist vert properties | 63 | // initialize the twist vert properties |
@@ -189,7 +189,7 @@ function TwistVertMaterial() | |||
189 | if (material) | 189 | if (material) |
190 | { | 190 | { |
191 | var technique = material.shaderProgram['default']; | 191 | var technique = material.shaderProgram['default']; |
192 | var renderer = g_Engine.getContext().renderer; | 192 | var renderer = RDGE.globals.engine.getContext().renderer; |
193 | if (renderer && technique) | 193 | if (renderer && technique) |
194 | { | 194 | { |
195 | var texMapName = this._propValues[this._propNames[5]]; | 195 | var texMapName = this._propValues[this._propNames[5]]; |