Merge branch 'refs/heads/ninja-internal' into WebGLFixes

1 files changed, 131 insertions, 141 deletions

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

 </copyright> */

 

+// RDGE namespaces

+var RDGE = RDGE || {};

+

 /*      

-this API should be familiar to anyone who has worked with 

-HLSL effect files.

+this API should be familiar to anyone who has worked with HLSL effect files.

 */

 

 /*

  *      A map of types to uniform 'binding' functions

  */

-bindMap={};

-bindMap['int']          = function(ctx, a,b) { ctx.uniform1iv(a,b); };

-bindMap['float']        = function(ctx, a,b) { ctx.uniform1fv(a,b); };

-bindMap['vec2']         = function(ctx, a,b) { ctx.uniform2fv(a,b); };

-bindMap['vec3']         = function(ctx, a,b) { ctx.uniform3fv(a,b); };

-bindMap['vec4']         = function(ctx, a,b) { ctx.uniform4fv(a,b); };

-bindMap['mat3']         = function(ctx, a,b) { ctx.uniformMatrix3fv(a,false,b); };

-bindMap['mat4']         = function(ctx, a,b) 

+RDGE.bindMap={};

+RDGE.bindMap['int']             = function(ctx, a,b) { ctx.uniform1iv(a,b); };

+RDGE.bindMap['float']   = function(ctx, a,b) { ctx.uniform1fv(a,b); };

+RDGE.bindMap['vec2']            = function(ctx, a,b) { ctx.uniform2fv(a,b); };

+RDGE.bindMap['vec3']            = function(ctx, a,b) { ctx.uniform3fv(a,b); };

+RDGE.bindMap['vec4']            = function(ctx, a,b) { ctx.uniform4fv(a,b); };

+RDGE.bindMap['mat3']            = function(ctx, a,b) { ctx.uniformMatrix3fv(a,false,b); };

+RDGE.bindMap['mat4']            = function(ctx, a,b) 

 { 

         ctx.uniformMatrix4fv(a,false,b); 

-        g_Engine.getContext().debug.mat4CallCount++;

+        RDGE.globals.engine.getContext().debug.mat4CallCount++;

 };

 

-bindMap['tex2d']        = function(ctx, a,b) 

+RDGE.bindMap['tex2d']   = function(ctx, a,b) 

 {

         ctx.activeTexture(ctx.TEXTURE0+b[0]);

         ctx.bindTexture(ctx.TEXTURE_2D, b[1]);

         ctx.uniform1iv(a,[b[0]]);

 };

 

-bindMap['texCube']=function(ctx, a,b) 

+RDGE.bindMap['texCube']=function(ctx, a,b) 

 {

         ctx.activeTexture(ctx.TEXTURE0+b[0]);

         ctx.bindTexture(ctx.TEXTURE_CUBE_MAP, b[1]);

         ctx.uniform1iv(a,[b[0]]);

 };

 

-lightDataMap = 

+RDGE.lightDataMap = 

 [

         function(ctx, loc, lightNode) { ctx.uniform3fv(loc, lightNode.position); },

         function(ctx, loc, lightNode) { ctx.uniform4fv(loc, lightNode.lightDiffuse); },

@@ -47,9 +49,9 @@ lightDataMap =
         function(ctx, loc, lightNode) { ctx.uniform4fv(loc, lightNode.lightSpecular); }

 ];

 

-paramTypeNameMapping = null;

+RDGE.paramTypeNameMapping = null;

 

-jshader = function(addr) {

+RDGE.jshader = function (addr) {

     this.name = addr;

     this.def = null;

     this.technique = {};

@@ -59,7 +61,7 @@ jshader = function(addr) {
     this.currentPass = 0;

     this.type_jshader = {};

     this.global = {};

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

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

     this.ctx = this.renderer.ctx;

 

     // load jshader definition at addr (if provided)

@@ -71,32 +73,32 @@ jshader = function(addr) {
         this.def = JSON.parse(request.responseText);

     }

 

-    if (!paramTypeNameMapping) {

+    if (!RDGE.paramTypeNameMapping) {

         var gl = this.ctx;

-        paramTypeNameMapping = {};

-        paramTypeNameMapping[gl.BOOL] = "bool";

-        paramTypeNameMapping[gl.INT] = "int";

-        paramTypeNameMapping[gl.FLOAT] = "float";

-        paramTypeNameMapping[gl.FLOAT_VEC2] = "vec2";

-        paramTypeNameMapping[gl.FLOAT_VEC3] = "vec3";

-        paramTypeNameMapping[gl.FLOAT_VEC4] = "vec4";

-        paramTypeNameMapping[gl.INT_VEC2] = "vec2";

-        paramTypeNameMapping[gl.INT_VEC3] = "vec3";

-        paramTypeNameMapping[gl.INT_VEC4] = "vec4";

-        paramTypeNameMapping[gl.BOOL_VEC2] = "vec2";

-        paramTypeNameMapping[gl.BOOL_VEC3] = "vec3";

-        paramTypeNameMapping[gl.BOOL_VEC4] = "vec4";

-        paramTypeNameMapping[gl.FLOAT_MAT2] = "mat2";

-        paramTypeNameMapping[gl.FLOAT_MAT3] = "mat3";

-        paramTypeNameMapping[gl.FLOAT_MAT4] = "mat4";

-        paramTypeNameMapping[gl.SAMPLER_2D] = "tex2d";

-        paramTypeNameMapping[gl.SAMPLER_CUBE] = "texCube";

+        RDGE.paramTypeNameMapping = {};

+        RDGE.paramTypeNameMapping[gl.BOOL] = "bool";

+        RDGE.paramTypeNameMapping[gl.INT] = "int";

+        RDGE.paramTypeNameMapping[gl.FLOAT] = "float";

+        RDGE.paramTypeNameMapping[gl.FLOAT_VEC2] = "vec2";

+        RDGE.paramTypeNameMapping[gl.FLOAT_VEC3] = "vec3";

+        RDGE.paramTypeNameMapping[gl.FLOAT_VEC4] = "vec4";

+        RDGE.paramTypeNameMapping[gl.INT_VEC2] = "vec2";

+        RDGE.paramTypeNameMapping[gl.INT_VEC3] = "vec3";

+        RDGE.paramTypeNameMapping[gl.INT_VEC4] = "vec4";

+        RDGE.paramTypeNameMapping[gl.BOOL_VEC2] = "vec2";

+        RDGE.paramTypeNameMapping[gl.BOOL_VEC3] = "vec3";

+        RDGE.paramTypeNameMapping[gl.BOOL_VEC4] = "vec4";

+        RDGE.paramTypeNameMapping[gl.FLOAT_MAT2] = "mat2";

+        RDGE.paramTypeNameMapping[gl.FLOAT_MAT3] = "mat3";

+        RDGE.paramTypeNameMapping[gl.FLOAT_MAT4] = "mat4";

+        RDGE.paramTypeNameMapping[gl.SAMPLER_2D] = "tex2d";

+        RDGE.paramTypeNameMapping[gl.SAMPLER_CUBE] = "texCube";

     }

 

     /*

     *   private helper functions

     */

-    this.bindParameters = function(pass) {

+    this.bindParameters = function (pass) {

         var params = pass.defParamsList; // global parameters to start with

         var lightParams = pass.lightParams;

         var lightContext = pass.lightContext;

@@ -110,15 +112,15 @@ jshader = function(addr) {
             if (params[idx].type == 'tex2d' || params[idx].type == 'texCube') {

                 texArg[0] = texUnit++;

                 texArg[1] = params[idx].data[0];

-                bindMap[params[idx].type](this.ctx, params[idx].loc, texArg);

+                RDGE.bindMap[params[idx].type](this.ctx, params[idx].loc, texArg);

             }

             else {

-                bindMap[params[idx].type](this.ctx, params[idx].loc, rdgeGlobalParameters[params[idx].name].data);

+                RDGE.bindMap[params[idx].type](this.ctx, params[idx].loc, RDGE.rdgeGlobalParameters[params[idx].name].data);

             }

         }

 

         // light settings defined by the material

-        var len = rdgeConstants.MAX_MATERIAL_LIGHTS;

+        var len = RDGE.rdgeConstants.MAX_MATERIAL_LIGHTS;

         for (var i = 0; i < len; ++i) {

             // if there is a context for a light check to see if we have a binding to the light

             if (lightContext[i] != null) {

@@ -128,7 +130,7 @@ jshader = function(addr) {
                     var numParams = lightParams[i].length;

                     for (var lp = 0; lp < numParams; ++lp) {

                         // bind the parameters using the lightDataMap function lookup, dataIndex is the key

-                        lightDataMap[lightParams[i][lp].dataIndex](this.ctx, lightParams[i][lp].loc, lightContext[i]);

+                        RDGE.lightDataMap[lightParams[i][lp].dataIndex](this.ctx, lightParams[i][lp].loc, lightContext[i]);

                     }

                 }

             }

@@ -142,10 +144,10 @@ jshader = function(addr) {
             if (params[idx].type == 'tex2d' || params[idx].type == 'texCube') {

                 texArg[0] = texUnit++;

                 texArg[1] = params[idx].data[0];

-                bindMap[params[idx].type](this.ctx, params[idx].loc, texArg);

+                RDGE.bindMap[params[idx].type](this.ctx, params[idx].loc, texArg);

             }

             else {

-                bindMap[params[idx].type](this.ctx, params[idx].loc, params[idx].data);

+                RDGE.bindMap[params[idx].type](this.ctx, params[idx].loc, params[idx].data);

             }

         }

     };

@@ -153,7 +155,7 @@ jshader = function(addr) {
     /*

     *   helper function for setting up a texture

     */