1 files changed, 355 insertions, 416 deletions

diff --git a/js/helper-classes/RDGE/src/core/script/jpass.js b/js/helper-classes/RDGE/src/core/script/jpass.js
index 326394dc..f3943684 100755
--- a/js/helper-classes/RDGE/src/core/script/jpass.js
+++ b/js/helper-classes/RDGE/src/core/script/jpass.js
@@ -4,34 +4,38 @@ 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 || {};

+

 /*

- *      jpass geometry set - determines the category(s) of geometry that a pass will render

- *      can be OR'ed together

- */

-jpassGeoSet =

+*       jpass geometry set - determines the category(s) of geometry that a pass will render

+*       can be OR'ed together

+*/

+RDGE.jpassGeoSet =

 {

-        'BACKGROUND'    :1,

-        'OPAQUE'                :2,

-        'TRANSPARENT'   :4,

-        'ADDITIVE'              :8,

-        'TRANSLUCENT'   :16,

-        'FOREGROUND'    :32,

-        'ALL'                   :127,

-        'SCREEN_QUAD'   :128,   // a screen aligned quad - for rendering a texture to screen

-        'SHADOW'                :256,   // the opaque geometry from shadow light's point of view

-        'MAXSETS'               :9

+    'BACKGROUND': 1,

+    'OPAQUE': 2,

+    'TRANSPARENT': 4,

+    'ADDITIVE': 8,

+    'TRANSLUCENT': 16,

+    'FOREGROUND': 32,

+    'ALL': 127,

+    'SCREEN_QUAD': 128, // a screen aligned quad - for rendering a texture to screen

+    'SHADOW': 256, // the opaque geometry from shadow light's point of view

+    'MAXSETS': 9

 };

 

 

 /*

- *      The abstract base class that defines a jpass

- *      a jpass represents a single render pass of the scene graph

- */

-_jpassBaseClass = function() {

-    this.context = g_Engine.getContext();

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

-    this.sortCats = rdgeConstants.categoryEnumeration;

-    this.bucketCount = rdgeConstants.categoryEnumeration.MAX_CAT;

+*       The abstract base class that defines a jpass

+*       a jpass represents a single render pass of the scene graph

+*/

+RDGE._jpassBaseClass = function () {

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

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

+    this.sortCats = RDGE.rdgeConstants.categoryEnumeration;

+    this.bucketCount = RDGE.rdgeConstants.categoryEnumeration.MAX_CAT;

 

     // render order

     this.renderOrder = [];

@@ -43,7 +47,7 @@ _jpassBaseClass = function() {
     this.renderOrder[this.sortCats.FOREGROUND] = 5;

 

     // the name of this pass

-    this.name = "renderPass_" + nodeIdGen.getId();

+    this.name = "renderPass_" + RDGE.nodeIdGen.getId();

 

     /* 

     *   if 0 this pass and children are culled from rendering

@@ -53,20 +57,19 @@ _jpassBaseClass = function() {
     /*

     *   called when the pass is hidden - override for customication

     */

-    this.onHide = function() {

-

-    }

+    this.onHide = function () {

+    };

 

     /*

     *   Called by the system to hide the pass and its children

     */

-    this.hidePass = function() {

+    this.hidePass = function () {

         this.onHide();

 

         for (var i = 0, len = this.children.length; i < len; ++i) {

             this.children[i].hidePass();

         }

-    }

+    };

 

     /*

     *   the default output render targets that this pass will create

@@ -95,17 +98,12 @@ _jpassBaseClass = function() {
     /*

     *   outputs from the previous pass are set as inputs for this pass

     */

-    this.inputs =

-        [

-        ];

+    this.inputs = [];

 

     /*

     *   other textures requested for this pass

     */

-    this.textures =

-        [

-

-        ];

+    this.textures = [];

 

     /*

     *   the flags that control how the pass is rendered

@@ -143,7 +141,6 @@ _jpassBaseClass = function() {
     */

     this.geometrySet = "SCREEN_QUAD";

 

-

     /*

     *   A camera set here will override any camera active in the scene

     */

@@ -152,21 +149,20 @@ _jpassBaseClass = function() {
     /*

     *   Initialize the pass

     */

-    this.init = function() {

-

-    }

+    this.init = function () {

+    };

 

     /*

     *   inserts a node into the child map using the pass name as the key

     */

-    this.insertChildPass = function(jpassObj) {

+    this.insertChildPass = function (jpassObj) {

         this.children[jpassObj.name] = jpassObj;

-    }

+    };

 

     /*

     *   the scene-graph to process

     */

-    this.process = function() {

+    this.process = function () {

         // pre-defined local variables to prevent allocation

         var context;

         var shaderProg;

@@ -182,9 +178,9 @@ _jpassBaseClass = function() {
         var paramIdx = 0;

         var passIdx = 0;

 

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

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

 

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

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

 

         // bind output target for rendering

         this.bindOutput();

@@ -201,10 +197,10 @@ _jpassBaseClass = function() {
         renderer.projectionMatrix = activeCam.proj;

 

         // parameters that can be set once per pass

-        rdgeGlobalParameters.u_inv_viewport_width.set([1.0 / renderer.vpWidth]);

-        rdgeGlobalParameters.u_inv_viewport_height.set([1.0 / renderer.vpHeight]);

-        rdgeGlobalParameters.u_farZ.set([activeCam.zFar()]);

-        rdgeGlobalParameters.u_projMatrix.set(renderer.projectionMatrix);

+        RDGE.rdgeGlobalParameters.u_inv_viewport_width.set([1.0 / renderer.vpWidth]);

+        RDGE.rdgeGlobalParameters.u_inv_viewport_height.set([1.0 / renderer.vpHeight]);

+        RDGE.rdgeGlobalParameters.u_farZ.set([activeCam.zFar()]);

+        RDGE.rdgeGlobalParameters.u_projMatrix.set(renderer.projectionMatrix);

 

         for (var bucketIdx = 0, bckCnt = this.renderList.length; bucketIdx < bckCnt; ++bucketIdx) {

             //var curList               = this.renderList[bucketIdx];

@@ -217,21 +213,21 @@ _jpassBaseClass = function() {
                     context = this.renderList[bucketIdx][nodeIdx].context;

                     shaderProg = this.shader ? this.shader : context.shaderProg;

 

-                    renderer.mvMatrix = mat4.mul4x3(node.world, activeCam.view);

-                    renderer.invMvMatrix = mat4.inverse(renderer.mvMatrix);

-                    renderer.normalMatrix = mat4.transpose(renderer.invMvMatrix);

-                    

-                    rdgeGlobalParameters.u_mvMatrix.set(renderer.mvMatrix);

-                    rdgeGlobalParameters.u_normalMatrix.set(renderer.normalMatrix);

-                    rdgeGlobalParameters.u_worldMatrix.set(node.world);

+                    renderer.mvMatrix = RDGE.mat4.mul4x3(node.world, activeCam.view);

+                    renderer.invMvMatrix = RDGE.mat4.inverse(renderer.mvMatrix);

+                    renderer.normalMatrix = RDGE.mat4.transpose(renderer.invMvMatrix);

+

+                    RDGE.rdgeGlobalParameters.u_mvMatrix.set(renderer.mvMatrix);

+                    RDGE.rdgeGlobalParameters.u_normalMatrix.set(renderer.normalMatrix);

+                    RDGE.rdgeGlobalParameters.u_worldMatrix.set(node.world);