TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 18:31:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

adding floor z

Browse Source
This commit is contained in:
Dave Schuyler 2004-09-24 00:44:58 +00:00
parent ac28d349f8
commit e679ee89ae
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
panda/src/particlesystem/particleSystem.I
View File

@ -80,7 +80,6 @@ set_litter_size(int new_ls) {
// Function : set_litter_spread // Function : set_litter_spread
// Access : Public // Access : Public
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE void ParticleSystem:: INLINE void ParticleSystem::
set_litter_spread(int new_ls) { set_litter_spread(int new_ls) {
_litter_spread = new_ls; _litter_spread = new_ls;
@ -90,7 +89,6 @@ set_litter_spread(int new_ls) {
// Function : set_renderer // Function : set_renderer
// Access : Public // Access : Public
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE void ParticleSystem:: INLINE void ParticleSystem::
set_renderer(BaseParticleRenderer *r) { set_renderer(BaseParticleRenderer *r) {
_renderer = r; _renderer = r;
@ -107,7 +105,6 @@ set_renderer(BaseParticleRenderer *r) {
// Function : set_emitter // Function : set_emitter
// Access : Public // Access : Public
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE void ParticleSystem:: INLINE void ParticleSystem::
set_emitter(BaseParticleEmitter *e) { set_emitter(BaseParticleEmitter *e) {
_emitter = e; _emitter = e;
@ -117,7 +114,6 @@ set_emitter(BaseParticleEmitter *e) {
// Function : set_factory // Function : set_factory
// Access : Public // Access : Public
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE void ParticleSystem:: INLINE void ParticleSystem::
set_factory(BaseParticleFactory *f) { set_factory(BaseParticleFactory *f) {
int pool_size = _particle_pool_size; int pool_size = _particle_pool_size;
@ -127,11 +123,19 @@ set_factory(BaseParticleFactory *f) {
set_pool_size(pool_size); set_pool_size(pool_size);
} }
////////////////////////////////////////////////////////////////////
// Function : set_floor_z
// Access : Public
////////////////////////////////////////////////////////////////////
INLINE void ParticleSystem::
set_floor_z(float z) {
_floor_z = z;
}
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function : set_active_state // Function : set_active_state
// Access : public // Access : public
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE void ParticleSystem:: INLINE void ParticleSystem::
set_active_system_flag(bool a) { set_active_system_flag(bool a) {
_active_system_flag = a; _active_system_flag = a;
@ -141,7 +145,6 @@ set_active_system_flag(bool a) {
// Function : set_local_velocity_flag // Function : set_local_velocity_flag
// Access : public // Access : public
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE void ParticleSystem:: INLINE void ParticleSystem::
set_local_velocity_flag(bool lv) { set_local_velocity_flag(bool lv) {
_local_velocity_flag = lv; _local_velocity_flag = lv;
@ -151,7 +154,6 @@ set_local_velocity_flag(bool lv) {
// Function : set_spawn_on_death_flag // Function : set_spawn_on_death_flag
// Access : public // Access : public
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE void ParticleSystem:: INLINE void ParticleSystem::
set_spawn_on_death_flag(bool sod) { set_spawn_on_death_flag(bool sod) {
_spawn_on_death_flag = sod; _spawn_on_death_flag = sod;
@ -161,7 +163,6 @@ set_spawn_on_death_flag(bool sod) {
// Function : set_system_grows_older_flag // Function : set_system_grows_older_flag
// Access : public // Access : public
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE void ParticleSystem:: INLINE void ParticleSystem::
set_system_grows_older_flag(bool sgo) { set_system_grows_older_flag(bool sgo) {
_system_grows_older_flag = sgo; _system_grows_older_flag = sgo;
@ -308,6 +309,15 @@ get_factory() const {
return _factory; return _factory;
} }
////////////////////////////////////////////////////////////////////
// Function : get_factory
// Access : Public
////////////////////////////////////////////////////////////////////
INLINE float ParticleSystem::
get_floor_z() const {
return _floor_z;
}
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function : get_living_particles // Function : get_living_particles
// Access : Public // Access : Public

5
panda/src/particlesystem/particleSystem.h
View File

@ -69,6 +69,7 @@ PUBLISHED:
INLINE void set_renderer(BaseParticleRenderer *r); INLINE void set_renderer(BaseParticleRenderer *r);
INLINE void set_emitter(BaseParticleEmitter *e); INLINE void set_emitter(BaseParticleEmitter *e);
INLINE void set_factory(BaseParticleFactory *f); INLINE void set_factory(BaseParticleFactory *f);
INLINE void set_floor_z(float z);
INLINE int get_pool_size() const; INLINE int get_pool_size() const;
INLINE float get_birth_rate() const; INLINE float get_birth_rate() const;
@ -87,6 +88,7 @@ PUBLISHED:
INLINE BaseParticleRenderer *get_renderer() const; INLINE BaseParticleRenderer *get_renderer() const;
INLINE BaseParticleEmitter *get_emitter() const; INLINE BaseParticleEmitter *get_emitter() const;
INLINE BaseParticleFactory *get_factory() const; INLINE BaseParticleFactory *get_factory() const;
INLINE float get_floor_z() const;
// particle template vector // particle template vector
@ -124,6 +126,7 @@ private:
int _litter_spread; int _litter_spread;
float _system_age; float _system_age;
float _system_lifespan; float _system_lifespan;
float _floor_z;
PT(BaseParticleFactory) _factory; PT(BaseParticleFactory) _factory;
PT(BaseParticleEmitter) _emitter; PT(BaseParticleEmitter) _emitter;
@ -154,7 +157,7 @@ private:
bool _i_was_spawned_flag; bool _i_was_spawned_flag;
public: public:
friend class ParticleSystemManager; friend class ParticleSystemManager; // particleSystemManager.h
}; };
#include "particleSystem.I" #include "particleSystem.I"