mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-11-25 17:53:47 +00:00
Code Issues Releases Wiki Activity

tentative fix for particle flip not working properly in some cases

Browse source
This commit is contained in:
fgenesis 2023-10-20 03:53:29 +02:00
parent a1b2762b59
commit eaa1746f4e
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
BBGE/Emitter.cpp
View file

@ -240,11 +240,12 @@ void Emitter::onRender(const RenderState& rs) const
texture->apply();
if (hasRot)
const bool flip = data.flipH != (data.copyParentFlip && pe->isfhr());
if (flip || hasRot)
{
Vector colorMult = data.inheritColor ? pe->color : Vector(1, 1, 1);
float alphaMult = data.inheritAlpha ? pe->alpha.x : 1;
for (Particles::const_iterator i = particles.begin(); i != particles.end(); i++)
{
Particle *p = *i;
@ -257,7 +258,7 @@ void Emitter::onRender(const RenderState& rs) const
glColor4f(col.x, col.y, col.z, p->alpha.x * alphaMult);
if (p->rot.z != 0 || p->rot.isInterpolating())
if (flip || p->rot.z != 0 || p->rot.isInterpolating())
{
glPushMatrix();
@ -265,9 +266,8 @@ void Emitter::onRender(const RenderState& rs) const
glRotatef(p->rot.z, 0, 0, 1);
if (data.flipH || (data.copyParentFlip && (pe->isfh() || (pe->getParent() && pe->getParent()->isfh()))))
if (flip)
{
glRotatef(180, 0, 1, 0);
}

2
BBGE/Particles.h
View file

@ -133,7 +133,7 @@ public:
Vector getSpawnPosition();
bool hasRot;
bool hasRot; // FIXME: this should be removed eventually
protected:
Vector currentSpawn, lastSpawn;
void onRender(const RenderState& rs) const OVERRIDE;