Minor code cleanup

This commit is contained in:
Alex Szpakowski
2014-05-01 14:12:21 -03:00
parent e667485f68
commit e4dc533bb2
26 changed files with 112 additions and 110 deletions
@@ -276,8 +276,8 @@ void ParticleSystem::initParticle(Particle *p, float t)
min = speedMin;
max = speedMax;
float speed = (float) rng.random(min, max);
p->speed = love::Vector(cosf(p->direction), sinf(p->direction));
p->speed *= speed;
p->velocity = love::Vector(cosf(p->direction), sinf(p->direction));
p->velocity *= speed;
p->linearAcceleration.x = (float) rng.random(linearAccelerationMin.x, linearAccelerationMax.x);
p->linearAcceleration.y = (float) rng.random(linearAccelerationMin.y, linearAccelerationMax.y);
@@ -302,7 +302,7 @@ void ParticleSystem::initParticle(Particle *p, float t)
p->angle = p->rotation;
if (relativeRotation)
p->angle += atan2f(p->speed.y, p->speed.x);
p->angle += atan2f(p->velocity.y, p->velocity.x);
p->color = colors[0];
}
@@ -907,11 +907,11 @@ void ParticleSystem::update(float dt)
// Resize tangential.
tangential *= p->tangentialAcceleration;
// Update position.
p->speed += (radial+tangential+p->linearAcceleration)*dt;
// Update velocity.
p->velocity += (radial + tangential + p->linearAcceleration) * dt;
// Modify position.
ppos += p->speed * dt;
ppos += p->velocity * dt;
p->position[0] = ppos.getX();
p->position[1] = ppos.getY();
@@ -924,7 +924,7 @@ void ParticleSystem::update(float dt)
p->angle = p->rotation;
if (relativeRotation)
p->angle += atan2f(p->speed.y, p->speed.x);
p->angle += atan2f(p->velocity.y, p->velocity.x);
// Change size according to given intervals:
// i = 0 1 2 3 n-1
+1 -1
View File
@@ -516,7 +516,7 @@ protected:
// Particles gravitate towards this point.
love::Vector origin;
love::Vector speed;
love::Vector velocity;
love::Vector linearAcceleration;
float radialAcceleration;
float tangentialAcceleration;
+2 -2
View File
@@ -111,7 +111,7 @@ int SpriteBatch::add(float x, float y, float a, float sx, float sy, float ox, fl
memcpy(sprite, texture->getVertices(), sizeof(Vertex) * 4);
// Transform.
static Matrix t;
Matrix t;
t.setTransformation(x, y, a, sx, sy, ox, oy, kx, ky);
t.transform(sprite, sprite, 4);
@@ -138,7 +138,7 @@ int SpriteBatch::addq(Quad *quad, float x, float y, float a, float sx, float sy,
// Needed for colors.
memcpy(sprite, quad->getVertices(), sizeof(Vertex) * 4);
static Matrix t;
Matrix t;
t.setTransformation(x, y, a, sx, sy, ox, oy, kx, ky);
t.transform(sprite, sprite, 4);