From fb0a659c9ca3479fd6799325498b11f074689936 Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Mon, 2 Apr 2012 14:57:31 -0700 Subject: -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 --- js/lib/geom/circle.js | 6 +++--- js/lib/geom/line.js | 4 ++-- js/lib/geom/rectangle.js | 8 ++++---- js/lib/geom/shape-primitive.js | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'js/lib/geom') 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() { if (!world._useWebGL) return; // make sure RDGE has the correct context - g_Engine.setContext( world.getCanvas().rdgeid ); + RDGE.globals.engine.setContext( world.getCanvas().rdgeid ); // create the gl buffer var gl = world.getGLContext(); @@ -348,7 +348,7 @@ var Circle = function GLCircle() { this.recalcTexMapCoords( vrts, uvs ); - return ShapePrimitive.create(vrts, nrms, uvs, indices, g_Engine.getContext().renderer.TRIANGLES, index); + return ShapePrimitive.create(vrts, nrms, uvs, indices, RDGE.globals.engine.getContext().renderer.TRIANGLES, index); }; this.generateOvalRing = function(xOff, yOff, rotationMat, innerScaleMat, outerScaleMat, nTriangles) { @@ -405,7 +405,7 @@ var Circle = function GLCircle() { this.recalcTexMapCoords( vrts, uvs ); - return ShapePrimitive.create(vrts, nrms, uvs, indices, g_Engine.getContext().renderer.TRIANGLE_STRIP, indices.length); + return ShapePrimitive.create(vrts, nrms, uvs, indices, RDGE.globals.engine.getContext().renderer.TRIANGLE_STRIP, indices.length); }; this.render = function() { diff --git a/js/lib/geom/line.js b/js/lib/geom/line.js index da63b21c..e8d967f0 100755 --- a/js/lib/geom/line.js +++ b/js/lib/geom/line.js @@ -167,7 +167,7 @@ var Line = function GLLine( world, xOffset, yOffset, width, height, slope, strok if (!world._useWebGL) return; // make sure RDGE has the correct context - g_Engine.setContext( world.getCanvas().rdgeid ); + RDGE.globals.engine.setContext( world.getCanvas().rdgeid ); // create the gl buffer var gl = world.getGLContext(); @@ -328,7 +328,7 @@ var Line = function GLLine( world, xOffset, yOffset, width, height, slope, strok indices.push( index ); index++; } - var prim = ShapePrimitive.create(strokeVertices, strokeNormals, strokeTextures, indices, g_Engine.getContext().renderer.TRIANGLES, indices.length); + var prim = ShapePrimitive.create(strokeVertices, strokeNormals, strokeTextures, indices, RDGE.globals.engine.getContext().renderer.TRIANGLES, indices.length); var strokeMaterial = this.makeStrokeMaterial(); 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() { if (!world._useWebGL) return; // make sure RDGE has the correct context - g_Engine.setContext( world.getCanvas().rdgeid ); + RDGE.globals.engine.setContext( world.getCanvas().rdgeid ); // create the gl buffer var gl = world.getGLContext(); @@ -826,7 +826,7 @@ RectangleFill.create = function( rectCtr, width, height, tlRad, blRad, brRad, // } // create the RDGE primitive - return ShapePrimitive.create(this.vertices, this.normals, this.uvs, this.indices, g_Engine.getContext().renderer.TRIANGLES, nVertices); + return ShapePrimitive.create(this.vertices, this.normals, this.uvs, this.indices, RDGE.globals.engine.getContext().renderer.TRIANGLES, nVertices); }; RectangleFill.pushVertex = function( x, y, z ) { @@ -1058,7 +1058,7 @@ RectangleStroke.create = function( rectCtr, width, height, strokeWidth, tlRad, // } // create the RDGE primitive - return ShapePrimitive.create(this.vertices, this.normals, this.uvs, this.indices, g_Engine.getContext().renderer.TRIANGLES, nVertices); + return ShapePrimitive.create(this.vertices, this.normals, this.uvs, this.indices, RDGE.globals.engine.getContext().renderer.TRIANGLES, nVertices); }; RectangleStroke.getRoundedCorner = function( ctr, insidePt, outsidePt ) { @@ -1144,7 +1144,7 @@ RectangleGeometry.create = function( ctr, width, height, material ) { // } // create the RDGE primitive - return ShapePrimitive.create(this.vertices, this.normals, this.uvs, this.indices, g_Engine.getContext().renderer.TRIANGLES, nVertices); + return ShapePrimitive.create(this.vertices, this.normals, this.uvs, this.indices, RDGE.globals.engine.getContext().renderer.TRIANGLES, nVertices); }; RectangleGeometry.pushVertex = RectangleFill.pushVertex; diff --git a/js/lib/geom/shape-primitive.js b/js/lib/geom/shape-primitive.js index bf0087b2..97873d32 100644 --- a/js/lib/geom/shape-primitive.js +++ b/js/lib/geom/shape-primitive.js @@ -8,11 +8,11 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot var ShapePrimitive = {}; ShapePrimitive.create = function(coords, normals, uvs, indices, primType, vertexCount) { - var renderer = g_Engine.getContext().renderer; + var renderer = RDGE.globals.engine.getContext().renderer; // to setup a primitive you must define it // create a new primitive definition here to then fill out - var prim = new rdgePrimitiveDefinition(); + var prim = new RDGE.rdgePrimitiveDefinition(); // the vertex definition declares how the data will be delivered to the shader // the position of an element in array determines which attribute in a shader the -- cgit v1.2.3