diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-07-08 13:39:11 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-07-08 13:39:11 +0000 |
| commit | 016faf8449aeb7dba2738da4fefa3609b3af589c (patch) | |
| tree | bc25d08ff2df0ad2ba8f50886c83c06d78b6d11a /src/particleemitter.cpp | |
| parent | 1dab7893195814ba916bb9ec212a7084fd67fb97 (diff) | |
| download | mana-client-016faf8449aeb7dba2738da4fefa3609b3af589c.tar.gz mana-client-016faf8449aeb7dba2738da4fefa3609b3af589c.tar.bz2 mana-client-016faf8449aeb7dba2738da4fefa3609b3af589c.tar.xz mana-client-016faf8449aeb7dba2738da4fefa3609b3af589c.zip | |
Merged 0.0 changes from revision 3317 to 3362 to trunk.
Diffstat (limited to 'src/particleemitter.cpp')
| -rw-r--r-- | src/particleemitter.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp index 2387c652..5b5e86b9 100644 --- a/src/particleemitter.cpp +++ b/src/particleemitter.cpp @@ -76,10 +76,14 @@ ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, Map * {
mParticlePosY = readMinMax(propertyNode, 0.0f);
+ mParticlePosY.minVal *= SIN45;
+ mParticlePosY.maxVal *= SIN45;
}
else if (name == "position-z")
{
mParticlePosZ = readMinMax(propertyNode, 0.0f);
+ mParticlePosZ.minVal *= SIN45;
+ mParticlePosZ.maxVal *= SIN45;
}
else if (name == "image")
{
@@ -236,10 +240,6 @@ ParticleEmitter::ParticleEmitter(xmlNodePtr emitterNode, Particle *target, Map * ParticleEmitter::~ParticleEmitter()
{
- if (mParticleImage)
- {
- mParticleImage->decRef();
- }
}
@@ -294,8 +294,8 @@ ParticleEmitter::createParticles() float power = mParticlePower.value();
newParticle->setVector(
cos(angleH) * cos(angleV) * power,
- sin(angleH) * cos(angleV) * SIN45 * power,
- sin(angleV) * SIN45 * power
+ sin(angleH) * cos(angleV) * power,
+ sin(angleV) * power
);
newParticle->setRandomnes(mParticleRandomnes.value());
|