From 0c56b38f6a84b36e840b1952a30a81be8a7e548a Mon Sep 17 00:00:00 2001 From: David Rose Date: Thu, 25 Oct 2007 21:18:58 +0000 Subject: [PATCH] name vdatas after type of particle --- panda/src/particlesystem/lineParticleRenderer.cxx | 2 +- panda/src/particlesystem/pointParticleRenderer.cxx | 2 +- panda/src/particlesystem/sparkleParticleRenderer.cxx | 2 +- panda/src/particlesystem/spriteParticleRenderer.cxx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/panda/src/particlesystem/lineParticleRenderer.cxx b/panda/src/particlesystem/lineParticleRenderer.cxx index 4acb957f77..2aec3219e2 100644 --- a/panda/src/particlesystem/lineParticleRenderer.cxx +++ b/panda/src/particlesystem/lineParticleRenderer.cxx @@ -137,7 +137,7 @@ resize_pool(int new_size) { void LineParticleRenderer:: init_geoms() { _vdata = new GeomVertexData - ("particles", GeomVertexFormat::get_v3cp(), + ("line_particles", GeomVertexFormat::get_v3cp(), Geom::UH_stream); PT(Geom) geom = new Geom(_vdata); _line_primitive = geom; diff --git a/panda/src/particlesystem/pointParticleRenderer.cxx b/panda/src/particlesystem/pointParticleRenderer.cxx index b763393269..7085bcb43a 100644 --- a/panda/src/particlesystem/pointParticleRenderer.cxx +++ b/panda/src/particlesystem/pointParticleRenderer.cxx @@ -112,7 +112,7 @@ resize_pool(int new_size) { void PointParticleRenderer:: init_geoms() { _vdata = new GeomVertexData - ("particles", GeomVertexFormat::get_v3cp(), + ("point_particles", GeomVertexFormat::get_v3cp(), Geom::UH_stream); PT(Geom) geom = new Geom(_vdata); _point_primitive = geom; diff --git a/panda/src/particlesystem/sparkleParticleRenderer.cxx b/panda/src/particlesystem/sparkleParticleRenderer.cxx index 789883e083..c379448396 100644 --- a/panda/src/particlesystem/sparkleParticleRenderer.cxx +++ b/panda/src/particlesystem/sparkleParticleRenderer.cxx @@ -133,7 +133,7 @@ resize_pool(int new_size) { void SparkleParticleRenderer:: init_geoms() { _vdata = new GeomVertexData - ("particles", GeomVertexFormat::get_v3cp(), + ("sparkle_particles", GeomVertexFormat::get_v3cp(), Geom::UH_stream); PT(Geom) geom = new Geom(_vdata); _line_primitive = geom; diff --git a/panda/src/particlesystem/spriteParticleRenderer.cxx b/panda/src/particlesystem/spriteParticleRenderer.cxx index 580e00b90a..545eda30de 100644 --- a/panda/src/particlesystem/spriteParticleRenderer.cxx +++ b/panda/src/particlesystem/spriteParticleRenderer.cxx @@ -503,7 +503,7 @@ init_geoms() { // For each frame of the animation... for (j = 0; j < _anim_size[i]; ++j) { _ttl_count[i] = (int *)PANDA_MALLOC_ARRAY(_anim_size[i] * sizeof(int)); - _vdata[i].push_back(new GeomVertexData("particles", format, Geom::UH_stream)); + _vdata[i].push_back(new GeomVertexData("sprite_particles", format, Geom::UH_stream)); PT(Geom) geom = new Geom(_vdata[i][j]); _sprite_primitive[i].push_back((Geom*)geom); _sprites[i].push_back(new GeomPoints(Geom::UH_stream));