Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal

Conflicts:
	manifest.json

1 files changed, 1004 insertions, 1003 deletions

diff --git a/js/helper-classes/RDGE/src/core/script/scenegraph.js b/js/helper-classes/RDGE/src/core/script/scenegraph.js
index 44f1212f..580f9c84 100755
--- a/js/helper-classes/RDGE/src/core/script/scenegraph.js
+++ b/js/helper-classes/RDGE/src/core/script/scenegraph.js
@@ -1,1003 +1,1004 @@
-/* <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 || {};

-

-// default render proc

-// render scene nodes

-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 : RDGE.createTransformNode();

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

-    this.parent = parent ? parent : null;

-};

-

-

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

-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

-

-            // this pass renders the depth map to an off-screen target - from the shadow lights view

-            // you can specify what your output should be

-            // @param name              - this tells jshader's of child passes (which receive the parents output as input)

-            //                                    what the sampler2d uniform name will be for this output texture

-            // @param type              - the type of output could be tex2d or target

-            // @param width             - optional width of the render target

-            // @param height    - optional height of the render target

-            // @param mips              - optional flag indicating whether the render target will support mip-mapping

-

-            // the geometry pass

-            'name': "geoPass",

-            'geometrySet': "ALL"

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

-            //          'children':

-            //          [

-            //                  // shadow pass

-            //                  {

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

-            //                          // custom parameter

-            //                          'name':"shadowDepthMap",

-            //                          'shader': RDGE.rdgeDepthMapShaderDef,

-            //                          'technique':"shadowDepthMap",

-            //                          'geometrySet':"SHADOW",

-            //                          'children':

-            //                          [

-            //                                  // create shadow rt

-            //                                  {

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

-            //                                          'name':"shadowMap",

-            //                                          'shader': RDGE.rdgeShadowMapShader,

+/* <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 || {};
+
+// default render proc
+// render scene nodes
+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 : RDGE.createTransformNode();
+    this.context = renderCtx ? renderCtx : new RDGE.RenderContext();
+    this.parent = parent ? parent : null;
+};
+
+
+// Scene graph contains set of tools for manipulating the graph
+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
+
+        // this pass renders the depth map to an off-screen target - from the shadow lights view
+        // you can specify what your output should be
+        // @param name      - this tells jshader's of child passes (which receive the parents output as input)
+        //                    what the sampler2d uniform name will be for this output texture
+        // @param type      - the type of output could be tex2d or target
+        // @param width     - optional width of the render target
+        // @param height    - optional height of the render target
+        // @param mips      - optional flag indicating whether the render target will support mip-mapping
+
+        // the geometry pass
+        'name': "geoPass",
+        'geometrySet': "ALL"
+        //      'outputs':[{ 'name':"u_mainRT", 'type':"target", 'width':1024, 'height':1024, 'mips':false }],
+        //      'children':
+        //      [
+        //          // shadow pass
+        //          {
+        //              'outputs':[{ 'name':"u_shadowDepthMap", 'type':"target", 'width':1024, 'height':1024, 'mips':false }],
+        //              // custom parameter
+        //              'name':"shadowDepthMap",
+        //              'shader': RDGE.rdgeDepthMapShaderDef,
+        //              'technique':"shadowDepthMap",
+        //              'geometrySet':"SHADOW",
+        //              'children':
+        //              [
+        //                  // create shadow rt
+        //                  {
+        //                      'outputs':[{ 'name':"u_shadowMap", 'type':"target", 'width':1024, 'height':1024, 'mips':false }],
+        //                      'name':"shadowMap",