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

1 files changed, 805 insertions, 949 deletions

diff --git a/js/helper-classes/RDGE/src/core/script/scenegraph.js b/js/helper-classes/RDGE/src/core/script/scenegraph.js
index 6814dcbf..2f080347 100755
--- a/js/helper-classes/RDGE/src/core/script/scenegraph.js
+++ b/js/helper-classes/RDGE/src/core/script/scenegraph.js
@@ -4,81 +4,67 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.

 </copyright> */

 

-var g_drawCount = 0;

-g_enableFlyCam = false;

-

-g_sceneStats = {};

-g_sceneStats.nodesVisible = new stat("scenegraph", "nodesVisible", 0, null, false);

-g_sceneStats.nodesCulled = new stat("scenegraph", "nodesCulled", 0, null, false);

-g_sceneStats.nodesVisited = new stat("scenegraph", "nodesVisited", 0, null, false);

-g_sceneStats.reset = function() {

-        g_sceneStats.nodesVisible.value = 0;

-        g_sceneStats.nodesVisited.value = 0;

-        g_sceneStats.nodesCulled.value = 0;

-};

+// RDGE namespaces

+var RDGE = RDGE || {};

 

 // default render proc

 // render scene nodes

-function DefaultRender() 

-{

-        // setup the default shader

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

-        //this.shaderProgram = this.renderer.defaultShader;

-        this.jshaderProgram = new jshader();

-        this.jshaderProgram.def = this.renderer.defaultShaderDefintion;

-        this.jshaderProgram.init();

-}

-

-DefaultRender.prototype.process=function(context,trNode,parent) {

+RDGE.DefaultRender = function () {

+    // setup the default shader

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

+    //this.shaderProgram = this.renderer.defaultShader;

+    this.jshaderProgram = new RDGE.jshader();

+    this.jshaderProgram.def = this.renderer.defaultShaderDefintion;

+    this.jshaderProgram.init();

+};

 

-}

+RDGE.DefaultRender.prototype.process = function (context, trNode, parent) {

+};

 

-function renderObject( trNode, renderCtx, parent)

-{

-        this.node = trNode ? trNode :  createTransformNode();

-        this.context = renderCtx ? renderCtx : new RenderContext();

-        this.parent = parent ? parent : null;

-}

+function renderObject(trNode, renderCtx, parent) {

+    this.node = trNode ? trNode : RDGE.createTransformNode();

+    this.context = renderCtx ? renderCtx : new RDGE.RenderContext();

+    this.parent = parent ? parent : null;

+};

 

 

 // Scene graph contains set of tools for manipulating the graph

-function SceneGraph(scene)

-{

-        if(scene == undefined || scene == null)

-                scene = {};

-                

-        this.scene = scene;

-

-        if(this.scene.root != undefined)

-                this.scene = this.scene.root;

-        else

-                this.scene = { 'children':[] };

-                

-        this.tick = 0;

-        this.lastTick = -1;

-        this.frustumCulling = true;

-        

-        // the main light for the scene - also casts shadows

-        this.mainLight = new shadowLight();

-        

-        this.bckTypes = rdgeConstants.categoryEnumeration;

-        

-        this.renderList  = new Array(this.bckTypes.MAX_CAT);

-        this.renderList[this.bckTypes.BACKGROUND]               = [];   //BACKGROUND    

-        this.renderList[this.bckTypes.OPAQUE]                   = [];   //OPAQUE                

-        this.renderList[this.bckTypes.TRANSPARENT]              = [];   //TRANSPARENT

-        this.renderList[this.bckTypes.ADDITIVE]                 = [];   //ADDITIVE

-        this.renderList[this.bckTypes.TRANSLUCENT]              = [];   //TRANSLUCENT

-        this.renderList[this.bckTypes.FOREGROUND]               = [];   //FOREGROUND

-        

-        // a list of shadow geometry

-        this.shadowRenderList = [];

-        

-        // scene traversal functor for creating a culled list of shadow geometry

-        this.shadowCuller = null;

-

-        // define passes to render geometry and handle post-processing

-        this.defaultPassDef =

+RDGE.SceneGraph = function (scene) {

+    if (scene == undefined || scene == null)

+        scene = {};

+

+    this.scene = scene;

+

+    if (this.scene.root != undefined)

+        this.scene = this.scene.root;

+    else

+        this.scene = { 'children': [] };

+

+    this.tick = 0;

+    this.lastTick = -1;

+    this.frustumCulling = true;

+

+    // the main light for the scene - also casts shadows

+    this.mainLight = new RDGE.shadowLight();

+

+    this.bckTypes = RDGE.rdgeConstants.categoryEnumeration;

+

+    this.renderList = new Array(this.bckTypes.MAX_CAT);

+    this.renderList[this.bckTypes.BACKGROUND] = []; //BACKGROUND        

+    this.renderList[this.bckTypes.OPAQUE] = []; //OPAQUE                

+    this.renderList[this.bckTypes.TRANSPARENT] = []; //TRANSPARENT

+    this.renderList[this.bckTypes.ADDITIVE] = []; //ADDITIVE

+    this.renderList[this.bckTypes.TRANSLUCENT] = []; //TRANSLUCENT

+    this.renderList[this.bckTypes.FOREGROUND] = []; //FOREGROUND

+

+    // a list of shadow geometry

+    this.shadowRenderList = [];

+

+    // scene traversal functor for creating a culled list of shadow geometry

+    this.shadowCuller = null;

+

+    // define passes to render geometry and handle post-processing

+    this.defaultPassDef =

         {

             // a pass can have children that will receive their parents output as input

 

@@ -102,7 +88,7 @@ function SceneGraph(scene)
             //                          'outputs':[{ 'name':"u_shadowDepthMap", 'type':"target", 'width':1024, 'height':1024, 'mips':false }],

             //                          // custom parameter

             //                          'name':"shadowDepthMap",

-            //                          'shader': rdgeDepthMapShaderDef,

+            //                          'shader': RDGE.rdgeDepthMapShaderDef,

             //                          'technique':"shadowDepthMap",

             //                          'geometrySet':"SHADOW",

             //                          'children':

@@ -111,7 +97,7 @@ function SceneGraph(scene)
             //                                  {

             //                                          'outputs':[{ 'name':"u_shadowMap", 'type':"target", 'width':1024, 'height':1024, 'mips':false }],

             //                                          'name':"shadowMap",

-            //                                          'shader': rdgeShadowMapShader,

+            //                                          'shader': RDGE.rdgeShadowMapShader,

             //                                          'clearColor' : [1.0,1.0,1.0,1.0],

             //                                          'geometrySet':"SHADOW",

             //                                  }

@@ -121,7 +107,7 @@ function SceneGraph(scene)
             //                  {

             //                          'outputs':[{ 'name':"sTexture", 'type':"target", 'width':1024, 'height':1024, 'mips':false }],

             //                          'name':"glowMap",

-            //                          'shader': rdgeGlowMapShader,

+            //                          'shader': RDGE.rdgeGlowMapShader,

             //                          'clearColor' : [0.0,0.0,0.0,1.0],

             //                          'technique':"createGlowMap",

             //                          'geometrySet':"ALL",

@@ -130,21 +116,21 @@ function SceneGraph(scene)
             //                                          {       // the blur pass at half resolution

             //                                                  'name':"blurQuarter",

             //                                                  'geometrySet':"SCREEN_QUAD",

-            //                                                  'shader': rdgeGaussianBlurShader,

+            //                                                  'shader': RDGE.rdgeGaussianBlurShader,

             //                                                  'outputs':[{ 'name':"sTexture", 'type':"target", 'width':256, 'height':256, 'mips':false }],

             //                                                  'children':

             //                                                  [

             //                                                          {       // the blur pass at half resolution

             //                                                                  'name':"blurThreeQuarter",

             //                                                                  'geometrySet':"SCREEN_QUAD",

-            //                                                                  'shader': rdgeGaussianBlurShader,

+            //                                                                  'shader': RDGE.rdgeGaussianBlurShader,

             //                                                                  'outputs':[{ 'name':"sTexture", 'type':"target", 'width':128, 'height':128, 'mips':false }],

             //                                                                  'children':

             //                                                                  [

             //                                                                           {      // the blur pass at quarter resolution

             //                                                                                  'name':"blurFull",

             //                                                                                  'geometrySet':"SCREEN_QUAD",

-            //                                                                                  'shader': rdgeGaussianBlurShader,

+            //                                                                                  'shader': RDGE.rdgeGaussianBlurShader,

             //                                                                                  'outputs':[{ 'name':"u_glowFinal", 'type':"target", 'width':1024, 'height':1024, 'mips':false }]

             //                                                                          }

             //                                                                  ]

@@ -156,7 +142,7 @@ function SceneGraph(scene)