RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix GeomParticles

This commit is contained in:
David Rose 2002-03-22 19:24:11 +00:00
parent b30cecd213
commit bc1d195613
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
panda/src/particlesystem/geomParticleRenderer.I
View File

@ -28,6 +28,7 @@
INLINE void GeomParticleRenderer::
set_geom_node(PandaNode *node) {
nassertv(node != (PandaNode *)NULL);
_geom_node = node;
resize_pool(_pool_size);
}

24
panda/src/particlesystem/geomParticleRenderer.cxx
View File

@ -129,11 +129,12 @@ kill_nodes(void) {
void GeomParticleRenderer::
birth_particle(int index) {
nassertv(_node_vector[index] == (PandaNode *)NULL);
PandaNode *node = new PandaNode("");
get_render_node()->add_child(node);
node->add_child(_geom_node);
_node_vector[index] = node;
if (_node_vector[index] == (PandaNode *)NULL) {
PandaNode *node = new PandaNode("");
get_render_node()->add_child(node);
node->add_child(_geom_node);
_node_vector[index] = node;
}
}
////////////////////////////////////////////////////////////////////
@ -144,8 +145,10 @@ birth_particle(int index) {
void GeomParticleRenderer::
kill_particle(int index) {
get_render_node()->remove_child(_node_vector[index]);
_node_vector[index] = (PandaNode *)NULL;
if (_node_vector[index] != (PandaNode *)NULL) {
get_render_node()->remove_child(_node_vector[index]);
_node_vector[index] = (PandaNode *)NULL;
}
}
////////////////////////////////////////////////////////////////////
@ -170,8 +173,13 @@ render(pvector< PT(PhysicsObject) >& po_vector, int ttl_particles) {
cur_particle = (BaseParticle *) po_vector[i].p();
cur_node = *cur_node_iter;
if (cur_particle->get_alive() == true) {
if (cur_particle->get_alive()) {
// living particle
if (cur_node == (PandaNode *)NULL) {
birth_particle(i);
cur_node = *cur_node_iter;
}
nassertv(cur_node != (PandaNode *)NULL);
pos = cur_particle->get_position();