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

Conflicts:
	manifest.json

1 files changed, 674 insertions, 673 deletions

diff --git a/js/helper-classes/RDGE/src/core/script/jpass.js b/js/helper-classes/RDGE/src/core/script/jpass.js
index e3c5a342..9cc8c28a 100755
--- a/js/helper-classes/RDGE/src/core/script/jpass.js
+++ b/js/helper-classes/RDGE/src/core/script/jpass.js
@@ -1,673 +1,674 @@
-/* <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 || {};

-

-/*

-*       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

-};

-

-

-/*

-*       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 = [];

-    this.renderOrder[this.sortCats.BACKGROUND] = 0;

-    this.renderOrder[this.sortCats.OPAQUE] = 1;

-    this.renderOrder[this.sortCats.TRANSPARENT] = 2;

-    this.renderOrder[this.sortCats.ADDITIVE] = 3

-    this.renderOrder[this.sortCats.TRANSLUCENT] = 4;

-    this.renderOrder[this.sortCats.FOREGROUND] = 5;

-

-    // the name of this pass

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

-

-    /* 

-    *   if 0 this pass and children are culled from rendering

-    */

-    this.visibility = 1;

-

-    /*

-    *   called when the pass is hidden - override for customication

-    */

-    this.onHide = function () {

-    };

-

-    /*

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

-    */

-    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

-    */

-    this.defaultTargetOut = {};

-

-    /*

-    * All the outputs required by the pass

-    */

-    this.outputs =

-        [

-    // example

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

-        ];

-

-    /*

-    *   notifies the the renderer that the viewport was modified and needs to be reset

-    */

-    this.dirty = false;

-

-    /*

-    *   Index of the currently selected output target

-    */

-    this.outputIndex = 0;

-

-    /*

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

-    */

-    this.inputs = [];

-

-    /*

-    *   other textures requested for this pass

-    */

-    this.textures = [];

-

-    /*

-    *   the flags that control how the pass is rendered

-    */

-    this.frustum_culling = "enable";            // disable/enable frustum culling during the pass

+/* <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 || {};
+
+/*
+*   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
+};
+
+
+/*
+*   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 = [];
+    this.renderOrder[this.sortCats.BACKGROUND] = 0;
+    this.renderOrder[this.sortCats.OPAQUE] = 1;
+    this.renderOrder[this.sortCats.TRANSPARENT] = 2;
+    this.renderOrder[this.sortCats.ADDITIVE] = 3
+    this.renderOrder[this.sortCats.TRANSLUCENT] = 4;
+    this.renderOrder[this.sortCats.FOREGROUND] = 5;
+
+    // the name of this pass
+    this.name = "renderPass_" + RDGE.nodeIdGen.getId();
+
+    /*
+    *   if 0 this pass and children are culled from rendering
+    */
+    this.visibility = 1;
+
+    /*
+    *   called when the pass is hidden - override for customication
+    */
+    this.onHide = function () {
+    };
+
+    /*
+    *   Called by the system to hide the pass and its children
+    */
+    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
+    */
+    this.defaultTargetOut = {};
+
+    /*
+    * All the outputs required by the pass
+    */
+    this.outputs =
+    [
+    // example
+    // {'name':"u_mainRT", 'type':"target", 'width':1024, 'height':1024, 'mips':false}
+    ];
+
+    /*
+    *   notifies the the renderer that the viewport was modified and needs to be reset
+    */
+    this.dirty = false;
+
+    /*
+    *   Index of the currently selected output target
+    */
+    this.outputIndex = 0;
+
+    /*
+    *   outputs from the previous pass are set as inputs for this pass
+    */
+    this.inputs = [];
+
+    /*
+    *   other textures requested for this pass
+    */
+    this.textures = [];
+
+    /*
+    *   the flags that control how the pass is rendered
+    */