Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add cpp_tests and improve system.

This commit is contained in:
DelinWorks 2022-06-15 23:04:08 +03:00
parent c950c4ed1e
commit 0a1fe16b33
7 changed files with 1688 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

150
core/2d/CCParticleSystem.cpp
View File

@ -97,36 +97,6 @@ inline void normalize_point(float x, float y, particle_point* out)
out->y = y * n;
}
/**
A more effective random number generator function that fixes strafing for position variance, made by kiss rng.
KEEP IT SIMPLE STUPID (KISS) rng example: https://gist.github.com/3ki5tj/7b1d51e96d1f9bfb89bc
Generates a random number between 0.0 to 1.0 INCLUSIVE.
*/
inline static float RANDOM_KISS_ABS(void)
{
#define kiss_znew(z) (z = 36969 * (z & 65535) + (z >> 16))
#define kiss_wnew(w) (w = 18000 * (w & 65535) + (w >> 16))
#define kiss_MWC(z, w) ((kiss_znew(z) << 16) + kiss_wnew(w))
#define kiss_SHR3(jsr) (jsr ^= (jsr << 17), jsr ^= (jsr >> 13), jsr ^= (jsr << 5))
#define kiss_CONG(jc) (jc = 69069 * jc + 1234567)
#define kiss_KISS(z, w, jc, jsr) ((kiss_MWC(z, w) ^ kiss_CONG(jc)) + kiss_SHR3(jsr))
static unsigned kiss_z = rand(), kiss_w = rand(), kiss_jsr = rand(), kiss_jcong = rand();
return kiss_KISS(kiss_z, kiss_w, kiss_jcong, kiss_jsr) / 4294967296.0;
}
/**
A more effective random number generator function that fixes strafing for position variance, made by kiss rng.
KEEP IT SIMPLE STUPID (KISS) rng example: https://gist.github.com/3ki5tj/7b1d51e96d1f9bfb89bc
Generates a random number between -1.0 and 1.0 INCLUSIVE.
*/
inline static float RANDOM_KISS(void)
{
return -1.0F + RANDOM_KISS_ABS() + RANDOM_KISS_ABS();
}
ParticleData::ParticleData()
{
memset(this, 0, sizeof(ParticleData));
@ -279,7 +249,6 @@ ParticleSystem::ParticleSystem()
, _emissionShapeIndex(0)
, _positionType(PositionType::FREE)
, _paused(false)
, _updatePaused(false)
, _timeScale(1)
, _fixedFPS(0)
, _fixedFPSDelta(0)
@ -777,7 +746,7 @@ void ParticleSystem::addParticles(int count, int animationIndex, int animationCe
// life
for (int i = start; i < _particleCount; ++i)
{
float particleLife = _life + _lifeVar * RANDOM_KISS();
float particleLife = _life + _lifeVar * _rng.rangef();
_particleData.totalTimeToLive[i] = MAX(0, particleLife);
_particleData.timeToLive[i] = MAX(0, particleLife);
}
@ -788,12 +757,12 @@ void ParticleSystem::addParticles(int count, int animationIndex, int animationCe
{
if (_emissionShapes.empty())
{
_particleData.posx[i] = _sourcePosition.x + _posVar.x * RANDOM_KISS();
_particleData.posy[i] = _sourcePosition.y + _posVar.y * RANDOM_KISS();
_particleData.posx[i] = _sourcePosition.x + _posVar.x * _rng.rangef();
_particleData.posy[i] = _sourcePosition.y + _posVar.y * _rng.rangef();
continue;
}
auto randElem = RANDOM_KISS_ABS();
auto randElem = _rng.float01();
auto& shape = _emissionShapes[MIN(randElem * _emissionShapes.size(), _emissionShapes.size() - 1)];
switch (shape.type)
@ -807,29 +776,29 @@ void ParticleSystem::addParticles(int count, int animationIndex, int animationCe
}
case EmissionShapeType::RECT:
{
_particleData.posx[i] = _sourcePosition.x + shape.x + shape.innerWidth / 2 * RANDOM_KISS();
_particleData.posy[i] = _sourcePosition.y + shape.y + shape.innerHeight / 2 * RANDOM_KISS();
_particleData.posx[i] = _sourcePosition.x + shape.x + shape.innerWidth / 2 * _rng.rangef();
_particleData.posy[i] = _sourcePosition.y + shape.y + shape.innerHeight / 2 * _rng.rangef();
break;
}
case EmissionShapeType::RECTTORUS:
{
float width = (shape.outerWidth - shape.innerWidth) * RANDOM_KISS_ABS() + shape.innerWidth;
float height = (shape.outerHeight - shape.innerHeight) * RANDOM_KISS_ABS() + shape.innerHeight;
width = RANDOM_KISS() < 0.0F ? width * -1 : width;
height = RANDOM_KISS() < 0.0F ? height * -1 : height;
float prob = RANDOM_KISS();
_particleData.posx[i] = _sourcePosition.x + shape.x + width / 2 * (prob >= 0.0F ? 1.0F : RANDOM_KISS());
_particleData.posy[i] = _sourcePosition.y + shape.y + height / 2 * (prob < 0.0F ? 1.0F : RANDOM_KISS());
float width = (shape.outerWidth - shape.innerWidth) * _rng.float01() + shape.innerWidth;
float height = (shape.outerHeight - shape.innerHeight) * _rng.float01() + shape.innerHeight;
width = _rng.rangef() < 0.0F ? width * -1 : width;
height = _rng.rangef() < 0.0F ? height * -1 : height;
float prob = _rng.rangef();
_particleData.posx[i] = _sourcePosition.x + shape.x + width / 2 * (prob >= 0.0F ? 1.0F : _rng.rangef());
_particleData.posy[i] = _sourcePosition.y + shape.y + height / 2 * (prob < 0.0F ? 1.0F : _rng.rangef());
break;
}
case EmissionShapeType::CIRCLE:
{
auto val = RANDOM_KISS_ABS() * shape.innerRadius / shape.innerRadius;
auto val = _rng.float01() * shape.innerRadius / shape.innerRadius;
val = powf(val, 1 / shape.edgeElasticity);
auto point = Vec2(0.0F, val * shape.innerRadius);
point = point.rotateByAngle(Vec2::ZERO, -CC_DEGREES_TO_RADIANS(shape.coneOffset + shape.coneAngle / 2 * RANDOM_KISS()));
point = point.rotateByAngle(Vec2::ZERO, -CC_DEGREES_TO_RADIANS(shape.coneOffset + shape.coneAngle / 2 * _rng.rangef()));
_particleData.posx[i] = _sourcePosition.x + shape.x + point.x / 2;
_particleData.posy[i] = _sourcePosition.y + shape.y + point.y / 2;
@ -837,10 +806,10 @@ void ParticleSystem::addParticles(int count, int animationIndex, int animationCe
}
case EmissionShapeType::TORUS:
{
auto val = RANDOM_KISS_ABS() * shape.outerRadius / shape.outerRadius;
auto val = _rng.float01() * shape.outerRadius / shape.outerRadius;
val = powf(val, 1 / shape.edgeElasticity);
auto point = Vec2(0.0F, ((val * (shape.outerRadius - shape.innerRadius) + shape.outerRadius) - (shape.outerRadius - shape.innerRadius)));
point = point.rotateByAngle(Vec2::ZERO, -CC_DEGREES_TO_RADIANS(shape.coneOffset + shape.coneAngle / 2 * RANDOM_KISS()));
point = point.rotateByAngle(Vec2::ZERO, -CC_DEGREES_TO_RADIANS(shape.coneOffset + shape.coneAngle / 2 * _rng.rangef()));
_particleData.posx[i] = _sourcePosition.x + shape.x + point.x / 2;
_particleData.posy[i] = _sourcePosition.y + shape.y + point.y / 2;
@ -861,7 +830,7 @@ void ParticleSystem::addParticles(int count, int animationIndex, int animationCe
Vec2 point = {0, 0};
int rand0 = RANDOM_KISS_ABS() * mask.points.size();
int rand0 = _rng.float01() * mask.points.size();
int index = MIN(rand0, mask.points.size() - 1);
point = mask.points[index];
@ -885,12 +854,12 @@ void ParticleSystem::addParticles(int count, int animationIndex, int animationCe
// position
for (int i = start; i < _particleCount; ++i)
{
_particleData.posx[i] = _sourcePosition.x + _posVar.x * RANDOM_KISS();
_particleData.posx[i] = _sourcePosition.x + _posVar.x * _rng.rangef();
}
for (int i = start; i < _particleCount; ++i)
{
_particleData.posy[i] = _sourcePosition.y + _posVar.y * RANDOM_KISS();
_particleData.posy[i] = _sourcePosition.y + _posVar.y * _rng.rangef();
}
}
@ -911,7 +880,7 @@ void ParticleSystem::addParticles(int count, int animationIndex, int animationCe
_particleData.animIndex[i] = animationIndex;
auto& descriptor = _animations.at(animationIndex);
_particleData.animTimeLength[i] =
descriptor.animationSpeed + descriptor.animationSpeedVariance * RANDOM_KISS();
descriptor.animationSpeed + descriptor.animationSpeedVariance * _rng.rangef();
}
}
}
@ -922,7 +891,7 @@ void ParticleSystem::addParticles(int count, int animationIndex, int animationCe
{
for (int i = start; i < _particleCount; ++i)
{
int rand0 = RANDOM_KISS_ABS() * _animIndexCount;
int rand0 = _rng.float01() * _animIndexCount;
_particleData.animCellIndex[i] = MIN(rand0, _animIndexCount - 1);
}
}
@ -934,12 +903,12 @@ void ParticleSystem::addParticles(int count, int animationIndex, int animationCe
for (int i = start; i < _particleCount; ++i)
{
int rand0 = RANDOM_KISS_ABS() * _randomAnimations.size();
int rand0 = _rng.float01() * _randomAnimations.size();
int index = MIN(rand0, _randomAnimations.size() - 1);
_particleData.animIndex[i] = _randomAnimations[index];
auto& descriptor = _animations.at(_particleData.animIndex[i]);
_particleData.animTimeLength[i] =
descriptor.animationSpeed + descriptor.animationSpeedVariance * RANDOM_KISS();
descriptor.animationSpeed + descriptor.animationSpeedVariance * _rng.rangef();
}
}
@ -951,7 +920,7 @@ void ParticleSystem::addParticles(int count, int animationIndex, int animationCe
#define SET_COLOR(c, b, v) \
for (int i = start; i < _particleCount; ++i) \
{ \
c[i] = clampf(b + v * RANDOM_KISS(), 0, 1); \
c[i] = clampf(b + v * _rng.rangef(), 0, 1); \
}
SET_COLOR(_particleData.colorR, _startColor.r, _startColorVar.r);
@ -980,7 +949,7 @@ void ParticleSystem::addParticles(int count, int animationIndex, int animationCe
{
for (int i = start; i < _particleCount; ++i)
{
_particleData.opacityFadeInLength[i] = _spawnFadeIn + _spawnFadeInVar * RANDOM_KISS();
_particleData.opacityFadeInLength[i] = _spawnFadeIn + _spawnFadeInVar * _rng.rangef();
}
std::fill_n(_particleData.opacityFadeInDelta + start, _particleCount - start, 0.0F);
}
@ -990,7 +959,7 @@ void ParticleSystem::addParticles(int count, int animationIndex, int animationCe
{
for (int i = start; i < _particleCount; ++i)
{
_particleData.scaleInLength[i] = _spawnScaleIn + _spawnScaleInVar * RANDOM_KISS();
_particleData.scaleInLength[i] = _spawnScaleIn + _spawnScaleInVar * _rng.rangef();
}
std::fill_n(_particleData.scaleInDelta + start, _particleCount - start, 0.0F);
}
@ -1000,24 +969,24 @@ void ParticleSystem::addParticles(int count, int animationIndex, int animationCe
{
for (int i = start; i < _particleCount; ++i)
{
_particleData.hue[i] = _hsv.h + _hsvVar.h * RANDOM_KISS();
_particleData.hue[i] = _hsv.h + _hsvVar.h * _rng.rangef();
}
for (int i = start; i < _particleCount; ++i)
{
_particleData.sat[i] = _hsv.s + _hsvVar.s * RANDOM_KISS();
_particleData.sat[i] = _hsv.s + _hsvVar.s * _rng.rangef();
}
for (int i = start; i < _particleCount; ++i)
{
_particleData.val[i] = _hsv.v + _hsvVar.v * RANDOM_KISS();
_particleData.val[i] = _hsv.v + _hsvVar.v * _rng.rangef();
}
}
// size
for (int i = start; i < _particleCount; ++i)
{
_particleData.size[i] = _startSize + _startSizeVar * RANDOM_KISS();
_particleData.size[i] = _startSize + _startSizeVar * _rng.rangef();
_particleData.size[i] = MAX(0, _particleData.size[i]);
}
@ -1025,7 +994,7 @@ void ParticleSystem::addParticles(int count, int animationIndex, int animationCe
{
for (int i = start; i < _particleCount; ++i)
{
float endSize = _endSize + _endSizeVar * RANDOM_KISS();
float endSize = _endSize + _endSizeVar * _rng.rangef();
endSize = MAX(0, endSize);
_particleData.deltaSize[i] = (endSize - _particleData.size[i]) / _particleData.timeToLive[i];
}
@ -1036,18 +1005,18 @@ void ParticleSystem::addParticles(int count, int animationIndex, int animationCe
// rotation
for (int i = start; i < _particleCount; ++i)
{
_particleData.rotation[i] = _startSpin + _startSpinVar * RANDOM_KISS();
_particleData.rotation[i] = _startSpin + _startSpinVar * _rng.rangef();
}
for (int i = start; i < _particleCount; ++i)
{
float endA = _endSpin + _endSpinVar * RANDOM_KISS();
float endA = _endSpin + _endSpinVar * _rng.rangef();
_particleData.deltaRotation[i] = (endA - _particleData.rotation[i]) / _particleData.timeToLive[i];
}
// static rotation
for (int i = start; i < _particleCount; ++i)
{
_particleData.staticRotation[i] = _spawnAngle + _spawnAngleVar * RANDOM_KISS();
_particleData.staticRotation[i] = _spawnAngle + _spawnAngleVar * _rng.rangef();
}
// position
@ -1070,13 +1039,13 @@ void ParticleSystem::addParticles(int count, int animationIndex, int animationCe
// radial accel
for (int i = start; i < _particleCount; ++i)
{
_particleData.modeA.radialAccel[i] = modeA.radialAccel + modeA.radialAccelVar * RANDOM_KISS();
_particleData.modeA.radialAccel[i] = modeA.radialAccel + modeA.radialAccelVar * _rng.rangef();
}
// tangential accel
for (int i = start; i < _particleCount; ++i)
{
_particleData.modeA.tangentialAccel[i] = modeA.tangentialAccel + modeA.tangentialAccelVar * RANDOM_KISS();
_particleData.modeA.tangentialAccel[i] = modeA.tangentialAccel + modeA.tangentialAccelVar * _rng.rangef();
}
// rotation is dir
@ -1084,9 +1053,9 @@ void ParticleSystem::addParticles(int count, int animationIndex, int animationCe
{
for (int i = start; i < _particleCount; ++i)
{
float a = CC_DEGREES_TO_RADIANS(_angle + _angleVar * RANDOM_KISS());
float a = CC_DEGREES_TO_RADIANS(_angle + _angleVar * _rng.rangef());
Vec2 v(cosf(a), sinf(a));
float s = modeA.speed + modeA.speedVar * RANDOM_KISS();
float s = modeA.speed + modeA.speedVar * _rng.rangef();
Vec2 dir = v * s;
_particleData.modeA.dirX[i] = dir.x; // v * s ;
_particleData.modeA.dirY[i] = dir.y;
@ -1097,9 +1066,9 @@ void ParticleSystem::addParticles(int count, int animationIndex, int animationCe
{
for (int i = start; i < _particleCount; ++i)
{
float a = CC_DEGREES_TO_RADIANS(_angle + _angleVar * RANDOM_KISS());
float a = CC_DEGREES_TO_RADIANS(_angle + _angleVar * _rng.rangef());
Vec2 v(cosf(a), sinf(a));
float s = modeA.speed + modeA.speedVar * RANDOM_KISS();
float s = modeA.speed + modeA.speedVar * _rng.rangef();
Vec2 dir = v * s;
_particleData.modeA.dirX[i] = dir.x; // v * s ;
_particleData.modeA.dirY[i] = dir.y;
@ -1114,18 +1083,18 @@ void ParticleSystem::addParticles(int count, int animationIndex, int animationCe
// Set the default diameter of the particle from the source position
for (int i = start; i < _particleCount; ++i)
{
_particleData.modeB.radius[i] = modeB.startRadius + modeB.startRadiusVar * RANDOM_KISS();
_particleData.modeB.radius[i] = modeB.startRadius + modeB.startRadiusVar * _rng.rangef();
}
for (int i = start; i < _particleCount; ++i)
{
_particleData.modeB.angle[i] = CC_DEGREES_TO_RADIANS(_angle + _angleVar * RANDOM_KISS());
_particleData.modeB.angle[i] = CC_DEGREES_TO_RADIANS(_angle + _angleVar * _rng.rangef());
}
for (int i = start; i < _particleCount; ++i)
{
_particleData.modeB.degreesPerSecond[i] =
CC_DEGREES_TO_RADIANS(modeB.rotatePerSecond + modeB.rotatePerSecondVar * RANDOM_KISS());
CC_DEGREES_TO_RADIANS(modeB.rotatePerSecond + modeB.rotatePerSecondVar * _rng.rangef());
}
if (modeB.endRadius == START_RADIUS_EQUAL_TO_END_RADIUS)
@ -1134,7 +1103,7 @@ void ParticleSystem::addParticles(int count, int animationIndex, int animationCe
{
for (int i = start; i < _particleCount; ++i)
{
float endRadius = modeB.endRadius + modeB.endRadiusVar * RANDOM_KISS();
float endRadius = modeB.endRadius + modeB.endRadiusVar * _rng.rangef();
_particleData.modeB.deltaRadius[i] =
(endRadius - _particleData.modeB.radius[i]) / _particleData.timeToLive[i];
}
@ -1483,7 +1452,12 @@ bool ParticleSystem::addAnimationIndex(cocos2d::SpriteFrame* frame)
bool ParticleSystem::addAnimationIndex(unsigned short index, cocos2d::SpriteFrame* frame)
{
if (frame)
return addAnimationIndex(index, frame->getRect(), frame->isRotated());
{
auto rect = frame->getRectInPixels();
rect.size.x = frame->getOriginalSizeInPixels().x;
rect.size.y = frame->getOriginalSizeInPixels().y;
return addAnimationIndex(index, rect, frame->isRotated());
}
return false;
}
@ -1505,8 +1479,6 @@ bool ParticleSystem::addAnimationIndex(unsigned short index, cocos2d::Rect rect,
void ParticleSystem::simulate(float seconds, float frameRate)
{
auto l_updatePaused = _updatePaused;
_updatePaused = false;
seconds = seconds == SIMULATION_USE_PARTICLE_LIFETIME ? getLife() + getLifeVar() : seconds;
frameRate = frameRate == SIMULATION_USE_GAME_ANIMATION_INTERVAL
? 1.0F / Director::getInstance()->getAnimationInterval()
@ -1523,7 +1495,6 @@ void ParticleSystem::simulate(float seconds, float frameRate)
}
else
this->update(seconds);
_updatePaused = l_updatePaused;
}
void ParticleSystem::resimulate(float seconds, float frameRate)
@ -1577,7 +1548,7 @@ bool ParticleSystem::isFull()
void ParticleSystem::update(float dt)
{
// don't process particles nor update gl buffer when this node is invisible.
if (!_visible || _updatePaused)
if (!_visible)
return;
CC_PROFILER_START_CATEGORY(kProfilerCategoryParticles, "CCParticleSystem - update");
@ -1668,7 +1639,7 @@ void ParticleSystem::update(float dt)
if (_particleData.animTimeDelta[i] > _particleData.animTimeLength[i])
{
auto& anim = _animations.at(_particleData.animIndex[i]);
float percent = RANDOM_KISS_ABS();
float percent = _rng.float01();
percent = anim.reverseIndices ? 1.0F - percent : percent;
_particleData.animCellIndex[i] = anim.animationIndices[MIN(
@ -2264,21 +2235,6 @@ void ParticleSystem::resumeEmissions()
_paused = false;
}
bool ParticleSystem::isUpdatePaused() const
{
return _updatePaused;
}
void ParticleSystem::pauseUpdate()
{
_updatePaused = true;
}
void ParticleSystem::resumeUpdate()
{
_updatePaused = false;
}
float ParticleSystem::getFixedFPS()
{
return _fixedFPS;

114
core/2d/CCParticleSystem.h
View File

@ -54,10 +54,92 @@ struct particle_point
float y;
};
//* A more effective random number generator function that fixes strafing for position variance, made by kiss rng.
struct RngSeed
{
const unsigned long RNG_RAND_MAX = 4294967295;
const unsigned long RNG_RAND_MAX_SIGNED = 2147483647;
unsigned long _x = 1;
unsigned long _y = 2;
unsigned long _z = 4;
unsigned long _w = 8;
unsigned long _carry = 0;
unsigned long _k;
unsigned long _m;
unsigned long _seed;
RngSeed() { seed_rand(time(NULL)); }
// initialize this object with seed
void seed_rand(unsigned long seed)
{
_seed = seed;
_x = seed | 1;
_y = seed | 2;
_z = seed | 4;
_w = seed | 8;
_carry = 0;
}
// returns an unsigned long random value
unsigned long rand()
{
_x = _x * 69069 + 1;
_y ^= _y << 13;
_y ^= _y >> 17;
_y ^= _y << 5;
_k = (_z >> 2) + (_w >> 3) + (_carry >> 2);
_m = _w + _w + _z + _carry;
_z = _w;
_w = _m;
_carry = _k >> 30;
return _x + _y + _w;
}
// returns a random integer from min to max
int range(int min, int max)
{
return floor(min + static_cast<float>(rand()) / (static_cast<float>(RNG_RAND_MAX / (max - min))));
}
// returns a random unsigned integer from min to max
unsigned int rangeu(unsigned int min, unsigned int max)
{
return floor(min + static_cast<float>(rand()) / (static_cast<float>(RNG_RAND_MAX / (max - min))));
}
// returns a random float from min to max
float rangef(float min = -1.0F, float max = 1.0F)
{
return min + static_cast<float>(rand()) / (static_cast<float>(RNG_RAND_MAX / (max - min)));
}
// returns a random integer from 0 to max
int max(int max = INT_MAX)
{
return floor(0 + static_cast<float>(rand()) / (static_cast<float>(RNG_RAND_MAX / (max - 0))));
}
// returns a random unsigned integer from 0 to max
unsigned int maxu(unsigned int max = UINT_MAX)
{
return floor(0 + static_cast<float>(rand()) / (static_cast<float>(RNG_RAND_MAX / (max - 0))));
}
// returns a random float from 0.0 to max
float maxf(float max) { return 0 + static_cast<float>(rand()) / (static_cast<float>(RNG_RAND_MAX / (max - 0))); }
// returns a random float from 0.0 to 1.0
float float01() { return 0 + static_cast<float>(rand()) / (static_cast<float>(RNG_RAND_MAX / (1 - 0))); }
// returns either false or true randomly
bool bool01() { return (bool)floor(0 + static_cast<float>(rand()) / (static_cast<float>(RNG_RAND_MAX / (2 - 0)))); }
};
/**
* Particle emission shapes.
* Current supported shapes are Point, Rectangle, RectangularTorus, Circle, Torus
* @since adxe-1.0.0b7
* @since adxe-1.0.0b8
*/
enum class EmissionShapeType
{
@ -71,7 +153,7 @@ enum class EmissionShapeType
/**
* Particle emission mask descriptor.
* @since adxe-1.0.0b7
* @since adxe-1.0.0b8
*/
struct ParticleEmissionMaskDescriptor
{
@ -82,7 +164,7 @@ struct ParticleEmissionMaskDescriptor
/**
* Particle emission shapes.
* Current supported shapes are Point, Rectangle, RectangularTorus, Circle, Torus, Cone, Cone Torus
* @since adxe-1.0.0b7
* @since adxe-1.0.0b8
*/
struct EmissionShape
{
@ -259,7 +341,7 @@ public:
/**
* Particle emission mask cache.
* @since adxe-1.0.0b7
* @since adxe-1.0.0b8
*/
class CC_DLL ParticleEmissionMaskCache : public cocos2d::Ref
{
@ -1021,14 +1103,14 @@ public:
*/
void setSpawnFadeInVar(float time);
/** Gets the spawn opacity fade in time of each particle.
/** Gets the spawn scale fade in time of each particle.
* Particles have the ability to spawn while having 0.0 size and gradually start going to 1.0 size with a specified
* time.
*
* @return The spawn opacity fade in time in seconds.
*/
float getSpawnScaleIn() { return _spawnScaleIn; }
/** Sets the spawn opacity fade in time of each particle when it's created.
/** Sets the spawn scale fade in time of each particle when it's created.
* Particles have the ability to spawn while having 0.0 size and gradually start going to 1.0 size with a specified
* time.
*
@ -1036,14 +1118,14 @@ public:
*/
void setSpawnScaleIn(float time);
/** Gets the spawn opacity fade in time variance of each particle.
/** Gets the spawn scale fade in time variance of each particle.
* Particles have the ability to spawn while having 0.0 size and gradually start going to 1.0 size with a specified
* time.
*
* @return The spawn opacity fade in time variance in seconds.
*/
float getSpawnScaleInVar() { return _spawnScaleInVar; }
/** Sets the spawn opacity fade in time variance of each particle when it's created.
/** Sets the spawn scale fade in time variance of each particle when it's created.
* Particles have the ability to spawn while having 0.0 size and gradually start going to 1.0 size with a specified
* time.
*
@ -1448,17 +1530,6 @@ public:
/* Unpause the emissions */
virtual void resumeEmissions();
/** Is system update paused
@return True if system update is paused, else false
*/
virtual bool isUpdatePaused() const;
/* Pause the particles from being updated */
virtual void pauseUpdate();
/* Unpause the particles from being updated */
virtual void resumeUpdate();
/** Gets the fixed frame rate count of the particle system.
@return Fixed frame rate count of the particle system.
*/
@ -1694,9 +1765,6 @@ protected:
/** is the emitter paused */
bool _paused;
/** is particle system update paused */
bool _updatePaused;
/** time scale of the particle system */
float _timeScale;
@ -1711,6 +1779,8 @@ protected:
static Vector<ParticleSystem*> __allInstances;
RngSeed _rng;
private:
CC_DISALLOW_COPY_AND_ASSIGN(ParticleSystem);
};

1148
tests/cpp-tests/Classes/ParticleTest/ParticleTest.cpp
View File

File diff suppressed because it is too large Load Diff

219
tests/cpp-tests/Classes/ParticleTest/ParticleTest.h
View File

@ -182,6 +182,225 @@ public:
virtual std::string subtitle() const override;
};
class DemoFixedFPS : public ParticleDemo
{
public:
CREATE_FUNC(DemoFixedFPS);
virtual void onEnter() override;
virtual std::string subtitle() const override;
};
class DemoTimeScale: public ParticleDemo
{
public:
CREATE_FUNC(DemoTimeScale);
virtual void onEnter() override;
virtual std::string subtitle() const override;
virtual void update(float dt) override;
float elapsedTime = 0.0F;
};
class DemoSpawnFadeIn : public ParticleDemo
{
public:
CREATE_FUNC(DemoSpawnFadeIn);
virtual void onEnter() override;
virtual std::string subtitle() const override;
};
class DemoScaleFadeIn : public ParticleDemo
{
public:
CREATE_FUNC(DemoScaleFadeIn);
virtual void onEnter() override;
virtual std::string subtitle() const override;
};
class DemoSimulation : public ParticleDemo
{
public:
CREATE_FUNC(DemoSimulation);
virtual void onEnter() override;
virtual std::string subtitle() const override;
};
class DemoSpawnRotation : public ParticleDemo
{
public:
CREATE_FUNC(DemoSpawnRotation);
virtual void onEnter() override;
virtual std::string subtitle() const override;
};
class DemoHSV : public ParticleDemo
{
public:
CREATE_FUNC(DemoHSV);
virtual void onEnter() override;
virtual std::string subtitle() const override;
};
class DemoLifeAnimation : public ParticleDemo
{
public:
CREATE_FUNC(DemoLifeAnimation);
virtual void onEnter() override;
virtual std::string subtitle() const override;
};
class DemoLifeAnimationAtlas : public ParticleDemo
{
public:
CREATE_FUNC(DemoLifeAnimationAtlas);
virtual void onEnter() override;
virtual std::string subtitle() const override;
};
class DemoLifeAnimationReversed : public ParticleDemo
{
public:
CREATE_FUNC(DemoLifeAnimationReversed);
virtual void onEnter() override;
virtual std::string subtitle() const override;
};
class DemoLoopAnimation : public ParticleDemo
{
public:
CREATE_FUNC(DemoLoopAnimation);
virtual void onEnter() override;
virtual std::string subtitle() const override;
};
class DemoLoopAnimationReversed : public ParticleDemo
{
public:
CREATE_FUNC(DemoLoopAnimationReversed);
virtual void onEnter() override;
virtual std::string subtitle() const override;
};
class DemoEmitterAnimation : public ParticleDemo
{
public:
CREATE_FUNC(DemoEmitterAnimation);
virtual void onEnter() override;
virtual std::string subtitle() const override;
};
class DemoEmitterAnimationDescriptor : public ParticleDemo
{
public:
CREATE_FUNC(DemoEmitterAnimationDescriptor);
virtual void onEnter() override;
virtual std::string subtitle() const override;
};
class DemoLoopAnimationMultiDescriptor : public ParticleDemo
{
public:
CREATE_FUNC(DemoLoopAnimationMultiDescriptor);
virtual void onEnter() override;
virtual std::string subtitle() const override;
};
class DemoEmissionShapePoint : public ParticleDemo
{
public:
CREATE_FUNC(DemoEmissionShapePoint);
virtual void onEnter() override;
virtual std::string subtitle() const override;
};
class DemoEmissionShapeRect : public ParticleDemo
{
public:
CREATE_FUNC(DemoEmissionShapeRect);
virtual void onEnter() override;
virtual std::string subtitle() const override;
};
class DemoEmissionShapeRectTorus : public ParticleDemo
{
public:
CREATE_FUNC(DemoEmissionShapeRectTorus);
virtual void onEnter() override;
virtual std::string subtitle() const override;
};
class DemoEmissionShapeCircle : public ParticleDemo
{
public:
CREATE_FUNC(DemoEmissionShapeCircle);
virtual void onEnter() override;
virtual std::string subtitle() const override;
};
class DemoEmissionShapeCircleBiasEdge : public ParticleDemo
{
public:
CREATE_FUNC(DemoEmissionShapeCircleBiasEdge);
virtual void onEnter() override;
virtual std::string subtitle() const override;
};
class DemoEmissionShapeCircleBiasCenter : public ParticleDemo
{
public:
CREATE_FUNC(DemoEmissionShapeCircleBiasCenter);
virtual void onEnter() override;
virtual std::string subtitle() const override;
};
class DemoEmissionShapeTorus : public ParticleDemo
{
public:
CREATE_FUNC(DemoEmissionShapeTorus);
virtual void onEnter() override;
virtual std::string subtitle() const override;
};
class DemoEmissionShapeTorusBiasEdge : public ParticleDemo
{
public:
CREATE_FUNC(DemoEmissionShapeTorusBiasEdge);
virtual void onEnter() override;
virtual std::string subtitle() const override;
};
class DemoEmissionShapeTorusBiasInner : public ParticleDemo
{
public:
CREATE_FUNC(DemoEmissionShapeTorusBiasInner);
virtual void onEnter() override;
virtual std::string subtitle() const override;
};
class DemoEmissionShapeCone : public ParticleDemo
{
public:
CREATE_FUNC(DemoEmissionShapeCone);
virtual void onEnter() override;
virtual std::string subtitle() const override;
};
class DemoEmissionShapeConeTorus : public ParticleDemo
{
public:
CREATE_FUNC(DemoEmissionShapeConeTorus);
virtual void onEnter() override;
virtual std::string subtitle() const override;
};
class DemoEmissionShapeAlphaMask : public ParticleDemo
{
public:
CREATE_FUNC(DemoEmissionShapeAlphaMask);
virtual void onEnter() override;
virtual std::string subtitle() const override;
};
class DemoParticleFromFile : public ParticleDemo
{
public:

176
tests/cpp-tests/Resources/Particles/animation_1.plist Normal file
View File

@ -0,0 +1,176 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>frames</key>
<dict>
<key>particle_anim_0.png</key>
<dict>
<key>aliases</key>
<array/>
<key>spriteOffset</key>
<string>{0,0}</string>
<key>spriteSize</key>
<string>{64,64}</string>
<key>spriteSourceSize</key>
<string>{64,64}</string>
<key>textureRect</key>
<string>{{0,0},{64,64}}</string>
<key>textureRotated</key>
<false/>
</dict>
<key>particle_anim_1.png</key>
<dict>
<key>aliases</key>
<array/>
<key>spriteOffset</key>
<string>{0,0}</string>
<key>spriteSize</key>
<string>{64,64}</string>
<key>spriteSourceSize</key>
<string>{64,64}</string>
<key>textureRect</key>
<string>{{64,0},{64,64}}</string>
<key>textureRotated</key>
<false/>
</dict>
<key>particle_anim_2.png</key>
<dict>
<key>aliases</key>
<array/>
<key>spriteOffset</key>
<string>{0,0}</string>
<key>spriteSize</key>
<string>{64,64}</string>
<key>spriteSourceSize</key>
<string>{64,64}</string>
<key>textureRect</key>
<string>{{128,0},{64,64}}</string>
<key>textureRotated</key>
<false/>
</dict>
<key>particle_anim_3.png</key>
<dict>
<key>aliases</key>
<array/>
<key>spriteOffset</key>
<string>{0,0}</string>
<key>spriteSize</key>
<string>{64,64}</string>
<key>spriteSourceSize</key>
<string>{64,64}</string>
<key>textureRect</key>
<string>{{192,0},{64,64}}</string>
<key>textureRotated</key>
<false/>
</dict>
<key>particle_anim_4.png</key>
<dict>
<key>aliases</key>
<array/>
<key>spriteOffset</key>
<string>{0,0}</string>
<key>spriteSize</key>
<string>{64,64}</string>
<key>spriteSourceSize</key>
<string>{64,64}</string>
<key>textureRect</key>
<string>{{256,0},{64,64}}</string>
<key>textureRotated</key>
<false/>
</dict>
<key>particle_anim_5.png</key>
<dict>
<key>aliases</key>
<array/>
<key>spriteOffset</key>
<string>{0,0}</string>
<key>spriteSize</key>
<string>{64,64}</string>
<key>spriteSourceSize</key>
<string>{64,64}</string>
<key>textureRect</key>
<string>{{320,0},{64,64}}</string>
<key>textureRotated</key>
<false/>
</dict>
<key>particle_anim_6.png</key>
<dict>
<key>aliases</key>
<array/>
<key>spriteOffset</key>
<string>{0,0}</string>
<key>spriteSize</key>
<string>{64,64}</string>
<key>spriteSourceSize</key>
<string>{64,64}</string>
<key>textureRect</key>
<string>{{384,0},{64,64}}</string>
<key>textureRotated</key>
<false/>
</dict>
<key>particle_anim_7.png</key>
<dict>
<key>aliases</key>
<array/>
<key>spriteOffset</key>
<string>{0,0}</string>
<key>spriteSize</key>
<string>{64,64}</string>
<key>spriteSourceSize</key>
<string>{64,64}</string>
<key>textureRect</key>
<string>{{448,0},{64,64}}</string>
<key>textureRotated</key>
<false/>
</dict>
<key>particle_anim_8.png</key>
<dict>
<key>aliases</key>
<array/>
<key>spriteOffset</key>
<string>{0,0}</string>
<key>spriteSize</key>
<string>{64,64}</string>
<key>spriteSourceSize</key>
<string>{64,64}</string>
<key>textureRect</key>
<string>{{512,0},{64,64}}</string>
<key>textureRotated</key>
<false/>
</dict>
<key>particle_anim_9.png</key>
<dict>
<key>aliases</key>
<array/>
<key>spriteOffset</key>
<string>{0,0}</string>
<key>spriteSize</key>
<string>{64,64}</string>
<key>spriteSourceSize</key>
<string>{64,64}</string>
<key>textureRect</key>
<string>{{576,0},{64,64}}</string>
<key>textureRotated</key>
<false/>
</dict>
</dict>
<key>metadata</key>
<dict>
<key>format</key>
<integer>3</integer>
<key>pixelFormat</key>
<string>RGBA8888</string>
<key>premultiplyAlpha</key>
<false/>
<key>realTextureFileName</key>
<string>animation_1.png</string>
<key>size</key>
<string>{640,64}</string>
<key>smartupdate</key>
<string>$TexturePacker:SmartUpdate:da26e187ca02fabf90d1710d32ee7cf9:36c91cc4cb0ce67ab1706c682518e467:5e97592c8b58bf2d3aec7c12fc605c76$</string>
<key>textureFileName</key>
<string>animation_1.png</string>
</dict>
</dict>
</plist>

BIN
tests/cpp-tests/Resources/Particles/animation_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.9 KiB

BIN
tests/cpp-tests/Resources/Particles/mask.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB