diff options
author | Kris Kowal | 2012-07-09 16:38:08 -0700 |
---|---|---|
committer | Kris Kowal | 2012-07-09 16:38:08 -0700 |
commit | 7bee50379c1df86bb571e0e8d6c08e24d25231f5 (patch) | |
tree | 5b11abd0414e0a3ab50ec6276b6334fbd168db7e /js/helper-classes/RDGE/src/core/script/particle.js | |
parent | 26d4b5ce30e6e0ea6e0fde870853c1e2a673a7b4 (diff) | |
download | ninja-7bee50379c1df86bb571e0e8d6c08e24d25231f5.tar.gz |
BSD License
Diffstat (limited to 'js/helper-classes/RDGE/src/core/script/particle.js')
-rwxr-xr-x | js/helper-classes/RDGE/src/core/script/particle.js | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/js/helper-classes/RDGE/src/core/script/particle.js b/js/helper-classes/RDGE/src/core/script/particle.js index d1ab6239..579cb067 100755 --- a/js/helper-classes/RDGE/src/core/script/particle.js +++ b/js/helper-classes/RDGE/src/core/script/particle.js | |||
@@ -1,24 +1,25 @@ | |||
1 | /* <copyright> | 1 | /* <copyright> |
2 | Copyright (c) 2012, Motorola Mobility, Inc | 2 | Copyright (c) 2012, Motorola Mobility LLC. |
3 | All Rights Reserved. | 3 | All Rights Reserved. |
4 | BSD License. | ||
5 | 4 | ||
6 | Redistribution and use in source and binary forms, with or without | 5 | Redistribution and use in source and binary forms, with or without |
7 | modification, are permitted provided that the following conditions are met: | 6 | modification, 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 | ||
18 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
19 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
20 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
21 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
22 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
23 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
24 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
@@ -77,7 +78,7 @@ RDGE.particle = function (def, id) { | |||
77 | // calculate the initial position in world space. | 78 | // calculate the initial position in world space. |
78 | this.pos = RDGE.mat4.transformPoint(spawnMatrix, this.pos); | 79 | this.pos = RDGE.mat4.transformPoint(spawnMatrix, this.pos); |
79 | } | 80 | } |
80 | // all other values are assumed to be defined in local or world space depending on | 81 | // all other values are assumed to be defined in local or world space depending on |
81 | // the particles worldSpace designation. | 82 | // the particles worldSpace designation. |
82 | var toRadians = Math.PI / 180.0; | 83 | var toRadians = Math.PI / 180.0; |
83 | if (this.def.initialsize) { | 84 | if (this.def.initialsize) { |
@@ -334,10 +335,10 @@ RDGE.particleBuffer = function (pdef, emitter, size) { | |||
334 | var x, y, z, w; | 335 | var x, y, z, w; |
335 | var p = this.particles[i]; | 336 | var p = this.particles[i]; |
336 | var age = (p.age / p.lifespan); // normalized age | 337 | var age = (p.age / p.lifespan); // normalized age |
337 | // combine frame number and age and store in w. | 338 | // combine frame number and age and store in w. |
338 | // to decode : | 339 | // to decode : |
339 | // frame = floor( w ); | 340 | // frame = floor( w ); |
340 | // age = fract( w ); | 341 | // age = fract( w ); |
341 | var pw = Math.min(age, 0.999) + Math.floor(p.frame); | 342 | var pw = Math.min(age, 0.999) + Math.floor(p.frame); |
342 | if (age < 1.0) { // || (pdef.persist != undefined && pdef.persist == true)) { | 343 | if (age < 1.0) { // || (pdef.persist != undefined && pdef.persist == true)) { |
343 | var px = p.pos[0]; | 344 | var px = p.pos[0]; |
@@ -747,7 +748,7 @@ RDGE.particleSys = function (addr) { | |||
747 | var emin = emitter.pbuffer.bounds.min; | 748 | var emin = emitter.pbuffer.bounds.min; |
748 | var emax = emitter.pbuffer.bounds.max; | 749 | var emax = emitter.pbuffer.bounds.max; |
749 | 750 | ||
750 | // calculate a bounds that fits all particles. | 751 | // calculate a bounds that fits all particles. |
751 | if (emin[0] < bmin[0]) { bmin[0] = emin[0]; } | 752 | if (emin[0] < bmin[0]) { bmin[0] = emin[0]; } |
752 | if (emin[1] < bmin[1]) { bmin[1] = emin[1]; } | 753 | if (emin[1] < bmin[1]) { bmin[1] = emin[1]; } |
753 | if (emin[2] < bmin[2]) { bmin[2] = emin[2]; } | 754 | if (emin[2] < bmin[2]) { bmin[2] = emin[2]; } |