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/rectangle.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/rectangle.js')
-rwxr-xr-x | js/lib/geom/rectangle.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/lib/geom/rectangle.js b/js/lib/geom/rectangle.js index 81b385b3..98621a98 100755 --- a/js/lib/geom/rectangle.js +++ b/js/lib/geom/rectangle.js | |||
@@ -276,7 +276,7 @@ var Rectangle = function GLRectangle() { | |||
276 | if (!world._useWebGL) return; | 276 | if (!world._useWebGL) return; |
277 | 277 | ||
278 | // make sure RDGE has the correct context | 278 | // make sure RDGE has the correct context |
279 | g_Engine.setContext( world.getCanvas().rdgeid ); | 279 | RDGE.globals.engine.setContext( world.getCanvas().rdgeid ); |
280 | 280 | ||
281 | // create the gl buffer | 281 | // create the gl buffer |
282 | var gl = world.getGLContext(); | 282 | var gl = world.getGLContext(); |
@@ -826,7 +826,7 @@ RectangleFill.create = function( rectCtr, width, height, tlRad, blRad, brRad, | |||
826 | // } | 826 | // } |
827 | 827 | ||
828 | // create the RDGE primitive | 828 | // create the RDGE primitive |
829 | return ShapePrimitive.create(this.vertices, this.normals, this.uvs, this.indices, g_Engine.getContext().renderer.TRIANGLES, nVertices); | 829 | return ShapePrimitive.create(this.vertices, this.normals, this.uvs, this.indices, RDGE.globals.engine.getContext().renderer.TRIANGLES, nVertices); |
830 | }; | 830 | }; |
831 | 831 | ||
832 | RectangleFill.pushVertex = function( x, y, z ) { | 832 | RectangleFill.pushVertex = function( x, y, z ) { |
@@ -1058,7 +1058,7 @@ RectangleStroke.create = function( rectCtr, width, height, strokeWidth, tlRad, | |||
1058 | // } | 1058 | // } |
1059 | 1059 | ||
1060 | // create the RDGE primitive | 1060 | // create the RDGE primitive |
1061 | return ShapePrimitive.create(this.vertices, this.normals, this.uvs, this.indices, g_Engine.getContext().renderer.TRIANGLES, nVertices); | 1061 | return ShapePrimitive.create(this.vertices, this.normals, this.uvs, this.indices, RDGE.globals.engine.getContext().renderer.TRIANGLES, nVertices); |
1062 | }; | 1062 | }; |
1063 | 1063 | ||
1064 | RectangleStroke.getRoundedCorner = function( ctr, insidePt, outsidePt ) { | 1064 | RectangleStroke.getRoundedCorner = function( ctr, insidePt, outsidePt ) { |
@@ -1144,7 +1144,7 @@ RectangleGeometry.create = function( ctr, width, height, material ) { | |||
1144 | // } | 1144 | // } |
1145 | 1145 | ||
1146 | // create the RDGE primitive | 1146 | // create the RDGE primitive |
1147 | return ShapePrimitive.create(this.vertices, this.normals, this.uvs, this.indices, g_Engine.getContext().renderer.TRIANGLES, nVertices); | 1147 | return ShapePrimitive.create(this.vertices, this.normals, this.uvs, this.indices, RDGE.globals.engine.getContext().renderer.TRIANGLES, nVertices); |
1148 | }; | 1148 | }; |
1149 | 1149 | ||
1150 | RectangleGeometry.pushVertex = RectangleFill.pushVertex; | 1150 | RectangleGeometry.pushVertex = RectangleFill.pushVertex; |