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/geom/circle.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/geom/circle.js')
-rwxr-xr-x | js/lib/geom/circle.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/lib/geom/circle.js b/js/lib/geom/circle.js index dd82a4cc..52c2d449 100755 --- a/js/lib/geom/circle.js +++ b/js/lib/geom/circle.js | |||
@@ -176,7 +176,7 @@ var Circle = function GLCircle() { | |||
176 | if (!world._useWebGL) return; | 176 | if (!world._useWebGL) return; |
177 | 177 | ||
178 | // make sure RDGE has the correct context | 178 | // make sure RDGE has the correct context |
179 | g_Engine.setContext( world.getCanvas().rdgeid ); | 179 | RDGE.globals.engine.setContext( world.getCanvas().rdgeid ); |
180 | 180 | ||
181 | // create the gl buffer | 181 | // create the gl buffer |
182 | var gl = world.getGLContext(); | 182 | var gl = world.getGLContext(); |
@@ -348,7 +348,7 @@ var Circle = function GLCircle() { | |||
348 | 348 | ||
349 | this.recalcTexMapCoords( vrts, uvs ); | 349 | this.recalcTexMapCoords( vrts, uvs ); |
350 | 350 | ||
351 | return ShapePrimitive.create(vrts, nrms, uvs, indices, g_Engine.getContext().renderer.TRIANGLES, index); | 351 | return ShapePrimitive.create(vrts, nrms, uvs, indices, RDGE.globals.engine.getContext().renderer.TRIANGLES, index); |
352 | }; | 352 | }; |
353 | 353 | ||
354 | this.generateOvalRing = function(xOff, yOff, rotationMat, innerScaleMat, outerScaleMat, nTriangles) { | 354 | this.generateOvalRing = function(xOff, yOff, rotationMat, innerScaleMat, outerScaleMat, nTriangles) { |
@@ -405,7 +405,7 @@ var Circle = function GLCircle() { | |||
405 | 405 | ||
406 | this.recalcTexMapCoords( vrts, uvs ); | 406 | this.recalcTexMapCoords( vrts, uvs ); |
407 | 407 | ||
408 | return ShapePrimitive.create(vrts, nrms, uvs, indices, g_Engine.getContext().renderer.TRIANGLE_STRIP, indices.length); | 408 | return ShapePrimitive.create(vrts, nrms, uvs, indices, RDGE.globals.engine.getContext().renderer.TRIANGLE_STRIP, indices.length); |
409 | }; | 409 | }; |
410 | 410 | ||
411 | this.render = function() { | 411 | this.render = function() { |