From 76551bc5dcb91ef1a80689460bcafba4b26123a8 Mon Sep 17 00:00:00 2001 From: Mike Goslin Date: Wed, 17 Jan 2001 19:12:24 +0000 Subject: [PATCH] *** empty log message *** --- panda/src/particlesystem/particleSystem.h | 4 ++-- panda/src/particlesystem/particleSystemManager.h | 3 +-- panda/src/physics/forceNode.h | 2 +- panda/src/physics/linearEulerIntegrator.h | 2 +- panda/src/physics/linearNoiseForce.h | 1 + panda/src/physics/linearVectorForce.h | 2 +- panda/src/physics/physicalNode.h | 2 +- panda/src/physics/physicsManager.h | 3 ++- 8 files changed, 10 insertions(+), 9 deletions(-) diff --git a/panda/src/particlesystem/particleSystem.h b/panda/src/particlesystem/particleSystem.h index ca2be40778..b4318a7dff 100644 --- a/panda/src/particlesystem/particleSystem.h +++ b/panda/src/particlesystem/particleSystem.h @@ -74,8 +74,7 @@ private: bool _i_was_spawned_flag; PT(RenderRelation) _physical_node_arc; -public: - +PUBLISHED: // constructor/destructor ParticleSystem(int pool_size = 0); @@ -128,6 +127,7 @@ public: INLINE void render(void); void update(float dt); +public: friend class ParticleSystemManager; }; diff --git a/panda/src/particlesystem/particleSystemManager.h b/panda/src/particlesystem/particleSystemManager.h index e798219a16..13b89ea923 100644 --- a/panda/src/particlesystem/particleSystemManager.h +++ b/panda/src/particlesystem/particleSystemManager.h @@ -26,8 +26,7 @@ private: int _nth_frame; int _cur_frame; -public: - +PUBLISHED: ParticleSystemManager(int every_nth_frame = 1); INLINE void set_frame_stepping(int every_nth_frame); diff --git a/panda/src/physics/forceNode.h b/panda/src/physics/forceNode.h index 6cae25c3c8..f7e128e2d9 100644 --- a/panda/src/physics/forceNode.h +++ b/panda/src/physics/forceNode.h @@ -22,7 +22,7 @@ class EXPCL_PANDAPHYSICS ForceNode : public NamedNode { private: vector< PT(BaseForce) > _forces; -public: +PUBLISHED: ForceNode(const string &name = ""); ForceNode(const ForceNode ©); virtual ~ForceNode(void); diff --git a/panda/src/physics/linearEulerIntegrator.h b/panda/src/physics/linearEulerIntegrator.h index a06792cb3d..ac39f233a1 100644 --- a/panda/src/physics/linearEulerIntegrator.h +++ b/panda/src/physics/linearEulerIntegrator.h @@ -19,7 +19,7 @@ private: vector< PT(LinearForce) >& forces, float dt); -public: +PUBLISHED: LinearEulerIntegrator(void); virtual ~LinearEulerIntegrator(void); }; diff --git a/panda/src/physics/linearNoiseForce.h b/panda/src/physics/linearNoiseForce.h index 60959a6576..3fd5658b0e 100644 --- a/panda/src/physics/linearNoiseForce.h +++ b/panda/src/physics/linearNoiseForce.h @@ -36,6 +36,7 @@ public: static int _random_seed; static void init_noise_tables(void); +PUBLISHED: LinearNoiseForce(float a = 1.0f, bool m = false); LinearNoiseForce(const LinearNoiseForce ©); virtual ~LinearNoiseForce(void); diff --git a/panda/src/physics/linearVectorForce.h b/panda/src/physics/linearVectorForce.h index 0c293e59d4..ac2984e85e 100644 --- a/panda/src/physics/linearVectorForce.h +++ b/panda/src/physics/linearVectorForce.h @@ -20,7 +20,7 @@ private: virtual LinearForce *make_copy(void); virtual LVector3f get_child_vector(const PhysicsObject *po); -public: +PUBLISHED: LinearVectorForce(const LVector3f& vec, float a = 1.0f, bool mass = false); LinearVectorForce(const LinearVectorForce ©); LinearVectorForce(float x = 0.0f, float y = 0.0f, float z = 0.0f, diff --git a/panda/src/physics/physicalNode.h b/panda/src/physics/physicalNode.h index 30286e4050..1f4b627cad 100644 --- a/panda/src/physics/physicalNode.h +++ b/panda/src/physics/physicalNode.h @@ -23,7 +23,7 @@ class EXPCL_PANDAPHYSICS PhysicalNode : public NamedNode { private: vector< PT(Physical) > _physicals; -public: +PUBLISHED: PhysicalNode(const string &name = ""); PhysicalNode(const PhysicalNode ©); virtual ~PhysicalNode(void); diff --git a/panda/src/physics/physicsManager.h b/panda/src/physics/physicsManager.h index 978a6fe7e0..f80057f106 100644 --- a/panda/src/physics/physicsManager.h +++ b/panda/src/physics/physicsManager.h @@ -41,7 +41,7 @@ private: PT(LinearIntegrator) _linear_integrator; PT(AngularIntegrator) _angular_integrator; -public: +PUBLISHED: PhysicsManager(void); virtual ~PhysicsManager(void); @@ -60,6 +60,7 @@ public: void remove_angular_force(AngularForce *f); void do_physics(float dt); +public: friend class Physical; };