From 38d46bdebccc77b68386f8fecbdd1fa925b889db Mon Sep 17 00:00:00 2001 From: David Rose Date: Wed, 1 Apr 2009 18:46:16 +0000 Subject: [PATCH] minor fixes with published methods --- panda/src/particlesystem/geomParticleRenderer.h | 1 + panda/src/particlesystem/lineParticleRenderer.h | 2 ++ panda/src/particlesystem/pointParticleRenderer.h | 2 ++ panda/src/particlesystem/sparkleParticleRenderer.h | 2 ++ panda/src/particlesystem/spriteParticleRenderer.h | 2 ++ panda/src/pgui/pgMouseWatcherBackground.h | 1 + panda/src/physics/angularIntegrator.h | 3 ++- panda/src/physics/baseIntegrator.h | 3 ++- panda/src/physics/linearIntegrator.h | 3 ++- 9 files changed, 16 insertions(+), 3 deletions(-) diff --git a/panda/src/particlesystem/geomParticleRenderer.h b/panda/src/particlesystem/geomParticleRenderer.h index 8b2cf257c0..6e02de6548 100644 --- a/panda/src/particlesystem/geomParticleRenderer.h +++ b/panda/src/particlesystem/geomParticleRenderer.h @@ -55,6 +55,7 @@ PUBLISHED: INLINE float get_initial_z_scale() const; INLINE float get_final_z_scale() const; +public: virtual BaseParticleRenderer *make_copy(); virtual void output(ostream &out) const; diff --git a/panda/src/particlesystem/lineParticleRenderer.h b/panda/src/particlesystem/lineParticleRenderer.h index a43839d346..8c7ca4b7fe 100644 --- a/panda/src/particlesystem/lineParticleRenderer.h +++ b/panda/src/particlesystem/lineParticleRenderer.h @@ -40,8 +40,10 @@ PUBLISHED: virtual ~LineParticleRenderer(); +public: virtual BaseParticleRenderer *make_copy(); +PUBLISHED: INLINE void set_head_color(const Colorf& c); INLINE void set_tail_color(const Colorf& c); diff --git a/panda/src/particlesystem/pointParticleRenderer.h b/panda/src/particlesystem/pointParticleRenderer.h index 5d325117a3..71b6662bca 100644 --- a/panda/src/particlesystem/pointParticleRenderer.h +++ b/panda/src/particlesystem/pointParticleRenderer.h @@ -51,8 +51,10 @@ PUBLISHED: virtual ~PointParticleRenderer(); +public: virtual BaseParticleRenderer *make_copy(); +PUBLISHED: INLINE void set_point_size(float point_size); INLINE void set_start_color(const Colorf& sc); INLINE void set_end_color(const Colorf& ec); diff --git a/panda/src/particlesystem/sparkleParticleRenderer.h b/panda/src/particlesystem/sparkleParticleRenderer.h index e581166c02..c2abb006da 100644 --- a/panda/src/particlesystem/sparkleParticleRenderer.h +++ b/panda/src/particlesystem/sparkleParticleRenderer.h @@ -51,8 +51,10 @@ PUBLISHED: virtual ~SparkleParticleRenderer(); +public: virtual BaseParticleRenderer *make_copy(); +PUBLISHED: INLINE void set_center_color(const Colorf& c); INLINE void set_edge_color(const Colorf& c); INLINE void set_birth_radius(float radius); diff --git a/panda/src/particlesystem/spriteParticleRenderer.h b/panda/src/particlesystem/spriteParticleRenderer.h index 78a892434a..30934308f0 100644 --- a/panda/src/particlesystem/spriteParticleRenderer.h +++ b/panda/src/particlesystem/spriteParticleRenderer.h @@ -164,8 +164,10 @@ PUBLISHED: SpriteParticleRenderer(const SpriteParticleRenderer ©); virtual ~SpriteParticleRenderer(); +public: virtual BaseParticleRenderer *make_copy(); +PUBLISHED: void set_from_node(const NodePath &node_path, bool size_from_texels = false); void set_from_node(const NodePath &node_path, const string &model, const string &node, bool size_from_texels = false); void add_from_node(const NodePath &node_path, bool size_from_texels = false, bool resize = false); diff --git a/panda/src/pgui/pgMouseWatcherBackground.h b/panda/src/pgui/pgMouseWatcherBackground.h index ac8d5f7b3c..4e65e7dbe7 100644 --- a/panda/src/pgui/pgMouseWatcherBackground.h +++ b/panda/src/pgui/pgMouseWatcherBackground.h @@ -31,6 +31,7 @@ PUBLISHED: PGMouseWatcherBackground(); virtual ~PGMouseWatcherBackground(); +public: virtual void press(const MouseWatcherParameter ¶m); virtual void release(const MouseWatcherParameter ¶m); virtual void keystroke(const MouseWatcherParameter ¶m); diff --git a/panda/src/physics/angularIntegrator.h b/panda/src/physics/angularIntegrator.h index 0cecc903fd..f7e8c4146f 100644 --- a/panda/src/physics/angularIntegrator.h +++ b/panda/src/physics/angularIntegrator.h @@ -32,7 +32,8 @@ public: void integrate(Physical *physical, AngularForceVector &forces, float dt); - + +PUBLISHED: virtual void output(ostream &out) const; virtual void write(ostream &out, unsigned int indent=0) const; diff --git a/panda/src/physics/baseIntegrator.h b/panda/src/physics/baseIntegrator.h index 1bd49e6036..def7c2e742 100644 --- a/panda/src/physics/baseIntegrator.h +++ b/panda/src/physics/baseIntegrator.h @@ -40,7 +40,8 @@ public: typedef pvector AngularForceVector; virtual ~BaseIntegrator(); - + +PUBLISHED: virtual void output(ostream &out) const; virtual void write_precomputed_linear_matrices(ostream &out, unsigned int indent=0) const; diff --git a/panda/src/physics/linearIntegrator.h b/panda/src/physics/linearIntegrator.h index c775daa870..7113af9a2a 100644 --- a/panda/src/physics/linearIntegrator.h +++ b/panda/src/physics/linearIntegrator.h @@ -33,7 +33,8 @@ public: void integrate(Physical *physical, LinearForceVector &forces, float dt); - + +PUBLISHED: virtual void output(ostream &out) const; virtual void write(ostream &out, unsigned int indent=0) const;