41 files changed, 8077 insertions, 9842 deletions

diff --git a/js/helper-classes/RDGE/src/core/script/MeshManager.js b/js/helper-classes/RDGE/src/core/script/MeshManager.js
index 43813078..2c31781e 100755
--- a/js/helper-classes/RDGE/src/core/script/MeshManager.js
+++ b/js/helper-classes/RDGE/src/core/script/MeshManager.js
@@ -4,86 +4,80 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.

 </copyright> */

 

-function Model(name, mesh) 

-{

+// RDGE namespaces

+var RDGE = RDGE || {};

+

+RDGE.Model = function (name, mesh) {

     this.name = name;

     this.mesh = mesh;

     this.camera = null;

-}

+};

 

 /*

- *      Maintains a list of meshes to allow instancing of data

- */

-function MeshManager() {

-    this.contentUrl                                     = "assets_web/mesh/";

-    this.modelMap                                       = {};

-    this.readyList                                      = [];           // meshes that have data ready

-    this.meshesLoading                          = true;         // indicates that no meshes have loaded or that they are still loading

-    this.postMeshLoadCallbackList       = [];

-    this.tempSphere                                     = null;

-    this.requestCounter                         = 0;

-}

+*       Maintains a list of meshes to allow instancing of data

+*/

+RDGE.MeshManager = function () {

+    this.contentUrl = "assets_web/mesh/";

+    this.modelMap = {};

+    this.readyList = [];        // meshes that have data ready

+    this.meshesLoading = true;  // indicates that no meshes have loaded or that they are still loading

+    this.postMeshLoadCallbackList = [];

+    this.tempSphere = null;

+    this.requestCounter = 0;

+};

 

 /*

- * Pass the scene meshNode stump, loads temp object while real mesh is downloading

- */

-MeshManager.prototype.loadMesh = function (meshStump, tempMesh) 

-{

+* Pass the scene meshNode stump, loads temp object while real mesh is downloading

+*/

+RDGE.MeshManager.prototype.loadMesh = function (meshStump, tempMesh) {

     // if it exists already, return the mesh requested

-    if ( this.modelMap[meshStump.name] !== undefined )

+    if (this.modelMap[meshStump.name] !== undefined)

         return this.modelMap[meshStump.name];

 

     meshStump.ready = false;

     meshStump.addr = this.contentUrl + meshStump.name + "_mesh.json";

-    meshStump.ctxID = g_Engine.getContext().renderer.id;

-

-        // sets a temp mesh up in place of the final mesh to load

-    if (!tempMesh) 

-    {

-        if (this.tempSphere == null) 

-        {

-            this.tempSphere = makeSphere(g_Engine.getContext().renderer.ctx, 25, 5, 5);

+    meshStump.ctxID = RDGE.globals.engine.getContext().renderer.id;

+

+    // sets a temp mesh up in place of the final mesh to load

+    if (!tempMesh) {

+        if (this.tempSphere == null) {

+            this.tempSphere = RDGE.renderUtils.makeSphere(RDGE.globals.engine.getContext().renderer.ctx, 25, 5, 5);

         }

 

         tempMesh = this.tempSphere;

     }

 

-        // add the temp mesh to the map of loaded meshes

+    // add the temp mesh to the map of loaded meshes

     this.modelMap[meshStump.name] = tempMesh;

-    

+

     // update the request counter - we now have one more mesh to load

     this.requestCounter++;

 

-    requestMesh(meshStump);

+    RDGE.requestMesh(meshStump);

 

     return null;

 };

 

 /*

- * Deletes the passed mesh from the manager as well as all renderers

- */

-MeshManager.prototype.deleteMesh = function (name) 

-{

-        var model = this.modelMap[name];

-        

-        if (model)

-        {

-                g_Engine.ctxMan.forEach(function(context)

-                {
-                        context.renderer.deletePrimitive(model.primitive);

-                });

-

-                delete this.modelMap[name];

-        }

+* Deletes the passed mesh from the manager as well as all renderers

+*/

+RDGE.MeshManager.prototype.deleteMesh = function (name) {

+    var model = this.modelMap[name];

+

+    if (model) {

+        RDGE.globals.engine.ctxMan.forEach(function (context) {

+            context.renderer.deletePrimitive(model.primitive);

+        });

+

+        delete this.modelMap[name];

+    }

 };

 

-MeshManager.prototype.getModelByName = function (name) 

-{

+RDGE.MeshManager.prototype.getModelByName = function (name) {

     return this.modelMap[name];

 };

 

-MeshManager.prototype.getModelNames = function () 

-{

+RDGE.MeshManager.prototype.getModelNames = function () {

     var names = [];

     for (var index in this.modelMap) {

         names.push(this.modelList[index].name);

@@ -93,134 +87,121 @@ MeshManager.prototype.getModelNames = function ()
 };

 

 

-MeshManager.prototype.processMeshData = function () {

-        var renderer = g_Engine.getContext().renderer;

-        

+RDGE.MeshManager.prototype.processMeshData = function () {

+    var renderer = RDGE.globals.engine.getContext().renderer;

+

     // loop through meshes and load ready data

     for (var index in this.readyList) {