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/radial-blur-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/radial-blur-material.js')
-rw-r--r-- | js/lib/rdge/materials/radial-blur-material.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/js/lib/rdge/materials/radial-blur-material.js b/js/lib/rdge/materials/radial-blur-material.js index 41e68182..3adb6bb5 100644 --- a/js/lib/rdge/materials/radial-blur-material.js +++ b/js/lib/rdge/materials/radial-blur-material.js | |||
@@ -89,12 +89,12 @@ var RadialBlurMaterial = function RadialBlurMaterial() { | |||
89 | if (world) this.setWorld( world ); | 89 | if (world) this.setWorld( world ); |
90 | 90 | ||
91 | // set up the shader | 91 | // set up the shader |
92 | this._shader = new jshader(); | 92 | this._shader = new RDGE.jshader(); |
93 | this._shader.def = radialBlurMaterialDef; | 93 | this._shader.def = radialBlurMaterialDef; |
94 | this._shader.init(); | 94 | this._shader.init(); |
95 | 95 | ||
96 | // set up the material node | 96 | // set up the material node |
97 | this._materialNode = createMaterialNode("radialBlurMaterial"); | 97 | this._materialNode = RDGE.createMaterialNode("radialBlurMaterial"); |
98 | this._materialNode.setShader(this._shader); | 98 | this._materialNode.setShader(this._shader); |
99 | 99 | ||
100 | this._time = 0; | 100 | this._time = 0; |
@@ -112,7 +112,7 @@ var RadialBlurMaterial = function RadialBlurMaterial() { | |||
112 | var material = this._materialNode; | 112 | var material = this._materialNode; |
113 | if (material) { | 113 | if (material) { |
114 | var technique = material.shaderProgram['default']; | 114 | var technique = material.shaderProgram['default']; |
115 | var renderer = g_Engine.getContext().renderer; | 115 | var renderer = RDGE.globals.engine.getContext().renderer; |
116 | if (renderer && technique) { | 116 | if (renderer && technique) { |
117 | var texMapName = this._propValues[this._propNames[0]]; | 117 | var texMapName = this._propValues[this._propNames[0]]; |
118 | var tex = renderer.getTextureByName(texMapName, 'REPEAT'); | 118 | var tex = renderer.getTextureByName(texMapName, 'REPEAT'); |
@@ -130,7 +130,7 @@ var RadialBlurMaterial = function RadialBlurMaterial() { | |||
130 | var material = this._materialNode; | 130 | var material = this._materialNode; |
131 | if (material) { | 131 | if (material) { |
132 | var technique = material.shaderProgram['default']; | 132 | var technique = material.shaderProgram['default']; |
133 | var renderer = g_Engine.getContext().renderer; | 133 | var renderer = RDGE.globals.engine.getContext().renderer; |
134 | if (renderer && technique) { | 134 | if (renderer && technique) { |
135 | if (this._shader && this._shader['default']) { | 135 | if (this._shader && this._shader['default']) { |
136 | this._shader['default'].u_time.set( [this._time] ); | 136 | this._shader['default'].u_time.set( [this._time] ); |
@@ -150,7 +150,7 @@ var RadialBlurMaterial = function RadialBlurMaterial() { | |||
150 | if (material) | 150 | if (material) |
151 | { | 151 | { |
152 | var technique = material.shaderProgram['default']; | 152 | var technique = material.shaderProgram['default']; |
153 | var renderer = g_Engine.getContext().renderer; | 153 | var renderer = RDGE.globals.engine.getContext().renderer; |
154 | if (renderer && technique) { | 154 | if (renderer && technique) { |
155 | technique.u_resolution.set( res ); | 155 | technique.u_resolution.set( res ); |
156 | } | 156 | } |