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

Conflicts:
	js/helper-classes/RDGE/rdge-compiled.js
	js/helper-classes/RDGE/runtime/GLRuntime.js
	js/helper-classes/RDGE/src/core/script/MeshManager.js
	js/helper-classes/RDGE/src/core/script/engine.js
	js/helper-classes/RDGE/src/core/script/fx/ssao.js
	js/helper-classes/RDGE/src/core/script/init_state.js
	js/helper-classes/RDGE/src/core/script/run_state.js
	js/helper-classes/RDGE/src/core/script/scenegraphNodes.js
	js/helper-classes/RDGE/src/core/script/utilities.js
	js/helper-classes/RDGE/src/tools/compile-rdge-core.bat
	js/helper-classes/RDGE/src/tools/compile-rdge-core.sh
	js/helper-classes/RDGE/src/tools/rdge-compiled.js
	js/lib/drawing/world.js
	js/lib/rdge/materials/bump-metal-material.js
	js/lib/rdge/materials/deform-material.js
	js/lib/rdge/materials/flat-material.js
	js/lib/rdge/materials/fly-material.js
	js/lib/rdge/materials/julia-material.js
	js/lib/rdge/materials/keleidoscope-material.js
	js/lib/rdge/materials/linear-gradient-material.js
	js/lib/rdge/materials/mandel-material.js
	js/lib/rdge/materials/plasma-material.js
	js/lib/rdge/materials/pulse-material.js
	js/lib/rdge/materials/radial-blur-material.js
	js/lib/rdge/materials/radial-gradient-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
	js/preloader/Preloader.js

1 files changed, 58 insertions, 58 deletions

diff --git a/js/helper-classes/RDGE/src/core/script/MeshManager.js b/js/helper-classes/RDGE/src/core/script/MeshManager.js
index 2c31781e..4fa3c908 100755
--- a/js/helper-classes/RDGE/src/core/script/MeshManager.js
+++ b/js/helper-classes/RDGE/src/core/script/MeshManager.js
@@ -14,31 +14,31 @@ RDGE.Model = function (name, mesh) {
 };

 

 /*

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

-*/

+ *      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;

+    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

-*/

+ * 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 = RDGE.globals.engine.getContext().renderer.id;

 

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

+        // 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);

@@ -47,9 +47,9 @@ RDGE.MeshManager.prototype.loadMesh = function (meshStump, tempMesh) {
         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++;

 

@@ -59,18 +59,18 @@ RDGE.MeshManager.prototype.loadMesh = function (meshStump, tempMesh) {
 };

 

 /*

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

-*/

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

+ */

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

-    var model = this.modelMap[name];

-

+        var model = this.modelMap[name];

+        

     if (model) {

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

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

-        });

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

+                });

 

-        delete this.modelMap[name];

-    }

+                delete this.modelMap[name];

+        }

 };

 

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

@@ -89,22 +89,22 @@ RDGE.MeshManager.prototype.getModelNames = function () {
 

 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) {

         // if item is ready load it

         if (this.readyList[index] && this.readyList[index].ready && renderer.id === this.readyList[index].ctxID) {

-

+        

 

             // pop the item

             var model = this.readyList[index];

             this.readyList.splice(index, 1);

-

+            

             var primset = new RDGE.rdgePrimitiveDefinition();

-

-            primset.vertexDefinition =

+            

+            primset.vertexDefinition = 

             {

-                // this shows two ways to map this data to an attribute

+                                // this shows two ways to map this data to an attribute

                 "vert": { 'type': RDGE.rdgeConstants.VS_ELEMENT_POS, 'bufferIndex': 0, 'bufferUsage': RDGE.rdgeConstants.BUFFER_STATIC },

                 "a_pos": { 'type': RDGE.rdgeConstants.VS_ELEMENT_POS, 'bufferIndex': 0, 'bufferUsage': RDGE.rdgeConstants.BUFFER_STATIC },

                 "normal": { 'type': RDGE.rdgeConstants.VS_ELEMENT_FLOAT3, 'bufferIndex': 1, 'bufferUsage': RDGE.rdgeConstants.BUFFER_STATIC },

@@ -115,44 +115,44 @@ RDGE.MeshManager.prototype.processMeshData = function () {
                 "a_texcoords": { 'type': RDGE.rdgeConstants.VS_ELEMENT_FLOAT2, 'bufferIndex': 2, 'bufferUsage': RDGE.rdgeConstants.BUFFER_STATIC },

                 "a_uv": { 'type': RDGE.rdgeConstants.VS_ELEMENT_FLOAT2, 'bufferIndex': 2, 'bufferUsage': RDGE.rdgeConstants.BUFFER_STATIC }

             };

-

-            primset.bufferStreams =

+            

+            primset.bufferStreams = 

             [

                                 model.root.data.coords,

                                 model.root.data.normals,

                                 model.root.data.uvs

             ];

-

-            primset.streamUsage =

+            

+            primset.streamUsage = 

             [

                                 RDGE.rdgeConstants.BUFFER_STATIC,

                                 RDGE.rdgeConstants.BUFFER_STATIC,

                                 RDGE.rdgeConstants.BUFFER_STATIC

             ];

-

+            

             primset.indexUsage = RDGE.rdgeConstants.BUFFER_STREAM;

-

+            

             primset.indexBuffer = model.root.data.indices;

 

-            renderer.createPrimitive(primset);

-

-            model.root.primitive = primset;

+                        renderer.createPrimitive( primset );

+                        

+                        model.root.primitive = primset;

 

             // generate a bounding box for this mesh

             model.root.bbox = new RDGE.box();

 

             var numCoords = model.root.data.coords.length; var idx = 0;

             while (idx < numCoords - 2) {

-                var thisCoord = [model.root.data.coords[idx + 0], model.root.data.coords[idx + 1], model.root.data.coords[idx + 2]];

-                model.root.bbox.addVec3(thisCoord);

-                idx += 3;

+              var thisCoord = [model.root.data.coords[idx+0], model.root.data.coords[idx+1], model.root.data.coords[idx+2]];

+              model.root.bbox.addVec3(thisCoord);

+              idx += 3;

             }

 

             this.modelMap[model.root.attribs.name] = model.root;

-

+            

             // now that the model is load reduce the request count

             this.requestCounter--;