aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials/bump-metal-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/bump-metal-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/bump-metal-material.js')
-rwxr-xr-xjs/lib/rdge/materials/bump-metal-material.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/lib/rdge/materials/bump-metal-material.js b/js/lib/rdge/materials/bump-metal-material.js
index 61126952..e0ca8d4a 100755
--- a/js/lib/rdge/materials/bump-metal-material.js
+++ b/js/lib/rdge/materials/bump-metal-material.js
@@ -110,13 +110,13 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
110 if (world) this.setWorld( world ); 110 if (world) this.setWorld( world );
111 111
112 // set up the shader 112 // set up the shader
113 this._shader = new jshader(); 113 this._shader = new RDGE.jshader();
114 this._shader.def = bumpMetalMaterialDef; 114 this._shader.def = bumpMetalMaterialDef;
115 this._shader.init(); 115 this._shader.init();
116 this._shader['default'].u_light0Diff.set( this.getLightDiff() ); 116 this._shader['default'].u_light0Diff.set( this.getLightDiff() );
117 117
118 // set up the material node 118 // set up the material node
119 this._materialNode = createMaterialNode( this.getShaderName() ); 119 this._materialNode = RDGE.createMaterialNode(this.getShaderName());
120 this._materialNode.setShader(this._shader); 120 this._materialNode.setShader(this._shader);
121 121
122 // set some image maps 122 // set some image maps
@@ -131,7 +131,7 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
131 if (material) 131 if (material)
132 { 132 {
133 var technique = material.shaderProgram['default']; 133 var technique = material.shaderProgram['default'];
134 var renderer = g_Engine.getContext().renderer; 134 var renderer = RDGE.globals.engine.getContext().renderer;
135 if (renderer && technique) 135 if (renderer && technique)
136 { 136 {
137 var texMapName = this._propValues[this._propNames[index]]; 137 var texMapName = this._propValues[this._propNames[index]];