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, 272 insertions, 271 deletions

diff --git a/js/helper-classes/RDGE/src/core/script/scenegraphNodes.js b/js/helper-classes/RDGE/src/core/script/scenegraphNodes.js
index 035e30d1..95ee2803 100755
--- a/js/helper-classes/RDGE/src/core/script/scenegraphNodes.js
+++ b/js/helper-classes/RDGE/src/core/script/scenegraphNodes.js
@@ -8,46 +8,46 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 var RDGE = RDGE || {};

 

 /*

-*       Creates a unique node id

-*/

+ *      Creates a unique node id

+ */

 RDGE.nodeIdGen = {};

-

+ 

 RDGE.nodeIdGen.counter = 0;

-

+ 

 RDGE.nodeIdGen.getId = function () {

     return "gen_" + RDGE.nodeIdGen.counter++;

 };

 

 /*

-*       Constructs a new transform node

-*/

+ *      Constructs a new transform node

+ */

 RDGE.createTransformNode = function (nodeName) {

-    node = { 'name': nodeName };

-

+        node = { 'name': nodeName };

+        

     node.transformNodeTemplate = new RDGE.transformNodeTemplate(node);

-

-    return node;

+        

+        return node;

 };

 

 /*

-*       Constructs a new material node

-*/

+ *      Constructs a new material node

+ */

 RDGE.createMaterialNode = function (nodeName) {

-    node = { 'name': nodeName };

-

+        node = { 'name': nodeName };

+        

     node.materialNodeTemplate = new RDGE.materialNodeTemplate(node);

-

-    return node;

+        

+        return node;

 };

 

 /*

-*       Constructs a new mesh node

-*/

+ *      Constructs a new mesh node

+ */

 RDGE.createMeshNode = function (nodeName, primitive) {

-    meshNode = { 'mesh': {}, 'meshNodeTemplate': {} };

-

+        meshNode = { 'mesh':{}, 'meshNodeTemplate':{} };

+        

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

-

+                

     if (!primitive.built) {

         renderer.createPrimitive(primitive);

     }

@@ -60,43 +60,43 @@ RDGE.createMeshNode = function (nodeName, primitive) {
         return meshNode; // --early out--

     }

     else if (!renderer.buffers[model.primitive.buffersID]) {

-        renderer.createPrimitive(model.primitive);

-    }

-

+                renderer.createPrimitive(model.primitive);

+        }

+        

     meshNode.mesh.meshNodeTemplate = new RDGE.meshNodeTemplate(meshNode.mesh, model.primitive, nodeName);

-

-    return meshNode;

+        

+        return meshNode;

 };

 

 /*

-*       Construct a light node

-*/

+ *      Construct a light node

+ */

 RDGE.createLightNode = function (nodeName) {

     node = { 'name': nodeName };

     node.lightNodeTemplate = new RDGE.lightNodeTemplate(node);

-

-    return node;

+        

+        return node;

 };

 

 /*

-*       creates a specialized mesh node representing a screen aligned quad with identity transform

-*/

+ *      creates a specialized mesh node representing a screen aligned quad with identity transform

+ */

 RDGE.createScreenQuadNode = function () {

     var trNode = RDGE.createTransformNode();

     trNode.attachMeshNode("screenQuad", RDGE.renderUtils.createScreenAlignedQuad());

-    return trNode;

+        return trNode; 

 };

 

 RDGE.verifyTransformNode = function (node) {

     if (node.transformNodeTemplate == undefined) {

         node.transformNodeTemplate = new RDGE.transformNodeTemplate(node);

-    }

+}

 };

 

 RDGE.verifyMaterialNode = function (node) {

     if (node.materialNodeTemplate == undefined) {

         node.materialNodeTemplate = new RDGE.materialNodeTemplate(node);

-    }

+}

 };

 

 RDGE.verifyLightNode = function (node) {

@@ -107,299 +107,300 @@ RDGE.verifyLightNode = function (node) {
 

 /*

 *       Takes an object and attaches transform node

-*       functions and fields if they are not defined

-*/

+ *      functions and fields if they are not defined

+ */

 RDGE.transformNodeTemplate = function (trNode) {

     // Lots of checking for things that might exist and adding them when they don't

-

+    

     /* ------------------------------------------- */

     if (!trNode.children) {

-        trNode.children = [];

-    }

-

+                trNode.children = [];

+        }

+        

     if (!trNode.local) {

         trNode.local = RDGE.mat4.identity();

-    }

-

+        }

+        

     if (!trNode.world) {

         trNode.world = RDGE.mat4.identity();

-    }

-

+        }

+        

     if (!trNode.id) {

         trNode.id = RDGE.nodeIdGen.getId();

-    }

-

+        }

+        

     if (!trNode.name) {

-        trNode.name = "xfrmNode" + trNode.id;

-    }

-

+                trNode.name = "xfrmNode" + trNode.id;

+        }

+        

     if (!trNode.parent) {

-        trNode.parent = null;

-    }

-

+            trNode.parent = null;

+        }

+                

     if (!trNode.meshes) {

-        trNode.meshes = [];

-    }

-

+                trNode.meshes = [];

+        }

+