*** empty log message ***

This commit is contained in:
Darren Ranalli 2000-10-11 22:32:53 +00:00
parent e7f97dbcbd
commit e0aef3de3e
27 changed files with 61 additions and 62 deletions

View File

@ -1,6 +1,6 @@
// Filename: baseParticle.C // Filename: baseParticle.cxx
// Created by: charles (14Jun00) // Created by: charles (14Jun00)
// //
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
#include "baseParticle.h" #include "baseParticle.h"

View File

@ -1,6 +1,6 @@
// Filename: baseParticleEmitter.C // Filename: baseParticleEmitter.cxx
// Created by: charles (14Jun00) // Created by: charles (14Jun00)
// //
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
#include "baseParticleEmitter.h" #include "baseParticleEmitter.h"

View File

@ -1,6 +1,6 @@
// Filename: baseParticleFactory.C // Filename: baseParticleFactory.cxx
// Created by: charles (05Jul00) // Created by: charles (05Jul00)
// //
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
#include "baseParticleFactory.h" #include "baseParticleFactory.h"
@ -14,7 +14,7 @@ BaseParticleFactory::
BaseParticleFactory(void) { BaseParticleFactory(void) {
_mass_base = 1.0f; _mass_base = 1.0f;
_mass_spread = 0.0f; _mass_spread = 0.0f;
_terminal_velocity_base = PhysicsObject::_default_terminal_velocity; _terminal_velocity_base = PhysicsObject::_default_terminal_velocity;
_terminal_velocity_spread = 0.0f; _terminal_velocity_spread = 0.0f;

View File

@ -1,4 +1,4 @@
// Filename: baseParticleRenderer.C // Filename: baseParticleRenderer.cxx
// Created by: charles (20Jun00) // Created by: charles (20Jun00)
// //
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////

View File

@ -1,6 +1,6 @@
// Filename: boxEmitter.C // Filename: boxEmitter.cxx
// Created by: charles (22Jun00) // Created by: charles (22Jun00)
// //
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
#include "boxEmitter.h" #include "boxEmitter.h"

View File

@ -1,12 +1,11 @@
// Filename: config_particlesystem.C // Filename: config_particlesystem.cxx
// Created by: charles (05Jul00) // Created by: charles (05Jul00)
// //
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
#include "config_particlesystem.h" #include "config_particlesystem.h"
#include "particleSystem.h" #include "particleSystem.h"
#include "geomParticleRenderer.h" #include "geomParticleRenderer.h"
#include <config.h>
ConfigureDef(config_particlesystem); ConfigureDef(config_particlesystem);
NotifyCategoryDef(particlesystem, ""); NotifyCategoryDef(particlesystem, "");

View File

@ -8,7 +8,7 @@
#include <pandabase.h> #include <pandabase.h>
#include <notifyCategoryProxy.h> #include <notifyCategoryProxy.h>
#include <config.h> #include <dconfig.h>
ConfigureDecl(config_particlesystem, EXPCL_PANDAPHYSICS, EXPTP_PANDAPHYSICS); ConfigureDecl(config_particlesystem, EXPCL_PANDAPHYSICS, EXPTP_PANDAPHYSICS);
NotifyCategoryDecl(particlesystem, EXPCL_PANDAPHYSICS, EXPTP_PANDAPHYSICS); NotifyCategoryDecl(particlesystem, EXPCL_PANDAPHYSICS, EXPTP_PANDAPHYSICS);

View File

@ -1,13 +1,13 @@
// Filename: discEmitter.C // Filename: discEmitter.cxx
// Created by: charles (22Jun00) // Created by: charles (22Jun00)
// //
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
#include "discEmitter.h" #include "discEmitter.h"
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function : DiscEmitter::DiscEmitter // Function : DiscEmitter::DiscEmitter
// Access : Public // Access : Public
// Description : constructor // Description : constructor
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
DiscEmitter:: DiscEmitter::
@ -20,7 +20,7 @@ DiscEmitter(void) {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function : DiscEmitter::DiscEmitter // Function : DiscEmitter::DiscEmitter
// Access : Public // Access : Public
// Description : copy constructor // Description : copy constructor
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
DiscEmitter:: DiscEmitter::
@ -40,7 +40,7 @@ DiscEmitter(const DiscEmitter &copy) :
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function : DiscEmitter::~DiscEmitter // Function : DiscEmitter::~DiscEmitter
// Access : Public // Access : Public
// Description : destructor // Description : destructor
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
DiscEmitter:: DiscEmitter::
@ -49,7 +49,7 @@ DiscEmitter::
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function : make_copy // Function : make_copy
// Access : Public // Access : Public
// Description : copier // Description : copier
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
BaseParticleEmitter *DiscEmitter:: BaseParticleEmitter *DiscEmitter::

View File

@ -1,6 +1,6 @@
// Filename: geomParticleRenderer.C // Filename: geomParticleRenderer.cxx
// Created by: charles (05Jul00) // Created by: charles (05Jul00)
// //
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
#include "geomParticleRenderer.h" #include "geomParticleRenderer.h"

View File

@ -1,6 +1,6 @@
// Filename: lineEmitter.C // Filename: lineEmitter.cxx
// Created by: charles (22Jun00) // Created by: charles (22Jun00)
// //
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
#include "lineEmitter.h" #include "lineEmitter.h"

View File

@ -1,6 +1,6 @@
// Filename: orientedParticle.C // Filename: orientedParticle.cxx
// Created by: charles (19Jun00) // Created by: charles (19Jun00)
// //
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
#include "orientedParticle.h" #include "orientedParticle.h"
@ -66,7 +66,7 @@ die(void) {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function : update // Function : update
// Access : public // Access : public
// Description : particle update routine. // Description : particle update routine.
// This NEEDS to be filled in with quaternion slerp // This NEEDS to be filled in with quaternion slerp
// stuff, or oriented particles will not rotate. // stuff, or oriented particles will not rotate.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////

View File

@ -1,6 +1,6 @@
// Filename: orientedParticleFactory.C // Filename: orientedParticleFactory.cxx
// Created by: charles (05Jul00) // Created by: charles (05Jul00)
// //
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
#include "orientedParticleFactory.h" #include "orientedParticleFactory.h"

View File

@ -1,6 +1,6 @@
// Filename: particleSystem.C // Filename: particleSystem.cxx
// Created by: charles (14Jun00) // Created by: charles (14Jun00)
// //
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
#include <stdlib.h> #include <stdlib.h>
@ -28,7 +28,7 @@
// Description : Default Constructor. // Description : Default Constructor.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
ParticleSystem:: ParticleSystem::
ParticleSystem(int pool_size) : ParticleSystem(int pool_size) :
_particle_pool_size(pool_size), Physical(pool_size, false) _particle_pool_size(pool_size), Physical(pool_size, false)
{ {
_birth_rate = 0.0f; _birth_rate = 0.0f;
@ -46,7 +46,7 @@ ParticleSystem(int pool_size) :
// just in case someone tries to do something that requires the // just in case someone tries to do something that requires the
// use of an emitter, renderer, or factory before they've actually // use of an emitter, renderer, or factory before they've actually
// assigned one. This is ok, because assigning them (set_renderer(), // assigned one. This is ok, because assigning them (set_renderer(),
// set_emitter(), etc...) forces them to set themselves up for the // set_emitter(), etc...) forces them to set themselves up for the
// system, keeping the pool sizes consistent. // system, keeping the pool sizes consistent.
_render_arc.clear(); _render_arc.clear();
@ -219,7 +219,7 @@ spawn_child_system(BaseParticle *bp) {
return; return;
} }
NodeRelation *parent_relation = NodeRelation *parent_relation =
this_pn->get_parent(RenderRelation::get_class_type(), 0); this_pn->get_parent(RenderRelation::get_class_type(), 0);
Node *parent = parent_relation->get_parent(); Node *parent = parent_relation->get_parent();
@ -249,7 +249,7 @@ spawn_child_system(BaseParticle *bp) {
LMatrix4f old_system_to_parent_xform; LMatrix4f old_system_to_parent_xform;
get_rel_mat(get_physical_node(), parent, old_system_to_parent_xform); get_rel_mat(get_physical_node(), parent, old_system_to_parent_xform);
LMatrix4f child_space_xform = old_system_to_parent_xform * LMatrix4f child_space_xform = old_system_to_parent_xform *
bp->get_lcs(); bp->get_lcs();
rr->set_transition(new TransformTransition(child_space_xform)); rr->set_transition(new TransformTransition(child_space_xform));

View File

@ -1,4 +1,4 @@
// Filename: particleSystemManager.C // Filename: particleSystemManager.cxx
// Created by: charles (28Jun00) // Created by: charles (28Jun00)
// //
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////

View File

@ -1,6 +1,6 @@
// Filename: pointEmitter.C // Filename: pointEmitter.cxx
// Created by: charles (22Jun00) // Created by: charles (22Jun00)
// //
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
#include "pointEmitter.h" #include "pointEmitter.h"
@ -11,7 +11,7 @@
// Description : constructor // Description : constructor
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
PointEmitter:: PointEmitter::
PointEmitter(void) : PointEmitter(void) :
BaseParticleEmitter() { BaseParticleEmitter() {
_location.set(0.0f, 0.0f, 0.0f); _location.set(0.0f, 0.0f, 0.0f);
} }

View File

@ -1,6 +1,6 @@
// Filename: pointParticle.C // Filename: pointParticle.cxx
// Created by: charles (19Jun00) // Created by: charles (19Jun00)
// //
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
#include "pointParticle.h" #include "pointParticle.h"

View File

@ -1,6 +1,6 @@
// Filename: pointParticleFactory.C // Filename: pointParticleFactory.cxx
// Created by: charles (05Jul00) // Created by: charles (05Jul00)
// //
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
#include "pointParticleFactory.h" #include "pointParticleFactory.h"

View File

@ -1,6 +1,6 @@
// Filename: pointParticleRenderer.C // Filename: pointParticleRenderer.cxx
// Created by: charles (20Jun00) // Created by: charles (20Jun00)
// //
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
#include <boundingSphere.h> #include <boundingSphere.h>

View File

@ -1,6 +1,6 @@
// Filename: rectangleEmitter.C // Filename: rectangleEmitter.cxx
// Created by: charles (22Jun00) // Created by: charles (22Jun00)
// //
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
#include "rectangleEmitter.h" #include "rectangleEmitter.h"

View File

@ -1,6 +1,6 @@
// Filename: ringEmitter.C // Filename: ringEmitter.cxx
// Created by: charles (22Jun00) // Created by: charles (22Jun00)
// //
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
#include "ringEmitter.h" #include "ringEmitter.h"
@ -25,7 +25,7 @@ RingEmitter(const RingEmitter &copy) :
BaseParticleEmitter(copy) { BaseParticleEmitter(copy) {
_radius = copy._radius; _radius = copy._radius;
_aoe = copy._aoe; _aoe = copy._aoe;
_sin_theta = copy._sin_theta; _sin_theta = copy._sin_theta;
_cos_theta = copy._cos_theta; _cos_theta = copy._cos_theta;
} }

View File

@ -1,6 +1,6 @@
// Filename: sparkleParticleRenderer.C // Filename: sparkleParticleRenderer.cxx
// Created by: charles (27Jun00) // Created by: charles (27Jun00)
// //
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
#include "sparkleParticleRenderer.h" #include "sparkleParticleRenderer.h"
@ -35,7 +35,7 @@ SparkleParticleRenderer(const Colorf& center, const Colorf& edge,
SparkleParticleLifeScale life_scale, SparkleParticleLifeScale life_scale,
ParticleRendererAlphaMode alpha_mode) : ParticleRendererAlphaMode alpha_mode) :
_center_color(center), _edge_color(edge), _birth_radius(birth_radius), _center_color(center), _edge_color(edge), _birth_radius(birth_radius),
_death_radius(death_radius), _life_scale(life_scale), _death_radius(death_radius), _life_scale(life_scale),
BaseParticleRenderer(alpha_mode) { BaseParticleRenderer(alpha_mode) {
_line_primitive = new GeomLine; _line_primitive = new GeomLine;
init_geoms(); init_geoms();

View File

@ -1,6 +1,6 @@
// Filename: sphereSurfaceEmitter.C // Filename: sphereSurfaceEmitter.cxx
// Created by: charles (22Jun00) // Created by: charles (22Jun00)
// //
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
#include "sphereSurfaceEmitter.h" #include "sphereSurfaceEmitter.h"

View File

@ -1,6 +1,6 @@
// Filename: sphereVolumeEmitter.C // Filename: sphereVolumeEmitter.cxx
// Created by: charles (22Jun00) // Created by: charles (22Jun00)
// //
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
#include "sphereVolumeEmitter.h" #include "sphereVolumeEmitter.h"

View File

@ -1,4 +1,4 @@
// Filename: spriteParticleRenderer.C // Filename: spriteParticleRenderer.cxx
// Created by: charles (13Jul00) // Created by: charles (13Jul00)
// //
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////

View File

@ -1,6 +1,6 @@
// Filename: tangentRingEmitter.C // Filename: tangentRingEmitter.cxx
// Created by: charles (25Jul00) // Created by: charles (25Jul00)
// //
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
#include "tangentRingEmitter.h" #include "tangentRingEmitter.h"

View File

@ -1,4 +1,4 @@
// Filename: zSpinParticle.C // Filename: zSpinParticle.cxx
// Created by: charles (16Aug00) // Created by: charles (16Aug00)
// //
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////

View File

@ -1,4 +1,4 @@
// Filename: zSpinParticleFactory.C // Filename: zSpinParticleFactory.cxx
// Created by: charles (16Aug00) // Created by: charles (16Aug00)
// //
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////