ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stop using our hack of moving the emission direction around, when you fire lots of particles this hack is very obvious. Use only what irrlicht provides

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7296 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2011-01-06 02:37:55 +00:00
parent 4a6793178d
commit 89346d58f1
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/graphics/particle_emitter.cpp
View File

@ -68,11 +68,13 @@ ParticleEmitter::ParticleEmitter(ParticleKind* type, core::vector3df position,
{ {
// FIXME: does the maxAngle param work at all?? // FIXME: does the maxAngle param work at all??
// FIXME: the min and max color params don't appear to work // FIXME: the min and max color params don't appear to work
m_emitter = m_node->createPointEmitter(core::vector3df(0.0f, 0.0f, 5.0f), // velocity in m/ms m_emitter = m_node->createPointEmitter(core::vector3df(m_particle_type->getVelocityX(),
m_particle_type->getVelocityY(),
m_particle_type->getVelocityZ()), // velocity in m/ms
type->getMinRate(), type->getMaxRate(), type->getMinRate(), type->getMaxRate(),
type->getMinColor(), type->getMaxColor(), type->getMinColor(), type->getMaxColor(),
lifeTimeMin, lifeTimeMax, lifeTimeMin, lifeTimeMax,
0 /* angle */ m_particle_type->getAngleSpreadX() /* angle */
); );
break; break;
} }
@ -86,15 +88,17 @@ ParticleEmitter::ParticleEmitter(ParticleKind* type, core::vector3df position,
const float box_size_z = type->getBoxSizeZ()/2.0f; const float box_size_z = type->getBoxSizeZ()/2.0f;
m_emitter = m_node->createBoxEmitter(core::aabbox3df(-box_size_x, -box_size_y, -box_size_z, m_emitter = m_node->createBoxEmitter(core::aabbox3df(-box_size_x, -box_size_y, -box_size_z,
box_size_x, box_size_y, box_size_z), box_size_x, box_size_y, box_size_z),
core::vector3df(0.0f, 0.0f, 0.0f), // velocity in m/ms core::vector3df(m_particle_type->getVelocityX(),
m_particle_type->getVelocityY(),
m_particle_type->getVelocityZ()), // velocity in m/ms
type->getMinRate(), type->getMaxRate(), type->getMinRate(), type->getMaxRate(),
type->getMinColor(), type->getMaxColor(), type->getMinColor(), type->getMaxColor(),
lifeTimeMin, lifeTimeMax, lifeTimeMin, lifeTimeMax,
0 /* angle */ m_particle_type->getAngleSpreadX() /* angle */
); );
//irr_driver->getSceneManager()->addCubeSceneNode(2.0f, parent, -1, position, core::vector3df(0, 0, 0) /* rotation */, irr_driver->getSceneManager()->addCubeSceneNode(2.0f, parent, -1, position, core::vector3df(0, 0, 0) /* rotation */,
// core::vector3df(box_size_x, box_size_y, box_size_z)); core::vector3df(box_size_x, box_size_y, box_size_z));
break; break;
} }
@ -137,14 +141,15 @@ void ParticleEmitter::update()
// There seems to be no way to randomise the velocity for particles, // There seems to be no way to randomise the velocity for particles,
// so we have to do this manually, by changing the default velocity. // so we have to do this manually, by changing the default velocity.
// Irrlicht expects velocity (called 'direction') in m/ms!! // Irrlicht expects velocity (called 'direction') in m/ms!!
/*
const int x = m_particle_type->getAngleSpreadX(); const int x = m_particle_type->getAngleSpreadX();
const int y = m_particle_type->getAngleSpreadY(); const int y = m_particle_type->getAngleSpreadY();
const int z = m_particle_type->getAngleSpreadZ(); const int z = m_particle_type->getAngleSpreadZ();
Vec3 dir(cos(DEGREE_TO_RAD*(rand()%x - x/2))*m_particle_type->getVelocityX(), Vec3 dir(cos(DEGREE_TO_RAD*(rand()%x - x/2))*m_particle_type->getVelocityX(),
sin(DEGREE_TO_RAD*(rand()%y - x/2))*m_particle_type->getVelocityY(), sin(DEGREE_TO_RAD*(rand()%y - x/2))*m_particle_type->getVelocityY(),
sin(DEGREE_TO_RAD*(rand()%z - x/2))*m_particle_type->getVelocityZ()); sin(DEGREE_TO_RAD*(rand()%z - x/2))*m_particle_type->getVelocityZ());
m_emitter->setDirection(dir.toIrrVector()); m_emitter->setDirection(dir.toIrrVector());
*/
} // update } // update
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

2
src/karts/kart.cpp
View File

@ -1461,7 +1461,7 @@ void Kart::loadData()
m_water_splash_system = new WaterSplash(this); m_water_splash_system = new WaterSplash(this);
const float particle_size = 0.25f; const float particle_size = 0.25f;
core::vector3df position(0, particle_size*0.25f, -getKartLength()*0.5f); core::vector3df position(0, particle_size, -getKartLength()*0.5f);
try try
{ {