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

GPUParticles: Avoid emitting particle at (0,0,0)

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14882 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
vincentlj
2014-01-02 00:53:41 +00:00
parent 66ab51789f
commit 2a1a28c459
2 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/graphics/gpuparticles.cpp
View File

@@ -276,9 +276,8 @@ void ParticleSystemProxy::generateParticlesFromPointEmitter(scene::IParticlePoin
particles[COMPONENTCOUNT * i] = 0;
particles[COMPONENTCOUNT * i + 1] = 0;
particles[COMPONENTCOUNT * i + 2] = 0;
// Initial lifetime is 0 percent
particles[COMPONENTCOUNT * i + 3] = rand();
particles[COMPONENTCOUNT * i + 3] /= RAND_MAX;
// Initial lifetime is >1
particles[COMPONENTCOUNT * i + 3] = 2.;
initialvalue[COMPONENTCOUNT * i] = 0.;
initialvalue[COMPONENTCOUNT * i + 1] = 0.;
@@ -309,7 +308,6 @@ void ParticleSystemProxy::generateParticlesFromPointEmitter(scene::IParticlePoin
glBindBuffer(GL_ARRAY_BUFFER, initial_values_buffer);
glBufferData(GL_ARRAY_BUFFER, COMPONENTCOUNT * count * sizeof(float), initialvalue, GL_STREAM_DRAW);
glGenBuffers(2, tfb_buffers);
glBindBuffer(GL_ARRAY_BUFFER, tfb_buffers[0]);
glBufferData(GL_ARRAY_BUFFER, COMPONENTCOUNT * count * sizeof(float), particles, GL_STREAM_DRAW);
glBindBuffer(GL_ARRAY_BUFFER, tfb_buffers[1]);
@@ -332,9 +330,8 @@ void ParticleSystemProxy::generateParticlesFromBoxEmitter(scene::IParticleBoxEmi
particles[COMPONENTCOUNT * i] = emitter->getBox().MinEdge.X + os::Randomizer::frand() * extent.X;
particles[COMPONENTCOUNT * i + 1] = emitter->getBox().MinEdge.Y + os::Randomizer::frand() * extent.Y;
particles[COMPONENTCOUNT * i + 2] = emitter->getBox().MinEdge.Z + os::Randomizer::frand() * extent.Z;
// Initial lifetime is 0 percent
particles[COMPONENTCOUNT * i + 3] = rand();
particles[COMPONENTCOUNT * i + 3] /= RAND_MAX;
// Initial lifetime is > 1
particles[COMPONENTCOUNT * i + 3] = 2.;
initialvalue[COMPONENTCOUNT * i] = particles[COMPONENTCOUNT * i];
initialvalue[COMPONENTCOUNT * i + 1] = particles[COMPONENTCOUNT * i + 1];
@@ -392,9 +389,8 @@ void ParticleSystemProxy::generateParticlesFromSphereEmitter(scene::IParticleSph
particles[COMPONENTCOUNT * i] = pos.X;
particles[COMPONENTCOUNT * i + 1] = pos.Y;
particles[COMPONENTCOUNT * i + 2] = pos.Z;
// Initial lifetime is 0 percent
particles[COMPONENTCOUNT * i + 3] = rand();
particles[COMPONENTCOUNT * i + 3] /= RAND_MAX;
// Initial lifetime is > 1
particles[COMPONENTCOUNT * i + 3] = 2.;
initialvalue[COMPONENTCOUNT * i] = particles[COMPONENTCOUNT * i];
initialvalue[COMPONENTCOUNT * i + 1] = particles[COMPONENTCOUNT * i + 1];
@@ -459,12 +455,23 @@ GLuint ParticleSystemProxy::uniform_normal_and_depths;
GLuint ParticleSystemProxy::uniform_screen;
GLuint ParticleSystemProxy::uniform_invproj;
static bool isGPUParticleType(scene::E_PARTICLE_EMITTER_TYPE type)
{
switch (type)
{
case scene::EPET_POINT:
case scene::EPET_BOX:
case scene::EPET_SPHERE:
return true;
default:
return false;
}
}
void ParticleSystemProxy::setEmitter(scene::IParticleEmitter* emitter)
{
if (!emitter)
return;
CParticleSystemSceneNode::setEmitter(emitter);
if (emitter->getType() != scene::EPET_POINT && emitter->getType() != scene::EPET_BOX && emitter->getType() != scene::EPET_SPHERE)
if (!emitter || !isGPUParticleType(emitter->getType()))
return;
// Pass a fake material type to force irrlicht to update its internal states on rendering
setMaterialType(irr_driver->getShader(ES_RAIN));
@@ -648,7 +655,7 @@ void ParticleSystemProxy::draw()
}
void ParticleSystemProxy::render() {
if (getEmitter()->getType() != scene::EPET_POINT && getEmitter()->getType() != scene::EPET_BOX && getEmitter()->getType() != scene::EPET_SPHERE)
if (!getEmitter() || !isGPUParticleType(getEmitter()->getType()))
{
CParticleSystemSceneNode::render();
return;

13
src/graphics/particle_emitter.cpp
View File

@@ -317,17 +317,28 @@ void ParticleEmitter::setCreationRateAbsolute(float f)
m_min_rate = f;
m_max_rate = f;
#if 0
// FIXME: to work around irrlicht bug, when an emitter is paused by setting the rate
// to 0 results in a massive emission when enabling it back. In irrlicht 1.8
// the node has a method called "clearParticles" that should be cleaner than this
if (f <= 0.0f && m_node->getEmitter())
{
m_node->setEmitter(NULL);
m_node->clearParticles();
}
else if (m_node->getEmitter() == NULL)
{
m_node->setEmitter(m_emitter);
}
#endif
if (f <= 0.0f)
{
m_node->setVisible(false);
}
else
{
m_node->setVisible(true);
}
} // setCreationRateAbsolute
//-----------------------------------------------------------------------------