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/flat-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/flat-material.js')
-rwxr-xr-x | js/lib/rdge/materials/flat-material.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/lib/rdge/materials/flat-material.js b/js/lib/rdge/materials/flat-material.js index be8bf2b8..bc612476 100755 --- a/js/lib/rdge/materials/flat-material.js +++ b/js/lib/rdge/materials/flat-material.js | |||
@@ -39,7 +39,7 @@ var FlatMaterial = function FlatMaterial() { | |||
39 | this.init = function() | 39 | this.init = function() |
40 | { | 40 | { |
41 | // set up the shader | 41 | // set up the shader |
42 | this._shader = new jshader(); | 42 | this._shader = new RDGE.jshader(); |
43 | this._shader.def = flatShaderDef; | 43 | this._shader.def = flatShaderDef; |
44 | this._shader.init(); | 44 | this._shader.init(); |
45 | 45 | ||
@@ -47,7 +47,7 @@ var FlatMaterial = function FlatMaterial() { | |||
47 | this._shader.colorMe.color.set( this.getColor() ); | 47 | this._shader.colorMe.color.set( this.getColor() ); |
48 | 48 | ||
49 | // set up the material node | 49 | // set up the material node |
50 | this._materialNode = createMaterialNode("flatMaterial"); | 50 | this._materialNode = RDGE.createMaterialNode("flatMaterial"); |
51 | this._materialNode.setShader(this._shader); | 51 | this._materialNode.setShader(this._shader); |
52 | }; | 52 | }; |
53 | 53 | ||