1 files changed, 397 insertions, 396 deletions

diff --git a/js/helper-classes/RDGE/src/core/script/renderUtils.js b/js/helper-classes/RDGE/src/core/script/renderUtils.js
index 2d2a5930..60a51d4e 100755
--- a/js/helper-classes/RDGE/src/core/script/renderUtils.js
+++ b/js/helper-classes/RDGE/src/core/script/renderUtils.js
@@ -1,396 +1,397 @@
-/* <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> */

-

-var RDGE = RDGE || {};

-RDGE.renderUtils = RDGE.renderUtils || {};

-

-/*

-*       Creates an indexed box primitive

-*  @return a rdge primitive

-*/

-RDGE.renderUtils.createBox = function () {

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

-

-    var coords =

-                [1, 1, 1, -1, 1, 1, -1, -1, 1, 1, -1, 1,        // front

-                                1, 1, 1, 1, -1, 1, 1, -1, -1, 1, 1, -1,         // right

-                                1, 1, 1, 1, 1, -1, -1, 1, -1, -1, 1, 1,         // top

-                                -1, 1, 1, -1, 1, -1, -1, -1, -1, -1, -1, 1, // left

-                                -1, -1, -1, 1, -1, -1, 1, -1, 1, -1, -1, 1, // bottom

-                                1, -1, -1, -1, -1, -1, -1, 1, -1, 1, 1, -1]; // back

-

-    var normals =

-        [0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1,    // front

-            1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0,         // right

-                        0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0,     // top

-                        -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0,         // left

-            0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0,     // bottom

-                        0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1];    // back

-

-    var uvs =

-        [1, 1, 0, 1, 0, 0, 1, 0,    // front

-                        0, 1, 0, 0, 1, 0, 1, 1,    // right

-                        1, 0, 1, 1, 0, 1, 0, 0,    // top

-                        1, 1, 0, 1, 0, 0, 1, 0,    // left

-                        0, 0, 1, 0, 1, 1, 0, 1,    // bottom

-                        0, 0, 1, 0, 1, 1, 0, 1];   // back

-

-    var indices =

-        [0, 1, 2, 0, 2, 3,      // front

-                        4, 5, 6, 4, 6, 7,       // right

-                        8, 9, 10, 8, 10, 11,    // top

-                        12, 13, 14, 12, 14, 15, // left

-                        16, 17, 18, 16, 18, 19,  // bottom

-                        20, 21, 22, 20, 22, 23]; // back

-

-

-    var prim = new RDGE.rdgePrimitiveDefinition();

-

-    prim.vertexDefinition =

-            {

-                "vert": { 'type': RDGE.rdgeConstants.VS_ELEMENT_POS, 'bufferIndex': 0, 'bufferUsage': RDGE.rdgeConstants.BUFFER_STATIC },

-                "a_pos": { 'type': RDGE.rdgeConstants.VS_ELEMENT_POS, 'bufferIndex': 0, 'bufferUsage': RDGE.rdgeConstants.BUFFER_STATIC },

-

-                "normal": { 'type': RDGE.rdgeConstants.VS_ELEMENT_FLOAT3, 'bufferIndex': 1, 'bufferUsage': RDGE.rdgeConstants.BUFFER_STATIC },

-                "a_nrm": { 'type': RDGE.rdgeConstants.VS_ELEMENT_FLOAT3, 'bufferIndex': 1, 'bufferUsage': RDGE.rdgeConstants.BUFFER_STATIC },

-

-                "texcoord": { 'type': RDGE.rdgeConstants.VS_ELEMENT_FLOAT2, 'bufferIndex': 2, 'bufferUsage': RDGE.rdgeConstants.BUFFER_STATIC },

-                "a_uv": { 'type': RDGE.rdgeConstants.VS_ELEMENT_FLOAT2, 'bufferIndex': 2, 'bufferUsage': RDGE.rdgeConstants.BUFFER_STATIC }

-            };

-

-    prim.bufferStreams =

-            [

-                                coords,

-                                normals,

-                                uvs

-            ];

-

-    prim.streamUsage =

-            [

-                                RDGE.rdgeConstants.BUFFER_STATIC,

-                                RDGE.rdgeConstants.BUFFER_STATIC,

-                                RDGE.rdgeConstants.BUFFER_STATIC

-            ];

-

-    prim.indexUsage = RDGE.rdgeConstants.BUFFER_STREAM;

-    prim.indexBuffer = indices;

-

-    prim.type = RDGE.rdgeConstants.TRIANGLES;

-

-    renderer.createPrimitive(prim);

-

-    return prim;

-};

-

-// 

-// makeSphere

-//

-// Create a sphere with the passed number of latitude and longitude bands and the passed radius. 

-// Sphere has vertices, normals and texCoords. Create VBOs for each as well as the index array.

-// Return an object with the following properties:

-//

-//  normalObject        WebGLBuffer object for normals

-//  texCoordObject      WebGLBuffer object for texCoords

-//  vertexObject        WebGLBuffer object for vertices

-//  indexObject         WebGLBuffer object for indices

-//  numIndices          The number of indices in the indexObject

-// 

-RDGE.renderUtils.makeSphere = function (ctx, radius, lats, longs) {

-    var geometryData = [];

-    var normalData = [];

-    var texCoordData = [];

-    var indexData = [];

+/* <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> */
+
+var RDGE = RDGE || {};
+RDGE.renderUtils = RDGE.renderUtils || {};
+
+/*
+*   Creates an indexed box primitive
+*  @return a rdge primitive
+*/
+RDGE.renderUtils.createBox = function () {
+    var renderer = RDGE.globals.engine.getContext().renderer;
+
+    var coords =
+        [1, 1, 1, -1, 1, 1, -1, -1, 1, 1, -1, 1,    // front
+                1, 1, 1, 1, -1, 1, 1, -1, -1, 1, 1, -1,     // right
+                1, 1, 1, 1, 1, -1, -1, 1, -1, -1, 1, 1,     // top
+                -1, 1, 1, -1, 1, -1, -1, -1, -1, -1, -1, 1, // left
+                -1, -1, -1, 1, -1, -1, 1, -1, 1, -1, -1, 1, // bottom
+                1, -1, -1, -1, -1, -1, -1, 1, -1, 1, 1, -1]; // back
+
+    var normals =
+        [0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1,    // front
+            1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0,     // right
+            0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0,     // top
+            -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0,     // left
+            0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0,     // bottom
+            0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1];    // back
+
+    var uvs =
+        [1, 1, 0, 1, 0, 0, 1, 0,    // front
+            0, 1, 0, 0, 1, 0, 1, 1,    // right
+            1, 0, 1, 1, 0, 1, 0, 0,    // top
+            1, 1, 0, 1, 0, 0, 1, 0,    // left
+            0, 0, 1, 0, 1, 1, 0, 1,    // bottom
+            0, 0, 1, 0, 1, 1, 0, 1];   // back
+
+    var indices =
+        [0, 1, 2, 0, 2, 3,  // front
+            4, 5, 6, 4, 6, 7,   // right
+            8, 9, 10, 8, 10, 11,    // top
+            12, 13, 14, 12, 14, 15, // left
+            16, 17, 18, 16, 18, 19,  // bottom
+            20, 21, 22, 20, 22, 23]; // back
+
+
+    var prim = new RDGE.rdgePrimitiveDefinition();
+
+    prim.vertexDefinition =
+            {
+                "vert": { 'type': RDGE.rdgeConstants.VS_ELEMENT_POS, 'bufferIndex': 0, 'bufferUsage': RDGE.rdgeConstants.BUFFER_STATIC },
+                "a_pos": { 'type': RDGE.rdgeConstants.VS_ELEMENT_POS, 'bufferIndex': 0, 'bufferUsage': RDGE.rdgeConstants.BUFFER_STATIC },
+
+                "normal": { 'type': RDGE.rdgeConstants.VS_ELEMENT_FLOAT3, 'bufferIndex': 1, 'bufferUsage': RDGE.rdgeConstants.BUFFER_STATIC },
+                "a_nrm": { 'type': RDGE.rdgeConstants.VS_ELEMENT_FLOAT3, 'bufferIndex': 1, 'bufferUsage': RDGE.rdgeConstants.BUFFER_STATIC },
+
+                "texcoord": { 'type': RDGE.rdgeConstants.VS_ELEMENT_FLOAT2, 'bufferIndex': 2, 'bufferUsage': RDGE.rdgeConstants.BUFFER_STATIC },
+                "a_uv": { 'type': RDGE.rdgeConstants.VS_ELEMENT_FLOAT2, 'bufferIndex': 2, 'bufferUsage': RDGE.rdgeConstants.BUFFER_STATIC }
+            };
+
+    prim.bufferStreams =
+            [
+                coords,
+                normals,
+                uvs
+            ];
+
+    prim.streamUsage =
+            [
+                RDGE.rdgeConstants.BUFFER_STATIC,
+                RDGE.rdgeConstants.BUFFER_STATIC,
+                RDGE.rdgeConstants.BUFFER_STATIC
+            ];
+
+    prim.indexUsage = RDGE.rdgeConstants.BUFFER_STREAM;
+    prim.indexBuffer = indices;
+
+    prim.type = RDGE.rdgeConstants.TRIANGLES;
+
+    renderer.createPrimitive(prim);
+
+    return prim;
+};
+
+//
+// makeSphere
+//
+// Create a sphere with the passed number of latitude and longitude bands and the passed radius.
+// Sphere has vertices, normals and texCoords. Create VBOs for each as well as the index array.
+// Return an object with the following properties:
+//
+//  normalObject        WebGLBuffer object for normals
+//  texCoordObject      WebGLBuffer object for texCoords
+//  vertexObject        WebGLBuffer object for vertices
+//  indexObject         WebGLBuffer object for indices
+//  numIndices          The number of indices in the indexObject
+//
+RDGE.renderUtils.makeSphere = function (ctx, radius, lats, longs) {
+    var geometryData = [];
+    var normalData = [];
+    var texCoordData = [];