Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures

Conflicts:
	js/lib/drawing/world.js
	js/lib/geom/geom-obj.js
	js/lib/rdge/materials/cloud-material.js
	js/lib/rdge/materials/deform-material.js
	js/lib/rdge/materials/flat-material.js
	js/lib/rdge/materials/material.js
	js/lib/rdge/materials/pulse-material.js
	js/lib/rdge/materials/relief-tunnel-material.js
	js/lib/rdge/materials/square-tunnel-material.js
	js/lib/rdge/materials/star-material.js
	js/lib/rdge/materials/taper-material.js
	js/lib/rdge/materials/tunnel-material.js
	js/lib/rdge/materials/twist-material.js
	js/lib/rdge/materials/twist-vert-material.js
	js/lib/rdge/materials/uber-material.js
	js/lib/rdge/materials/water-material.js
	js/lib/rdge/materials/z-invert-material.js

39 files changed, 7256 insertions, 9024 deletions

diff --git a/js/helper-classes/RDGE/src/core/script/MeshManager.js b/js/helper-classes/RDGE/src/core/script/MeshManager.js
index 7dfc79d4..4fa3c908 100755
--- a/js/helper-classes/RDGE/src/core/script/MeshManager.js
+++ b/js/helper-classes/RDGE/src/core/script/MeshManager.js
@@ -4,17 +4,19 @@ 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() {

+RDGE.MeshManager = function () {

     this.contentUrl                                     = "assets_web/mesh/";

     this.modelMap                                       = {};

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

@@ -22,27 +24,24 @@ function MeshManager() {
     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) 

-{

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

     // if it exists already, return the mesh requested

     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;

+    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 = makeSphere(g_Engine.getContext().renderer.ctx, 25, 5, 5);

+    if (!tempMesh) {

+        if (this.tempSphere == null) {

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

         }

 

         tempMesh = this.tempSphere;

@@ -54,7 +53,7 @@ MeshManager.prototype.loadMesh = function (meshStump, tempMesh)
     // update the request counter - we now have one more mesh to load

     this.requestCounter++;

 

-    requestMesh(meshStump);

+    RDGE.requestMesh(meshStump);

 

     return null;

 };

@@ -62,14 +61,11 @@ MeshManager.prototype.loadMesh = function (meshStump, tempMesh)
 /*

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

  */

-MeshManager.prototype.deleteMesh = function (name) 

-{

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

         var model = this.modelMap[name];

         

-        if (model)

-        {

-                g_Engine.ctxMan.forEach(function(context)

-                {

+    if (model) {

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

                         context.renderer.deletePrimitive(model.primitive);

                 });

 

@@ -77,13 +73,11 @@ MeshManager.prototype.deleteMesh = function (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,8 +87,8 @@ 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) {

@@ -106,20 +100,20 @@ MeshManager.prototype.processMeshData = function () {
             var model = this.readyList[index];

             this.readyList.splice(index, 1);

             

-            var primset = new rdgePrimitiveDefinition();

+            var primset = new