aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Mayhew2012-04-02 14:57:31 -0700
committerJohn Mayhew2012-04-02 14:57:31 -0700
commitfb0a659c9ca3479fd6799325498b11f074689936 (patch)
tree46342298281aa93e48756e040715f42770ccc526
parentc24f58c10231c30d3a8a4c9fb9a4f395dd746180 (diff)
downloadninja-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
-rwxr-xr-xindex.html37
-rw-r--r--js/helper-classes/RDGE/runtime/GLRuntime.js26
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/MeshManager.js255
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/RenderInitProcs.js476
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/RenderProcs.js787
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/ScreenQuad.js32
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/ShaderManager.js124
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/TextureManager.js6
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/animation.js191
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/box.js181
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/camera.js468
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/engine.js513
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/fx/blur.js283
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/fx/ssao.js211
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/init_state.js553
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/input.js117
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/jpass.js771
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/jshader.js260
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/lightmanager.js148
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/math/mat4.js1055
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/math/quat.js237
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/math/vec2.js229
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/math/vec3.js423
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/math/vec4.js315
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/objectManager.js8
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/particle.js1591
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/precompiled.js123
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/renderUtils.js644
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/rendercontext.js454
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/renderer.js2299
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/run_state.js711
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/runtime.js280
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/scenegraph.js1754
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/scenegraphNodes.js1016
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/shadowLight.js90
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/sockets.js243
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/ubershader.js159
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/util/dbgpanel.js237
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/util/fpsTracker.js51
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/util/statTracker.js338
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/utilities.js282
-rw-r--r--js/helper-classes/RDGE/src/tools/compile-rdge-core.bat2
-rw-r--r--js/helper-classes/RDGE/src/tools/compile-rdge-core.sh2
-rwxr-xr-xjs/lib/drawing/world.js58
-rwxr-xr-xjs/lib/geom/circle.js6
-rwxr-xr-xjs/lib/geom/line.js4
-rwxr-xr-xjs/lib/geom/rectangle.js8
-rw-r--r--js/lib/geom/shape-primitive.js4
-rwxr-xr-xjs/lib/rdge/materials/bump-metal-material.js6
-rw-r--r--js/lib/rdge/materials/deform-material.js4
-rwxr-xr-xjs/lib/rdge/materials/flat-material.js4
-rw-r--r--js/lib/rdge/materials/fly-material.js4
-rw-r--r--js/lib/rdge/materials/julia-material.js6
-rw-r--r--js/lib/rdge/materials/keleidoscope-material.js6
-rwxr-xr-xjs/lib/rdge/materials/linear-gradient-material.js4
-rw-r--r--js/lib/rdge/materials/mandel-material.js6
-rw-r--r--js/lib/rdge/materials/plasma-material.js4
-rw-r--r--js/lib/rdge/materials/pulse-material.js10
-rw-r--r--js/lib/rdge/materials/radial-blur-material.js10
-rwxr-xr-xjs/lib/rdge/materials/radial-gradient-material.js4
-rw-r--r--js/lib/rdge/materials/relief-tunnel-material.js4
-rw-r--r--js/lib/rdge/materials/square-tunnel-material.js4
-rw-r--r--js/lib/rdge/materials/star-material.js4
-rw-r--r--js/lib/rdge/materials/taper-material.js4
-rw-r--r--js/lib/rdge/materials/tunnel-material.js4
-rw-r--r--js/lib/rdge/materials/twist-material.js6
-rw-r--r--js/lib/rdge/materials/twist-vert-material.js6
-rwxr-xr-xjs/lib/rdge/materials/uber-material.js16
-rw-r--r--js/lib/rdge/materials/water-material.js4
-rw-r--r--js/lib/rdge/materials/z-invert-material.js6
-rwxr-xr-xjs/preloader/Preloader.js8
71 files changed, 8228 insertions, 9968 deletions
diff --git a/index.html b/index.html
index d385e4ba..b370823b 100755
--- a/index.html
+++ b/index.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -176,7 +176,40 @@
176 </script> 176 </script>
177 177
178 <script type="text/javascript" src="js/helper-classes/3D/GLMatrix/gl-matrix.js"></script> 178 <script type="text/javascript" src="js/helper-classes/3D/GLMatrix/gl-matrix.js"></script>
179 <script type="text/javascript" src="js/helper-classes/RDGE/rdge-compiled.js"></script> 179
180 <!-- Ridge Compiled -->
181 <!--<script type="text/javascript" src="js/helper-classes/RDGE/rdge-compiled.js"></script>-->
182 <!-- Ridge Uncompiled -->
183 <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/math/vec2.js"></script>
184 <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/math/vec3.js"></script>
185 <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/math/vec4.js"></script>
186 <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/math/mat4.js"></script>
187 <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/math/quat.js"></script>
188 <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/objectManager.js"></script>
189 <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/precompiled.js"></script>
190 <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/renderer.js"></script>
191 <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/renderUtils.js"></script>
192 <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/jshader.js"></script>
193 <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/jpass.js"></script>
194 <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/RenderProcs.js"></script>
195 <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/RenderInitProcs.js"></script>
196 <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/MeshManager.js"></script>
197 <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/ShaderManager.js"></script>
198 <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/ScreenQuad.js"></script>
199 <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/box.js"></script>
200 <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/camera.js"></script>
201 <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/shadowLight.js"></script>
202 <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/utilities.js"></script>
203 <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/engine.js"></script>
204 <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/scenegraphNodes.js"></script>
205 <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/scenegraph.js"></script>
206 <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/lightmanager.js"></script>
207 <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/rendercontext.js"></script>
208 <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/particle.js"></script>
209 <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/run_state.js"></script>
210 <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/init_state.js"></script>
211 <script type="text/javascript" src="js/helper-classes/RDGE/src/core/script/runtime.js"></script>
212 <!-- End Ridge Uncompiled -->
180 213
181 <script type="text/javascript" src="imports/codemirror/lib/codemirror.js"></script> 214 <script type="text/javascript" src="imports/codemirror/lib/codemirror.js"></script>
182 <script type="text/javascript" src="imports/codemirror/mode/htmlmixed/htmlmixed.js"></script> 215 <script type="text/javascript" src="imports/codemirror/mode/htmlmixed/htmlmixed.js"></script>
diff --git a/js/helper-classes/RDGE/runtime/GLRuntime.js b/js/helper-classes/RDGE/runtime/GLRuntime.js
index 5c99be02..80162f91 100644
--- a/js/helper-classes/RDGE/runtime/GLRuntime.js
+++ b/js/helper-classes/RDGE/runtime/GLRuntime.js
@@ -31,8 +31,8 @@ function GLRuntime( canvas, importStr )
31 /////////////////////////////////////////////////////////////////////// 31 ///////////////////////////////////////////////////////////////////////
32 var id = canvas.getAttribute( "data-RDGE-id" ); 32 var id = canvas.getAttribute( "data-RDGE-id" );
33 canvas.rdgeid = id; 33 canvas.rdgeid = id;
34 g_Engine.registerCanvas(canvas, this); 34 RDGE.globals.engine.registerCanvas(canvas, this);
35 RDGEStart( canvas ); 35 RDGE.RDGEStart( canvas );
36 36
37 this.loadScene = function() 37 this.loadScene = function()
38 { 38 {
@@ -53,16 +53,16 @@ function GLRuntime( canvas, importStr )
53 53
54 this.init = function() 54 this.init = function()
55 { 55 {
56 var ctx1 = g_Engine.ctxMan.handleToObject(this._canvas.rdgeCtxHandle), 56 var ctx1 = RDGE.globals.engine.ctxMan.handleToObject(this._canvas.rdgeCtxHandle),
57 ctx2 = g_Engine.getContext(); 57 ctx2 = RDGE.globals.engine.getContext();
58 if (ctx1 != ctx2) console.log( "***** different contexts *****" ); 58 if (ctx1 != ctx2) console.log( "***** different contexts *****" );
59 this.renderer = ctx1.renderer; 59 this.renderer = ctx1.renderer;
60 60
61 // create a camera, set its perspective, and then point it at the origin 61 // create a camera, set its perspective, and then point it at the origin
62 var cam = new camera(); 62 var cam = new RDGE.camera();
63 this._camera = cam; 63 this._camera = cam;
64 cam.setPerspective(this.getFOV(), this.getAspect(), this.getZNear(), this.getZFar()); 64 cam.setPerspective(this.getFOV(), this.getAspect(), this.getZNear(), this.getZFar());
65 cam.setLookAt([0, 0, this.getViewDistance()], [0, 0, 0], vec3.up()); 65 cam.setLookAt([0, 0, this.getViewDistance()], [0, 0, 0], RDGE.vec3.up());
66 66
67 // make this camera the active camera 67 // make this camera the active camera
68 this.renderer.cameraManager().setActiveCamera(cam); 68 this.renderer.cameraManager().setActiveCamera(cam);
@@ -77,17 +77,17 @@ function GLRuntime( canvas, importStr )
77 /* 77 /*
78 // create some lights 78 // create some lights