diff --git a/panda/src/particlesystem/Sources.pp b/panda/src/particlesystem/Sources.pp index 0dcf9816a2..f18230c0c3 100644 --- a/panda/src/particlesystem/Sources.pp +++ b/panda/src/particlesystem/Sources.pp @@ -12,7 +12,8 @@ baseParticle.I baseParticle.h baseParticleEmitter.I \ baseParticleEmitter.h baseParticleFactory.I \ baseParticleFactory.h baseParticleRenderer.I \ - baseParticleRenderer.h boxEmitter.I boxEmitter.h \ + baseParticleRenderer.h arcEmitter.I arcEmitter.h \ + boxEmitter.I boxEmitter.h \ config_particlesystem.h discEmitter.I discEmitter.h \ geomParticleRenderer.I geomParticleRenderer.h lineEmitter.I \ lineEmitter.h lineParticleRenderer.I lineParticleRenderer.h \ @@ -37,7 +38,7 @@ #define INCLUDED_SOURCES \ baseParticle.cxx baseParticleEmitter.cxx baseParticleFactory.cxx \ - baseParticleRenderer.cxx boxEmitter.cxx \ + baseParticleRenderer.cxx boxEmitter.cxx arcEmitter.cxx \ config_particlesystem.cxx discEmitter.cxx \ geomParticleRenderer.cxx lineEmitter.cxx \ lineParticleRenderer.cxx particleSystem.cxx \ @@ -54,8 +55,9 @@ #define INSTALL_HEADERS \ baseParticle.I baseParticle.h baseParticleEmitter.I \ baseParticleEmitter.h baseParticleFactory.I baseParticleFactory.h \ - baseParticleRenderer.I baseParticleRenderer.h boxEmitter.I \ - boxEmitter.h config_particlesystem.h discEmitter.I discEmitter.h \ + baseParticleRenderer.I baseParticleRenderer.h arcEmitter.I arcEmitter.h \ + boxEmitter.I boxEmitter.h config_particlesystem.h \ + discEmitter.I discEmitter.h \ emitters.h geomParticleRenderer.I geomParticleRenderer.h \ lineEmitter.I lineEmitter.h lineParticleRenderer.I \ lineParticleRenderer.h particleSystem.I particleSystem.h \ diff --git a/panda/src/particlesystem/particlesystem_composite2.cxx b/panda/src/particlesystem/particlesystem_composite2.cxx index ef2f01480c..09f04eb3ac 100644 --- a/panda/src/particlesystem/particlesystem_composite2.cxx +++ b/panda/src/particlesystem/particlesystem_composite2.cxx @@ -3,6 +3,7 @@ #include "baseParticleEmitter.cxx" #include "baseParticleFactory.cxx" #include "baseParticleRenderer.cxx" +#include "arcEmitter.cxx" #include "boxEmitter.cxx" #include "discEmitter.cxx" #include "lineEmitter.cxx" diff --git a/panda/src/particlesystem/ringEmitter.h b/panda/src/particlesystem/ringEmitter.h index c8d79b2253..9e59f2c21f 100644 --- a/panda/src/particlesystem/ringEmitter.h +++ b/panda/src/particlesystem/ringEmitter.h @@ -45,7 +45,7 @@ PUBLISHED: virtual void output(ostream &out) const; virtual void write(ostream &out, int indent=0) const; -private: +protected: float _radius; float _radius_spread; @@ -58,6 +58,7 @@ private: float _cos_theta; /////////////////////////////// +private: virtual void assign_initial_position(LPoint3f& pos); virtual void assign_initial_velocity(LVector3f& vel); };