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, 76 insertions, 76 deletions

diff --git a/js/helper-classes/RDGE/src/core/script/utilities.js b/js/helper-classes/RDGE/src/core/script/utilities.js
index dcc61d45..85190097 100755
--- a/js/helper-classes/RDGE/src/core/script/utilities.js
+++ b/js/helper-classes/RDGE/src/core/script/utilities.js
@@ -11,26 +11,26 @@ var RDGE = RDGE || {};
 /* 

 // Methods not currently used in Ninja

 RDGE.getRandColor = function () {

-    var r = Math.random();

-    var g = Math.random();

-    var b = Math.random();

-

-    return [r, g, b, 1.0];

+  var r = Math.random();

+  var g = Math.random();

+  var b =Math.random();

+  

+  return [r, g, b, 1.0];

 };

 

 RDGE.unProject = function (winx, winy, winz, modelMatrix, projMatrix, viewport) {

-    var inVal = [0, 0, 0, 0];

+    var inVal   = [0,0,0,0];

 

     var finalMatrix = RDGE.mat4.mul(modelMatrix, projMatrix);

-

+    

     finalMatrix = RDGE.mat4.inverse(finalMatrix);

-    if (!finalMatrix)

-        return null;

+    if(!finalMatrix)

+      return  null;

 

-    inVal[0] = winx;

-    inVal[1] = winy;

-    inVal[2] = winz;

-    inVal[3] = 1.0;

+    inVal[0]=winx;

+    inVal[1]=winy;

+    inVal[2]=winz;

+    inVal[3]=1.0;

 

     // Map x and y from window coordinates 

     inVal[0] = (inVal[0] - viewport[0]) / viewport[2];

@@ -42,15 +42,15 @@ RDGE.unProject = function (winx, winy, winz, modelMatrix, projMatrix, viewport)
     inVal[2] = inVal[2] * 2 - 1;

 

     var v4Out = RDGE.mat4.transformPoint(finalMatrix, inVal);

-

-    if (v4Out[3] <= 0.0001)

-        return null;

-

+    

+    if (v4Out[3] <= 0.0001) 

+                return null;

+    

     v4Out[0] /= v4Out[3];

     v4Out[1] /= v4Out[3];

     v4Out[2] /= v4Out[3];

-

-    return [v4Out[0], v4Out[1], v4Out[2]];

+    

+    return [ v4Out[0], v4Out[1], v4Out[2] ];

 };

 

 RDGE.AABB2LineSegment = function (box, startPoint, endPoint) {

@@ -61,42 +61,42 @@ RDGE.AABB2LineSegment = function (box, startPoint, endPoint) {
     m = RDGE.vec3.sub(m, box.min),

   m = RDGE.vec3.sub(m, box.max);

 

-    var adx = Math.abs(d[0]);

-    if (Math.abs(m[0]) > e[0] + adx) return false;

+  var adx = Math.abs(d[0]);

+  if( Math.abs(m[0]) > e[0] + adx ) return false;

+  

+  var ady = Math.abs(d[1]);

+  if( Math.abs(m[1]) > e[1] + ady ) return false;

 

-    var ady = Math.abs(d[1]);

-    if (Math.abs(m[1]) > e[1] + ady) return false;

+  var adz = Math.abs(d[2]);

+  if( Math.abs(m[2]) > e[2] + adz ) return false;

 

-    var adz = Math.abs(d[2]);

-    if (Math.abs(m[2]) > e[2] + adz) return false;

+  adx += 1.192092896e-07;

+  ady += 1.192092896e-07;

+  adz += 1.192092896e-07;

 

-    adx += 1.192092896e-07;

-    ady += 1.192092896e-07;

-    adz += 1.192092896e-07;

+  if( Math.abs(m[1] * d[2] - m[2] * d[1]) > e[1] * adz + e[2] * ady ) return false;

+  if( Math.abs(m[2] * d[0] - m[0] * d[2]) > e[0] * adz + e[2] * adx ) return false;

+  if( Math.abs(m[0] * d[1] - m[1] * d[0]) > e[0] * ady + e[1] * adx ) return false;

 

-    if (Math.abs(m[1] * d[2] - m[2] * d[1]) > e[1] * adz + e[2] * ady) return false;

-    if (Math.abs(m[2] * d[0] - m[0] * d[2]) > e[0] * adz + e[2] * adx) return false;

-    if (Math.abs(m[0] * d[1] - m[1] * d[0]) > e[0] * ady + e[1] * adx) return false;

-

-    return true;

+  return true;

 };

 

 RDGE.hitTest = function (mesh, near, far) {

     // holds distance to the nearest BV

-    var dist = null;

-    var BV = null;

-

+  var dist = null;

+  var BV = null;

+  

     for (var index = 0; index < mesh.BVL.length; index++) {

         if (AABB2LineSegment(mesh.BVL[index], near, far)) {

             var center = RDGE.vec3.scale(RDGE.vec3.add(mesh.BVL[index].min, mesh.BVL[index].max), 0.5);

             var newDist = RDGE.vec3.dot(RDGE.mat4.row(RDGE.globals.cam.world, 2), center);

             if (newDist < dist || dist == null) {

-                dist = newDist;

-                BV = mesh.BVL[index];

-            }

-        }

+        dist = newDist;

+        BV = mesh.BVL[index];

+      }

     }

-    return BV;

+  }

+  return BV;

 };

 

 

@@ -111,19 +111,19 @@ RDGE.hitTest = function (mesh, near, far) {
 

 

 // loadShader

-//      'shaderId' is the id of a <script> element containing the shader source string.

+// 'shaderId' is the id of a <script> element containing the shader source string.

 // Load this shader and return the WebGLShader object corresponding to it.

 RDGE.loadShader = function (ctx, shaderType, shaderStr) {

-    // pre-pend preprocessor settings  

-    var preProcessor = "#define PC\n"

-    preProcessor += shaderStr;

-    shaderStr = preProcessor;

+  // pre-pend preprocessor settings

+  var preProcessor = "#define PC\n"

+  preProcessor += shaderStr;

+  shaderStr = preProcessor;

 

     // Create the shader object

     var shader = ctx.createShader(shaderType);

     if (shader == null) {

 

-        ctx.console.log("*** Error: unable to create shader '" + shaderType + "'");

+        ctx.console.log("*** Error: unable to create shader '"+shaderType+"'");       

 

         return null;

     }

@@ -140,7 +140,7 @@ RDGE.loadShader = function (ctx, shaderType, shaderStr) {
         // Something went wrong during compilation; get the error

         var error = ctx.getShaderInfoLog(shader);

 

-        ctx.console.log("*** Error compiling shader '" + shaderType + "':" + error);

+        ctx.console.log("*** Error compiling shader '"+shaderType+"':"+error);

 

         ctx.deleteShader(shader);

         return null;

@@ -152,28 +152,28 @@ RDGE.loadShader = function (ctx, shaderType, shaderStr) {
 // creates id for shader

 RDGE.g_shaderCounter = 0;

 RDGE.createShader = function (ctx, strVertShaderName, strFragShaderName, attribs) {

-    var vShader = '', fShader = '';

+  var vShader = '', fShader = '';

 

-    if (strVertShaderName.indexOf('{') != -1) {

-        vShader = strVertShaderName;

+  if (strVertShaderName.indexOf('{') != -1) {

+    vShader = strVertShaderName;

     } else {

-        var vshaderRequest = new XMLHttpRequest();

-        vshaderRequest.open("GET", 'assets/shaders/' + strVertShaderName + '.glsl', false);

-        vshaderRequest.send(null);

+        var vshaderRequest = new XMLHttpRequest();

+        vshaderRequest.open("GET", g_Engine._assetPath+'shaders/' + strVertShaderName + '.glsl', false);

+        vshaderRequest.send(null);