aboutsummaryrefslogtreecommitdiff
path: root/js/lib/geom/shape-primitive.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-07-09 16:39:17 -0700
committerValerio Virgillito2012-07-09 16:46:43 -0700
commitcee0deca695359ab468bd06d0e05ed3b2010b338 (patch)
tree9d04b6728d5192b2f030669bd41969cbd7db3761 /js/lib/geom/shape-primitive.js
parenta1c0c873e7ede1848a7aa090fb214af4765dbfaf (diff)
parenta5296ddf26a5d8ab7e99643dd1324b6a1f9b4f18 (diff)
downloadninja-cee0deca695359ab468bd06d0e05ed3b2010b338.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Analytics
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/lib/geom/shape-primitive.js')
-rw-r--r--js/lib/geom/shape-primitive.js29
1 files changed, 15 insertions, 14 deletions
diff --git a/js/lib/geom/shape-primitive.js b/js/lib/geom/shape-primitive.js
index e3ff9c06..3e9b0a0b 100644
--- a/js/lib/geom/shape-primitive.js
+++ b/js/lib/geom/shape-primitive.js
@@ -1,24 +1,25 @@
1/* <copyright> 1/* <copyright>
2Copyright (c) 2012, Motorola Mobility, Inc 2Copyright (c) 2012, Motorola Mobility LLC.
3All Rights Reserved. 3All Rights Reserved.
4BSD License.
5 4
6Redistribution and use in source and binary forms, with or without 5Redistribution and use in source and binary forms, with or without
7modification, are permitted provided that the following conditions are met: 6modification, are permitted provided that the following conditions are met:
8 7
9 - Redistributions of source code must retain the above copyright notice, 8* Redistributions of source code must retain the above copyright notice,
10 this list of conditions and the following disclaimer. 9 this list of conditions and the following disclaimer.
11 - Redistributions in binary form must reproduce the above copyright 10
12 notice, this list of conditions and the following disclaimer in the 11* Redistributions in binary form must reproduce the above copyright notice,
13 documentation and/or other materials provided with the distribution. 12 this list of conditions and the following disclaimer in the documentation
14 - Neither the name of Motorola Mobility nor the names of its contributors 13 and/or other materials provided with the distribution.
15 may be used to endorse or promote products derived from this software 14
16 without specific prior written permission. 15* Neither the name of Motorola Mobility LLC nor the names of its
16 contributors may be used to endorse or promote products derived from this
17 software without specific prior written permission.
17 18
18THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 19THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 20AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 21IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
21ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 22ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
22LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
23CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -298,14 +299,14 @@ ShapePrimitive.subdivideOversizedMesh = function( vertices, normals, uvs, indice
298 } 299 }
299 300
300 // create objects out of the 2 halves 301 // create objects out of the 2 halves
301 var obj1 = 302 var obj1 =
302 { 303 {
303 vertices: v0, 304 vertices: v0,
304 normals: n0, 305 normals: n0,
305 uvs: uv0, 306 uvs: uv0,
306 indices: i0 307 indices: i0
307 }, 308 },
308 obj2 = 309 obj2 =
309 { 310 {
310 vertices: v1, 311 vertices: v1,
311 normals: n1, 312 normals: n1,
@@ -322,7 +323,7 @@ ShapePrimitive.subdivideOversizedMesh = function( vertices, normals, uvs, indice
322 } 323 }
323 else 324 else
324 { 325 {
325 rtnArray = 326 rtnArray =
326 [ 327 [
327 { 328 {
328 vertices: vertices, 329 vertices: vertices,