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/pulse-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/pulse-material.js')
-rw-r--r-- | js/lib/rdge/materials/pulse-material.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/js/lib/rdge/materials/pulse-material.js b/js/lib/rdge/materials/pulse-material.js index 63cab2f4..89cbaea4 100644 --- a/js/lib/rdge/materials/pulse-material.js +++ b/js/lib/rdge/materials/pulse-material.js | |||
@@ -96,12 +96,12 @@ var PulseMaterial = function PulseMaterial() { | |||
96 | this._dTime = 0.01; | 96 | this._dTime = 0.01; |
97 | 97 | ||
98 | // set up the shader | 98 | // set up the shader |
99 | this._shader = new jshader(); | 99 | this._shader = new RDGE.jshader(); |
100 | this._shader.def = pulseMaterialDef; | 100 | this._shader.def = pulseMaterialDef; |
101 | this._shader.init(); | 101 | this._shader.init(); |
102 | 102 | ||
103 | // set up the material node | 103 | // set up the material node |
104 | this._materialNode = createMaterialNode("pulseMaterial"); | 104 | this._materialNode = RDGE.createMaterialNode("pulseMaterial"); |
105 | this._materialNode.setShader(this._shader); | 105 | this._materialNode.setShader(this._shader); |
106 | 106 | ||
107 | this._time = 0; | 107 | this._time = 0; |
@@ -120,7 +120,7 @@ var PulseMaterial = function PulseMaterial() { | |||
120 | var material = this._materialNode; | 120 | var material = this._materialNode; |
121 | if (material) { | 121 | if (material) { |
122 | var technique = material.shaderProgram['default']; | 122 | var technique = material.shaderProgram['default']; |
123 | var renderer = g_Engine.getContext().renderer; | 123 | var renderer = RDGE.globals.engine.getContext().renderer; |
124 | if (renderer && technique) { | 124 | if (renderer && technique) { |
125 | var texMapName = this._propValues[this._propNames[0]]; | 125 | var texMapName = this._propValues[this._propNames[0]]; |
126 | var wrap = 'REPEAT', mips = true; | 126 | var wrap = 'REPEAT', mips = true; |
@@ -151,7 +151,7 @@ var PulseMaterial = function PulseMaterial() { | |||
151 | if (material) | 151 | if (material) |
152 | { | 152 | { |
153 | var technique = material.shaderProgram['default']; | 153 | var technique = material.shaderProgram['default']; |
154 | var renderer = g_Engine.getContext().renderer; | 154 | var renderer = RDGE.globals.engine.getContext().renderer; |
155 | if (renderer && technique) { | 155 | if (renderer && technique) { |
156 | if (this._shader && this._shader['default']) { | 156 | if (this._shader && this._shader['default']) { |
157 | this._shader['default'].u_time.set( [this._time] ); | 157 | this._shader['default'].u_time.set( [this._time] ); |
@@ -167,7 +167,7 @@ var PulseMaterial = function PulseMaterial() { | |||
167 | var material = this._materialNode; | 167 | var material = this._materialNode; |
168 | if (material) { | 168 | if (material) { |
169 | var technique = material.shaderProgram['default']; | 169 | var technique = material.shaderProgram['default']; |
170 | var renderer = g_Engine.getContext().renderer; | 170 | var renderer = RDGE.globals.engine.getContext().renderer; |
171 | if (renderer && technique) { | 171 | if (renderer && technique) { |
172 | technique.u_resolution.set( res ); | 172 | technique.u_resolution.set( res ); |
173 | } | 173 | } |