1 files changed, 765 insertions, 764 deletions

diff --git a/js/helper-classes/RDGE/src/core/script/jshader.js b/js/helper-classes/RDGE/src/core/script/jshader.js
index b9170857..7414e06d 100755
--- a/js/helper-classes/RDGE/src/core/script/jshader.js
+++ b/js/helper-classes/RDGE/src/core/script/jshader.js
@@ -1,764 +1,765 @@
-/* <copyright>

-Copyright (c) 2012, Motorola Mobility, Inc

-All Rights Reserved.

-BSD License.

-

-Redistribution and use in source and binary forms, with or without

-modification, are permitted provided that the following conditions are met:

-

-  - Redistributions of source code must retain the above copyright notice,

-    this list of conditions and the following disclaimer.

-  - Redistributions in binary form must reproduce the above copyright

-    notice, this list of conditions and the following disclaimer in the

-    documentation and/or other materials provided with the distribution.

-  - Neither the name of Motorola Mobility nor the names of its contributors

-    may be used to endorse or promote products derived from this software

-    without specific prior written permission.

-

-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE

-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

-POSSIBILITY OF SUCH DAMAGE.

-</copyright> */

-

-// RDGE namespaces

-var RDGE = RDGE || {};

-

-/*      

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

-*/

-

-/*

- *      A map of types to uniform 'binding' functions

- */

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

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

-};

-

-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]]);

-};

-

-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]]);

-};

-

-RDGE.lightDataMap = 

-[

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

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

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

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

-];

-

-RDGE.paramTypeNameMapping = null;

-

-RDGE.jshader = function (addr) {

-    this.name = addr;

-    this.def = null;

-    this.technique = {};

-    this.params = {};

-    this.compiledShaders = {};

-    this.resetRS = false;

-    this.currentPass = 0;

-    this.type_jshader = {};

-    this.global = {};

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

-    this.ctx = this.renderer.ctx;

-

-    // load jshader definition at addr (if provided)

-    if (addr != undefined && addr != null) {

-        // a synchronous ajax request

-        request = new XMLHttpRequest();

-        request.open("GET", addr, false);

-        request.send(null);

-        this.def = JSON.parse(request.responseText);

-    }

-

-    if (!RDGE.paramTypeNameMapping) {

-        var gl = this.ctx;

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

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

-        var lightParams = pass.lightParams;

-        var lightContext = pass.lightContext;

-        var length = params.length;

-        var idx = 0;

-        var texArg = new Array(2)

-

-        // global parameters

+/* <copyright>
+Copyright (c) 2012, Motorola Mobility LLC.
+All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of Motorola Mobility LLC nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+</copyright> */
+
+// RDGE namespaces
+var RDGE = RDGE || {};
+
+/*
+this API should be familiar to anyone who has worked with HLSL effect files.
+*/
+
+/*
+ *  A map of types to uniform 'binding' functions
+ */
+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);
+    RDGE.globals.engine.getContext().debug.mat4CallCount++;
+};
+
+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]]);
+};
+
+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]]);
+};
+
+RDGE.lightDataMap =
+[
+    function(ctx, loc, lightNode) { ctx.uniform3fv(loc, lightNode.position); },
+    function(ctx, loc, lightNode) { ctx.uniform4fv(loc, lightNode.lightDiffuse); },
+    function(ctx, loc, lightNode) { ctx.uniform4fv(loc, lightNode.lightAmbient); },
+    function(ctx, loc, lightNode) { ctx.uniform4fv(loc, lightNode.lightSpecular); }
+];
+
+RDGE.paramTypeNameMapping = null;
+
+RDGE.jshader = function (addr) {
+    this.name = addr;
+    this.def = null;
+    this.technique = {};
+    this.params = {};
+    this.compiledShaders = {};
+    this.resetRS = false;
+    this.currentPass = 0;
+    this.type_jshader = {};
+    this.global = {};
+    this.renderer = RDGE.globals.engine.getContext().renderer;
+    this.ctx = this.renderer.ctx;
+
+    // load jshader definition at addr (if provided)
+    if (addr != undefined && addr != null) {
+        // a synchronous ajax request
+        request = new XMLHttpRequest();
+        request.open("GET", addr, false);
+        request.send(null);
+        this.def = JSON.parse(request.responseText);
+    }
+
+    if (!RDGE.paramTypeNameMapping) {
+        var gl = this.ctx;
+        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) {
+        var params = pass.defParamsList; // global parameters to start with
+        var lightParams = pass.lightParams;
+        var lightContext = pass.lightContext;
+        var length = params.length;
+        var idx = 0;
+        var texArg = new Array(2)
+