From e73c25d15e9b710d9bedb3d81fb14d0d2fababd7 Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Sun, 10 Jun 2018 19:19:24 -0600 Subject: [PATCH] general: Break apart BUILDING_PANDAPHYSICS --- panda/src/pandabase/pandasymbols.h | 22 +++++++++++++++++++ panda/src/particlesystem/arcEmitter.h | 2 +- panda/src/particlesystem/baseParticle.h | 2 +- .../src/particlesystem/baseParticleEmitter.h | 2 +- .../src/particlesystem/baseParticleFactory.h | 2 +- .../src/particlesystem/baseParticleRenderer.h | 2 +- panda/src/particlesystem/boxEmitter.h | 2 +- .../colorInterpolationManager.h | 14 ++++++------ .../particlesystem/config_particlesystem.cxx | 4 ++-- .../particlesystem/config_particlesystem.h | 6 ++--- panda/src/particlesystem/discEmitter.h | 2 +- .../src/particlesystem/geomParticleRenderer.h | 2 +- panda/src/particlesystem/lineEmitter.h | 2 +- .../src/particlesystem/lineParticleRenderer.h | 2 +- panda/src/particlesystem/orientedParticle.h | 2 +- .../particlesystem/orientedParticleFactory.h | 2 +- panda/src/particlesystem/particleSystem.h | 2 +- .../particlesystem/particleSystemManager.h | 2 +- panda/src/particlesystem/pointEmitter.h | 2 +- panda/src/particlesystem/pointParticle.h | 2 +- .../src/particlesystem/pointParticleFactory.h | 2 +- .../particlesystem/pointParticleRenderer.h | 2 +- panda/src/particlesystem/rectangleEmitter.h | 2 +- panda/src/particlesystem/ringEmitter.h | 2 +- .../particlesystem/sparkleParticleRenderer.h | 2 +- .../src/particlesystem/sphereSurfaceEmitter.h | 2 +- .../src/particlesystem/sphereVolumeEmitter.h | 2 +- .../particlesystem/spriteParticleRenderer.h | 2 +- panda/src/particlesystem/tangentRingEmitter.h | 2 +- panda/src/particlesystem/zSpinParticle.h | 2 +- .../src/particlesystem/zSpinParticleFactory.h | 2 +- panda/src/physics/actorNode.h | 2 +- panda/src/physics/angularEulerIntegrator.h | 2 +- panda/src/physics/angularForce.h | 2 +- panda/src/physics/angularIntegrator.h | 2 +- panda/src/physics/angularVectorForce.h | 2 +- panda/src/physics/baseForce.h | 2 +- panda/src/physics/baseIntegrator.h | 2 +- panda/src/physics/config_physics.cxx | 4 ++-- panda/src/physics/config_physics.h | 6 ++--- panda/src/physics/forceNode.h | 2 +- panda/src/physics/linearControlForce.h | 2 +- panda/src/physics/linearCylinderVortexForce.h | 2 +- panda/src/physics/linearDistanceForce.h | 2 +- panda/src/physics/linearEulerIntegrator.h | 2 +- panda/src/physics/linearForce.h | 2 +- panda/src/physics/linearFrictionForce.h | 2 +- panda/src/physics/linearIntegrator.h | 2 +- panda/src/physics/linearJitterForce.h | 2 +- panda/src/physics/linearNoiseForce.h | 2 +- panda/src/physics/linearRandomForce.h | 2 +- panda/src/physics/linearSinkForce.h | 2 +- panda/src/physics/linearSourceForce.h | 2 +- panda/src/physics/linearUserDefinedForce.h | 2 +- panda/src/physics/linearVectorForce.h | 2 +- panda/src/physics/physical.h | 2 +- panda/src/physics/physicalNode.h | 2 +- panda/src/physics/physicsCollisionHandler.h | 2 +- panda/src/physics/physicsManager.h | 2 +- panda/src/physics/physicsObject.h | 2 +- panda/src/physics/physicsObjectCollection.h | 2 +- 61 files changed, 94 insertions(+), 72 deletions(-) diff --git a/panda/src/pandabase/pandasymbols.h b/panda/src/pandabase/pandasymbols.h index a1b17ffb86..d0f7fd19f0 100644 --- a/panda/src/pandabase/pandasymbols.h +++ b/panda/src/pandabase/pandasymbols.h @@ -111,6 +111,12 @@ #define BUILDING_PANDA_EXPRESS #endif +/* BUILDING_PANDAPHYSICS for these: */ +#ifdef BUILDING_PANDAPHYSICS + #define BUILDING_PANDA_PARTICLESYSTEM + #define BUILDING_PANDA_PHYSICS +#endif + #ifdef BUILDING_LIBPANDA #define EXPCL_LIBPANDA EXPORT_CLASS #define EXPTP_LIBPANDA EXPORT_TEMPL @@ -287,6 +293,14 @@ #define EXPTP_PANDA_PARAMETRICS IMPORT_TEMPL #endif +#ifdef BUILDING_PANDA_PARTICLESYSTEM + #define EXPCL_PANDA_PARTICLESYSTEM EXPORT_CLASS + #define EXPTP_PANDA_PARTICLESYSTEM EXPORT_TEMPL +#else + #define EXPCL_PANDA_PARTICLESYSTEM IMPORT_CLASS + #define EXPTP_PANDA_PARTICLESYSTEM IMPORT_TEMPL +#endif + #ifdef BUILDING_PANDA_PGRAPH #define EXPCL_PANDA_PGRAPH EXPORT_CLASS #define EXPTP_PANDA_PGRAPH EXPORT_TEMPL @@ -311,6 +325,14 @@ #define EXPTP_PANDA_PGUI IMPORT_TEMPL #endif +#ifdef BUILDING_PANDA_PHYSICS + #define EXPCL_PANDA_PHYSICS EXPORT_CLASS + #define EXPTP_PANDA_PHYSICS EXPORT_TEMPL +#else + #define EXPCL_PANDA_PHYSICS IMPORT_CLASS + #define EXPTP_PANDA_PHYSICS IMPORT_TEMPL +#endif + #ifdef BUILDING_PANDA_PIPELINE #define EXPCL_PANDA_PIPELINE EXPORT_CLASS #define EXPTP_PANDA_PIPELINE EXPORT_TEMPL diff --git a/panda/src/particlesystem/arcEmitter.h b/panda/src/particlesystem/arcEmitter.h index ce95891b3e..3d8dc3988e 100644 --- a/panda/src/particlesystem/arcEmitter.h +++ b/panda/src/particlesystem/arcEmitter.h @@ -19,7 +19,7 @@ /** * Describes a planar ring region in which particles are generated. */ -class EXPCL_PANDAPHYSICS ArcEmitter : public RingEmitter { +class EXPCL_PANDA_PARTICLESYSTEM ArcEmitter : public RingEmitter { PUBLISHED: ArcEmitter(); ArcEmitter(const ArcEmitter ©); diff --git a/panda/src/particlesystem/baseParticle.h b/panda/src/particlesystem/baseParticle.h index edc14ca0f1..487f9ba476 100644 --- a/panda/src/particlesystem/baseParticle.h +++ b/panda/src/particlesystem/baseParticle.h @@ -20,7 +20,7 @@ /** * An individual, physically-modelable particle abstract base class. */ -class EXPCL_PANDAPHYSICS BaseParticle : public PhysicsObject { +class EXPCL_PANDA_PARTICLESYSTEM BaseParticle : public PhysicsObject { public: // local methods INLINE void set_age(PN_stdfloat age); diff --git a/panda/src/particlesystem/baseParticleEmitter.h b/panda/src/particlesystem/baseParticleEmitter.h index aad4d1ad17..f1c6665679 100644 --- a/panda/src/particlesystem/baseParticleEmitter.h +++ b/panda/src/particlesystem/baseParticleEmitter.h @@ -22,7 +22,7 @@ #include "mathNumbers.h" -class EXPCL_PANDAPHYSICS BaseParticleEmitter : public ReferenceCount { +class EXPCL_PANDA_PARTICLESYSTEM BaseParticleEmitter : public ReferenceCount { PUBLISHED: enum emissionType { ET_EXPLICIT, // all particles are emitted in parallel along the same vector diff --git a/panda/src/particlesystem/baseParticleFactory.h b/panda/src/particlesystem/baseParticleFactory.h index 47073862f2..0271ef91eb 100644 --- a/panda/src/particlesystem/baseParticleFactory.h +++ b/panda/src/particlesystem/baseParticleFactory.h @@ -25,7 +25,7 @@ /** * Pure Virtual base class for creating particles */ -class EXPCL_PANDAPHYSICS BaseParticleFactory : public ReferenceCount { +class EXPCL_PANDA_PARTICLESYSTEM BaseParticleFactory : public ReferenceCount { PUBLISHED: virtual ~BaseParticleFactory(); diff --git a/panda/src/particlesystem/baseParticleRenderer.h b/panda/src/particlesystem/baseParticleRenderer.h index bab215567a..8dd8a0a081 100644 --- a/panda/src/particlesystem/baseParticleRenderer.h +++ b/panda/src/particlesystem/baseParticleRenderer.h @@ -29,7 +29,7 @@ /** * Pure virtual particle renderer base class */ -class EXPCL_PANDAPHYSICS BaseParticleRenderer : public ReferenceCount { +class EXPCL_PANDA_PARTICLESYSTEM BaseParticleRenderer : public ReferenceCount { PUBLISHED: enum ParticleRendererAlphaMode { PR_ALPHA_NONE, diff --git a/panda/src/particlesystem/boxEmitter.h b/panda/src/particlesystem/boxEmitter.h index 830e7827af..9899a04978 100644 --- a/panda/src/particlesystem/boxEmitter.h +++ b/panda/src/particlesystem/boxEmitter.h @@ -19,7 +19,7 @@ /** * Describes a voluminous box region in which particles are generated. */ -class EXPCL_PANDAPHYSICS BoxEmitter : public BaseParticleEmitter { +class EXPCL_PANDA_PARTICLESYSTEM BoxEmitter : public BaseParticleEmitter { PUBLISHED: BoxEmitter(); BoxEmitter(const BoxEmitter ©); diff --git a/panda/src/particlesystem/colorInterpolationManager.h b/panda/src/particlesystem/colorInterpolationManager.h index 917694bee7..441ec4de7a 100644 --- a/panda/src/particlesystem/colorInterpolationManager.h +++ b/panda/src/particlesystem/colorInterpolationManager.h @@ -24,7 +24,7 @@ * virtual interpolate() function. */ -class EXPCL_PANDAPHYSICS ColorInterpolationFunction : public TypedReferenceCount { +class EXPCL_PANDA_PARTICLESYSTEM ColorInterpolationFunction : public TypedReferenceCount { PUBLISHED: // virtual string get_type(); @@ -57,7 +57,7 @@ private: * Defines a constant color over the lifetime of the segment. */ -class EXPCL_PANDAPHYSICS ColorInterpolationFunctionConstant : public ColorInterpolationFunction { +class EXPCL_PANDA_PARTICLESYSTEM ColorInterpolationFunctionConstant : public ColorInterpolationFunction { PUBLISHED: INLINE LColor get_color_a() const; @@ -96,7 +96,7 @@ private: * Defines a linear interpolation over the lifetime of the segment. */ -class EXPCL_PANDAPHYSICS ColorInterpolationFunctionLinear : public ColorInterpolationFunctionConstant { +class EXPCL_PANDA_PARTICLESYSTEM ColorInterpolationFunctionLinear : public ColorInterpolationFunctionConstant { PUBLISHED: INLINE LColor get_color_b() const; @@ -138,7 +138,7 @@ private: * repeats until the end of the segment. */ -class EXPCL_PANDAPHYSICS ColorInterpolationFunctionStepwave : public ColorInterpolationFunctionLinear { +class EXPCL_PANDA_PARTICLESYSTEM ColorInterpolationFunctionStepwave : public ColorInterpolationFunctionLinear { PUBLISHED: INLINE PN_stdfloat get_width_a() const; INLINE PN_stdfloat get_width_b() const; @@ -183,7 +183,7 @@ private: * result in a higher frequency cycle. */ -class EXPCL_PANDAPHYSICS ColorInterpolationFunctionSinusoid : public ColorInterpolationFunctionLinear { +class EXPCL_PANDA_PARTICLESYSTEM ColorInterpolationFunctionSinusoid : public ColorInterpolationFunctionLinear { PUBLISHED: INLINE PN_stdfloat get_period() const; @@ -224,7 +224,7 @@ private: * segment also has a function associated with it. */ -class EXPCL_PANDAPHYSICS ColorInterpolationSegment : public ReferenceCount { +class EXPCL_PANDA_PARTICLESYSTEM ColorInterpolationSegment : public ReferenceCount { public: ColorInterpolationSegment(ColorInterpolationFunction* function, const PN_stdfloat &time_begin, const PN_stdfloat &time_end, const bool is_modulated, const int id); @@ -266,7 +266,7 @@ protected: * Access to these segments is provided but not necessary general use. */ -class EXPCL_PANDAPHYSICS ColorInterpolationManager : public ReferenceCount { +class EXPCL_PANDA_PARTICLESYSTEM ColorInterpolationManager : public ReferenceCount { PUBLISHED: ColorInterpolationManager(); ColorInterpolationManager(const LColor &c); diff --git a/panda/src/particlesystem/config_particlesystem.cxx b/panda/src/particlesystem/config_particlesystem.cxx index 0eba6c33f1..61f1224ea4 100644 --- a/panda/src/particlesystem/config_particlesystem.cxx +++ b/panda/src/particlesystem/config_particlesystem.cxx @@ -16,8 +16,8 @@ #include "geomParticleRenderer.h" #include "geomNode.h" -#if !defined(CPPPARSER) && !defined(BUILDING_PANDAPHYSICS) - #error Buildsystem error: BUILDING_PANDAPHYSICS not defined +#if !defined(CPPPARSER) && !defined(BUILDING_PANDA_PARTICLESYSTEM) + #error Buildsystem error: BUILDING_PANDA_PARTICLESYSTEM not defined #endif ConfigureDef(config_particlesystem); diff --git a/panda/src/particlesystem/config_particlesystem.h b/panda/src/particlesystem/config_particlesystem.h index 16382b274c..56beffeaf0 100644 --- a/panda/src/particlesystem/config_particlesystem.h +++ b/panda/src/particlesystem/config_particlesystem.h @@ -18,10 +18,10 @@ #include "notifyCategoryProxy.h" #include "dconfig.h" -ConfigureDecl(config_particlesystem, EXPCL_PANDAPHYSICS, EXPTP_PANDAPHYSICS); -NotifyCategoryDecl(particlesystem, EXPCL_PANDAPHYSICS, EXPTP_PANDAPHYSICS); +ConfigureDecl(config_particlesystem, EXPCL_PANDA_PARTICLESYSTEM, EXPTP_PANDA_PARTICLESYSTEM); +NotifyCategoryDecl(particlesystem, EXPCL_PANDA_PARTICLESYSTEM, EXPTP_PANDA_PARTICLESYSTEM); -extern EXPCL_PANDAPHYSICS void init_libparticlesystem(); +extern EXPCL_PANDA_PARTICLESYSTEM void init_libparticlesystem(); #ifndef NDEBUG //[ // Non-release build: diff --git a/panda/src/particlesystem/discEmitter.h b/panda/src/particlesystem/discEmitter.h index 0ce8bf9d70..fcfcf9b94a 100644 --- a/panda/src/particlesystem/discEmitter.h +++ b/panda/src/particlesystem/discEmitter.h @@ -19,7 +19,7 @@ /** * Describes a planar disc region from which particles are generated */ -class EXPCL_PANDAPHYSICS DiscEmitter : public BaseParticleEmitter { +class EXPCL_PANDA_PARTICLESYSTEM DiscEmitter : public BaseParticleEmitter { PUBLISHED: DiscEmitter(); DiscEmitter(const DiscEmitter ©); diff --git a/panda/src/particlesystem/geomParticleRenderer.h b/panda/src/particlesystem/geomParticleRenderer.h index f80322a5bd..a9fd906dd4 100644 --- a/panda/src/particlesystem/geomParticleRenderer.h +++ b/panda/src/particlesystem/geomParticleRenderer.h @@ -23,7 +23,7 @@ #include "pvector.h" #include "pStatCollector.h" -class EXPCL_PANDAPHYSICS GeomParticleRenderer : public BaseParticleRenderer { +class EXPCL_PANDA_PARTICLESYSTEM GeomParticleRenderer : public BaseParticleRenderer { PUBLISHED: explicit GeomParticleRenderer(ParticleRendererAlphaMode am = PR_ALPHA_NONE, PandaNode *geom_node = nullptr); diff --git a/panda/src/particlesystem/lineEmitter.h b/panda/src/particlesystem/lineEmitter.h index 0b5a832563..80422654fb 100644 --- a/panda/src/particlesystem/lineEmitter.h +++ b/panda/src/particlesystem/lineEmitter.h @@ -19,7 +19,7 @@ /** * Describes a linear region in which particles are generated. */ -class EXPCL_PANDAPHYSICS LineEmitter : public BaseParticleEmitter { +class EXPCL_PANDA_PARTICLESYSTEM LineEmitter : public BaseParticleEmitter { PUBLISHED: LineEmitter(); LineEmitter(const LineEmitter ©); diff --git a/panda/src/particlesystem/lineParticleRenderer.h b/panda/src/particlesystem/lineParticleRenderer.h index 86dcc5973c..ecec62fc8e 100644 --- a/panda/src/particlesystem/lineParticleRenderer.h +++ b/panda/src/particlesystem/lineParticleRenderer.h @@ -28,7 +28,7 @@ * sparks, etc. */ -class EXPCL_PANDAPHYSICS LineParticleRenderer : public BaseParticleRenderer { +class EXPCL_PANDA_PARTICLESYSTEM LineParticleRenderer : public BaseParticleRenderer { PUBLISHED: LineParticleRenderer(); LineParticleRenderer(const LineParticleRenderer& copy); diff --git a/panda/src/particlesystem/orientedParticle.h b/panda/src/particlesystem/orientedParticle.h index 0f021fed8d..740b8e03d6 100644 --- a/panda/src/particlesystem/orientedParticle.h +++ b/panda/src/particlesystem/orientedParticle.h @@ -20,7 +20,7 @@ * Describes a particle that has angular characteristics (velocity, * orientation). */ -class EXPCL_PANDAPHYSICS OrientedParticle : public BaseParticle { +class EXPCL_PANDA_PARTICLESYSTEM OrientedParticle : public BaseParticle { public: OrientedParticle(int lifespan = 0, bool alive = false); OrientedParticle(const OrientedParticle ©); diff --git a/panda/src/particlesystem/orientedParticleFactory.h b/panda/src/particlesystem/orientedParticleFactory.h index a38d5e2ec0..d33f18009b 100644 --- a/panda/src/particlesystem/orientedParticleFactory.h +++ b/panda/src/particlesystem/orientedParticleFactory.h @@ -21,7 +21,7 @@ /** * Creates particles that are affected by angular forces. */ -class EXPCL_PANDAPHYSICS OrientedParticleFactory : public BaseParticleFactory { +class EXPCL_PANDA_PARTICLESYSTEM OrientedParticleFactory : public BaseParticleFactory { PUBLISHED: OrientedParticleFactory(); OrientedParticleFactory(const OrientedParticleFactory ©); diff --git a/panda/src/particlesystem/particleSystem.h b/panda/src/particlesystem/particleSystem.h index 9c453b1b50..a7b4af64ef 100644 --- a/panda/src/particlesystem/particleSystem.h +++ b/panda/src/particlesystem/particleSystem.h @@ -37,7 +37,7 @@ class ParticleSystemManager; /** * Contains and manages a particle system. */ -class EXPCL_PANDAPHYSICS ParticleSystem : public Physical { +class EXPCL_PANDA_PARTICLESYSTEM ParticleSystem : public Physical { PUBLISHED: // constructordestructor diff --git a/panda/src/particlesystem/particleSystemManager.h b/panda/src/particlesystem/particleSystemManager.h index b083076e8a..5bfbe09ec7 100644 --- a/panda/src/particlesystem/particleSystemManager.h +++ b/panda/src/particlesystem/particleSystemManager.h @@ -24,7 +24,7 @@ * one doesn't have to be updated and rendered every frame See Also : * particleSystemManager.cxx */ -class EXPCL_PANDAPHYSICS ParticleSystemManager { +class EXPCL_PANDA_PARTICLESYSTEM ParticleSystemManager { PUBLISHED: explicit ParticleSystemManager(int every_nth_frame = 1); virtual ~ParticleSystemManager(); diff --git a/panda/src/particlesystem/pointEmitter.h b/panda/src/particlesystem/pointEmitter.h index fd59ea1aea..90af2a899a 100644 --- a/panda/src/particlesystem/pointEmitter.h +++ b/panda/src/particlesystem/pointEmitter.h @@ -19,7 +19,7 @@ /** * Describes a planar ring region in which particles are generated. */ -class EXPCL_PANDAPHYSICS PointEmitter : public BaseParticleEmitter { +class EXPCL_PANDA_PARTICLESYSTEM PointEmitter : public BaseParticleEmitter { PUBLISHED: PointEmitter(); PointEmitter(const PointEmitter ©); diff --git a/panda/src/particlesystem/pointParticle.h b/panda/src/particlesystem/pointParticle.h index 44e067edaf..bf7b70a98b 100644 --- a/panda/src/particlesystem/pointParticle.h +++ b/panda/src/particlesystem/pointParticle.h @@ -20,7 +20,7 @@ * Describes a particle that requires representation by a point (pixel, * sparkle, billboard) */ -class EXPCL_PANDAPHYSICS PointParticle : public BaseParticle { +class EXPCL_PANDA_PARTICLESYSTEM PointParticle : public BaseParticle { public: PointParticle(PN_stdfloat lifespan = 0.0f, bool alive = false); PointParticle(const PointParticle ©); diff --git a/panda/src/particlesystem/pointParticleFactory.h b/panda/src/particlesystem/pointParticleFactory.h index acaccf835e..3c2df92ff7 100644 --- a/panda/src/particlesystem/pointParticleFactory.h +++ b/panda/src/particlesystem/pointParticleFactory.h @@ -20,7 +20,7 @@ * Creates point particles to user specs */ -class EXPCL_PANDAPHYSICS PointParticleFactory : public BaseParticleFactory { +class EXPCL_PANDA_PARTICLESYSTEM PointParticleFactory : public BaseParticleFactory { PUBLISHED: PointParticleFactory(); PointParticleFactory(const PointParticleFactory ©); diff --git a/panda/src/particlesystem/pointParticleRenderer.h b/panda/src/particlesystem/pointParticleRenderer.h index 114cbb0e93..ff2f7b3f98 100644 --- a/panda/src/particlesystem/pointParticleRenderer.h +++ b/panda/src/particlesystem/pointParticleRenderer.h @@ -30,7 +30,7 @@ * BillboardParticleRenderer for that. */ -class EXPCL_PANDAPHYSICS PointParticleRenderer : public BaseParticleRenderer { +class EXPCL_PANDA_PARTICLESYSTEM PointParticleRenderer : public BaseParticleRenderer { PUBLISHED: enum PointParticleBlendType { PP_ONE_COLOR, diff --git a/panda/src/particlesystem/rectangleEmitter.h b/panda/src/particlesystem/rectangleEmitter.h index 7805d3b619..d425c70618 100644 --- a/panda/src/particlesystem/rectangleEmitter.h +++ b/panda/src/particlesystem/rectangleEmitter.h @@ -19,7 +19,7 @@ /** * Describes a planar square region in which particles are generated. */ -class EXPCL_PANDAPHYSICS RectangleEmitter : public BaseParticleEmitter { +class EXPCL_PANDA_PARTICLESYSTEM RectangleEmitter : public BaseParticleEmitter { PUBLISHED: RectangleEmitter(); RectangleEmitter(const RectangleEmitter ©); diff --git a/panda/src/particlesystem/ringEmitter.h b/panda/src/particlesystem/ringEmitter.h index 7bc9516148..cdd3d484f7 100644 --- a/panda/src/particlesystem/ringEmitter.h +++ b/panda/src/particlesystem/ringEmitter.h @@ -19,7 +19,7 @@ /** * Describes a planar ring region in which particles are generated. */ -class EXPCL_PANDAPHYSICS RingEmitter : public BaseParticleEmitter { +class EXPCL_PANDA_PARTICLESYSTEM RingEmitter : public BaseParticleEmitter { PUBLISHED: RingEmitter(); RingEmitter(const RingEmitter ©); diff --git a/panda/src/particlesystem/sparkleParticleRenderer.h b/panda/src/particlesystem/sparkleParticleRenderer.h index 040d4a5315..6b81e07cc5 100644 --- a/panda/src/particlesystem/sparkleParticleRenderer.h +++ b/panda/src/particlesystem/sparkleParticleRenderer.h @@ -31,7 +31,7 @@ enum SparkleParticleLifeScale { /** * pretty sparkly things. */ -class EXPCL_PANDAPHYSICS SparkleParticleRenderer : public BaseParticleRenderer { +class EXPCL_PANDA_PARTICLESYSTEM SparkleParticleRenderer : public BaseParticleRenderer { PUBLISHED: enum SparkleParticleLifeScale { SP_NO_SCALE, diff --git a/panda/src/particlesystem/sphereSurfaceEmitter.h b/panda/src/particlesystem/sphereSurfaceEmitter.h index e5f9cebaae..f2ee42488c 100644 --- a/panda/src/particlesystem/sphereSurfaceEmitter.h +++ b/panda/src/particlesystem/sphereSurfaceEmitter.h @@ -19,7 +19,7 @@ /** * Describes a curved space in which particles are generated. */ -class EXPCL_PANDAPHYSICS SphereSurfaceEmitter : public BaseParticleEmitter { +class EXPCL_PANDA_PARTICLESYSTEM SphereSurfaceEmitter : public BaseParticleEmitter { PUBLISHED: SphereSurfaceEmitter(); SphereSurfaceEmitter(const SphereSurfaceEmitter ©); diff --git a/panda/src/particlesystem/sphereVolumeEmitter.h b/panda/src/particlesystem/sphereVolumeEmitter.h index 14981b1b50..9907bbd3cf 100644 --- a/panda/src/particlesystem/sphereVolumeEmitter.h +++ b/panda/src/particlesystem/sphereVolumeEmitter.h @@ -19,7 +19,7 @@ /** * Describes a voluminous spherical region in which particles are generated. */ -class EXPCL_PANDAPHYSICS SphereVolumeEmitter : public BaseParticleEmitter { +class EXPCL_PANDA_PARTICLESYSTEM SphereVolumeEmitter : public BaseParticleEmitter { PUBLISHED: SphereVolumeEmitter(); SphereVolumeEmitter(const SphereVolumeEmitter ©); diff --git a/panda/src/particlesystem/spriteParticleRenderer.h b/panda/src/particlesystem/spriteParticleRenderer.h index c26f0ee7c1..0de03533d6 100644 --- a/panda/src/particlesystem/spriteParticleRenderer.h +++ b/panda/src/particlesystem/spriteParticleRenderer.h @@ -151,7 +151,7 @@ private: /** * Renders a particle system with high-speed nasty trick sprites. */ -class EXPCL_PANDAPHYSICS SpriteParticleRenderer : public BaseParticleRenderer { +class EXPCL_PANDA_PARTICLESYSTEM SpriteParticleRenderer : public BaseParticleRenderer { PUBLISHED: explicit SpriteParticleRenderer(Texture *tex = nullptr); SpriteParticleRenderer(const SpriteParticleRenderer ©); diff --git a/panda/src/particlesystem/tangentRingEmitter.h b/panda/src/particlesystem/tangentRingEmitter.h index 7100b7ee80..51bd8112b3 100644 --- a/panda/src/particlesystem/tangentRingEmitter.h +++ b/panda/src/particlesystem/tangentRingEmitter.h @@ -20,7 +20,7 @@ * Describes a planar ring region in which tangent particles are generated, * and particles fly off tangential to the ring. */ -class EXPCL_PANDAPHYSICS TangentRingEmitter : public BaseParticleEmitter { +class EXPCL_PANDA_PARTICLESYSTEM TangentRingEmitter : public BaseParticleEmitter { PUBLISHED: TangentRingEmitter(); TangentRingEmitter(const TangentRingEmitter ©); diff --git a/panda/src/particlesystem/zSpinParticle.h b/panda/src/particlesystem/zSpinParticle.h index ad867d7269..da5d39197b 100644 --- a/panda/src/particlesystem/zSpinParticle.h +++ b/panda/src/particlesystem/zSpinParticle.h @@ -22,7 +22,7 @@ * your sprites to spin without having them be full-blown oriented (i.e. * angry quat math), use this. */ -class EXPCL_PANDAPHYSICS ZSpinParticle : public BaseParticle { +class EXPCL_PANDA_PARTICLESYSTEM ZSpinParticle : public BaseParticle { public: ZSpinParticle(); ZSpinParticle(const ZSpinParticle ©); diff --git a/panda/src/particlesystem/zSpinParticleFactory.h b/panda/src/particlesystem/zSpinParticleFactory.h index 2ef6819069..491b1bf65f 100644 --- a/panda/src/particlesystem/zSpinParticleFactory.h +++ b/panda/src/particlesystem/zSpinParticleFactory.h @@ -19,7 +19,7 @@ /** * */ -class EXPCL_PANDAPHYSICS ZSpinParticleFactory : public BaseParticleFactory { +class EXPCL_PANDA_PARTICLESYSTEM ZSpinParticleFactory : public BaseParticleFactory { PUBLISHED: ZSpinParticleFactory(); ZSpinParticleFactory(const ZSpinParticleFactory ©); diff --git a/panda/src/physics/actorNode.h b/panda/src/physics/actorNode.h index 17e704a3ce..719b6b16f9 100644 --- a/panda/src/physics/actorNode.h +++ b/panda/src/physics/actorNode.h @@ -23,7 +23,7 @@ * will be reflected as transforms. This relation goes both ways; changes in * the transform will update the object's position (shoves). */ -class EXPCL_PANDAPHYSICS ActorNode : public PhysicalNode { +class EXPCL_PANDA_PHYSICS ActorNode : public PhysicalNode { PUBLISHED: explicit ActorNode(const std::string &name = ""); ActorNode(const ActorNode ©); diff --git a/panda/src/physics/angularEulerIntegrator.h b/panda/src/physics/angularEulerIntegrator.h index aa9cc71a78..1710d0841f 100644 --- a/panda/src/physics/angularEulerIntegrator.h +++ b/panda/src/physics/angularEulerIntegrator.h @@ -20,7 +20,7 @@ * Performs Euler integration on a vector of physically modelable objects * given a quantum dt. */ -class EXPCL_PANDAPHYSICS AngularEulerIntegrator : public AngularIntegrator { +class EXPCL_PANDA_PHYSICS AngularEulerIntegrator : public AngularIntegrator { PUBLISHED: AngularEulerIntegrator(); virtual ~AngularEulerIntegrator(); diff --git a/panda/src/physics/angularForce.h b/panda/src/physics/angularForce.h index 85d6b09a1a..e090095295 100644 --- a/panda/src/physics/angularForce.h +++ b/panda/src/physics/angularForce.h @@ -19,7 +19,7 @@ /** * pure virtual parent of all quat-based forces. */ -class EXPCL_PANDAPHYSICS AngularForce : public BaseForce { +class EXPCL_PANDA_PHYSICS AngularForce : public BaseForce { PUBLISHED: virtual ~AngularForce(); diff --git a/panda/src/physics/angularIntegrator.h b/panda/src/physics/angularIntegrator.h index 0accd60014..43f65c9581 100644 --- a/panda/src/physics/angularIntegrator.h +++ b/panda/src/physics/angularIntegrator.h @@ -22,7 +22,7 @@ * Pure virtual base class for physical modeling. Takes physically modelable * objects and applies forces to them. */ -class EXPCL_PANDAPHYSICS AngularIntegrator : public BaseIntegrator { +class EXPCL_PANDA_PHYSICS AngularIntegrator : public BaseIntegrator { PUBLISHED: virtual ~AngularIntegrator(); public: diff --git a/panda/src/physics/angularVectorForce.h b/panda/src/physics/angularVectorForce.h index 3560f67db0..2c45f5d43c 100644 --- a/panda/src/physics/angularVectorForce.h +++ b/panda/src/physics/angularVectorForce.h @@ -20,7 +20,7 @@ * a simple directed torque force, the angular equivalent of simple vector * force. */ -class EXPCL_PANDAPHYSICS AngularVectorForce : public AngularForce { +class EXPCL_PANDA_PHYSICS AngularVectorForce : public AngularForce { PUBLISHED: explicit AngularVectorForce(const LRotation& quat); explicit AngularVectorForce(PN_stdfloat h, PN_stdfloat p, PN_stdfloat r); diff --git a/panda/src/physics/baseForce.h b/panda/src/physics/baseForce.h index 9d046596a3..ffe8f58295 100644 --- a/panda/src/physics/baseForce.h +++ b/panda/src/physics/baseForce.h @@ -26,7 +26,7 @@ class ForceNode; /** * pure virtual base class for all forces that could POSSIBLY exist. */ -class EXPCL_PANDAPHYSICS BaseForce : public TypedReferenceCount { +class EXPCL_PANDA_PHYSICS BaseForce : public TypedReferenceCount { PUBLISHED: virtual ~BaseForce(); diff --git a/panda/src/physics/baseIntegrator.h b/panda/src/physics/baseIntegrator.h index 528f882021..5921b6e019 100644 --- a/panda/src/physics/baseIntegrator.h +++ b/panda/src/physics/baseIntegrator.h @@ -31,7 +31,7 @@ class Physical; * pure virtual integrator class that holds cached matrix information that * really should be common to any possible child implementation. */ -class EXPCL_PANDAPHYSICS BaseIntegrator : public ReferenceCount { +class EXPCL_PANDA_PHYSICS BaseIntegrator : public ReferenceCount { public: typedef epvector MatrixVector; typedef pvector LinearForceVector; diff --git a/panda/src/physics/config_physics.cxx b/panda/src/physics/config_physics.cxx index 5ce5c905f0..b4ad867f66 100644 --- a/panda/src/physics/config_physics.cxx +++ b/panda/src/physics/config_physics.cxx @@ -26,8 +26,8 @@ #include "dconfig.h" -#if !defined(CPPPARSER) && !defined(BUILDING_PANDAPHYSICS) - #error Buildsystem error: BUILDING_PANDAPHYSICS not defined +#if !defined(CPPPARSER) && !defined(BUILDING_PANDA_PHYSICS) + #error Buildsystem error: BUILDING_PANDA_PHYSICS not defined #endif ConfigureDef(config_physics); diff --git a/panda/src/physics/config_physics.h b/panda/src/physics/config_physics.h index cfbbe5146b..1c1b768e83 100644 --- a/panda/src/physics/config_physics.h +++ b/panda/src/physics/config_physics.h @@ -18,10 +18,10 @@ #include "notifyCategoryProxy.h" #include "dconfig.h" -ConfigureDecl(config_physics, EXPCL_PANDAPHYSICS, EXPTP_PANDAPHYSICS); -NotifyCategoryDecl(physics, EXPCL_PANDAPHYSICS, EXPTP_PANDAPHYSICS); +ConfigureDecl(config_physics, EXPCL_PANDA_PHYSICS, EXPTP_PANDA_PHYSICS); +NotifyCategoryDecl(physics, EXPCL_PANDA_PHYSICS, EXPTP_PANDA_PHYSICS); -extern EXPCL_PANDAPHYSICS void init_libphysics(); +extern EXPCL_PANDA_PHYSICS void init_libphysics(); // These macros get stripped out in a non-debug build (like asserts). Use them // like cout but with paranthesis aroud the cout input. e.g. foo_debug("The diff --git a/panda/src/physics/forceNode.h b/panda/src/physics/forceNode.h index 851b54259b..0f7758199d 100644 --- a/panda/src/physics/forceNode.h +++ b/panda/src/physics/forceNode.h @@ -24,7 +24,7 @@ * coordinate systems. An example of this would be simulating gravity in a * rotating space station. or something. */ -class EXPCL_PANDAPHYSICS ForceNode : public PandaNode { +class EXPCL_PANDA_PHYSICS ForceNode : public PandaNode { PUBLISHED: explicit ForceNode(const std::string &name); INLINE void clear(); diff --git a/panda/src/physics/linearControlForce.h b/panda/src/physics/linearControlForce.h index e769abbaa8..30c255b769 100644 --- a/panda/src/physics/linearControlForce.h +++ b/panda/src/physics/linearControlForce.h @@ -22,7 +22,7 @@ * not make sense for a physics simulation, but it's very handy for a game. * I.e. this is the force applied by user on the selected object. */ -class EXPCL_PANDAPHYSICS LinearControlForce : public LinearForce { +class EXPCL_PANDA_PHYSICS LinearControlForce : public LinearForce { PUBLISHED: explicit LinearControlForce(const PhysicsObject *po = 0, PN_stdfloat a = 1.0f, bool mass = false); diff --git a/panda/src/physics/linearCylinderVortexForce.h b/panda/src/physics/linearCylinderVortexForce.h index d41b4b638a..41c7a554f1 100644 --- a/panda/src/physics/linearCylinderVortexForce.h +++ b/panda/src/physics/linearCylinderVortexForce.h @@ -23,7 +23,7 @@ * warned- this will suck anything that it can reach directly into orbit and * will NOT let go. */ -class EXPCL_PANDAPHYSICS LinearCylinderVortexForce : public LinearForce { +class EXPCL_PANDA_PHYSICS LinearCylinderVortexForce : public LinearForce { PUBLISHED: explicit LinearCylinderVortexForce(PN_stdfloat radius = 1.0f, PN_stdfloat length = 0.0f, diff --git a/panda/src/physics/linearDistanceForce.h b/panda/src/physics/linearDistanceForce.h index 52f30411d4..fa245db104 100644 --- a/panda/src/physics/linearDistanceForce.h +++ b/panda/src/physics/linearDistanceForce.h @@ -21,7 +21,7 @@ class BamReader; /** * Pure virtual class for sinks and sources */ -class EXPCL_PANDAPHYSICS LinearDistanceForce : public LinearForce { +class EXPCL_PANDA_PHYSICS LinearDistanceForce : public LinearForce { PUBLISHED: enum FalloffType { FT_ONE_OVER_R, diff --git a/panda/src/physics/linearEulerIntegrator.h b/panda/src/physics/linearEulerIntegrator.h index 69c6d67649..09430d863d 100644 --- a/panda/src/physics/linearEulerIntegrator.h +++ b/panda/src/physics/linearEulerIntegrator.h @@ -20,7 +20,7 @@ * Performs Euler integration on a vector of physically modelable objects * given a quantum dt. */ -class EXPCL_PANDAPHYSICS LinearEulerIntegrator : public LinearIntegrator { +class EXPCL_PANDA_PHYSICS LinearEulerIntegrator : public LinearIntegrator { PUBLISHED: LinearEulerIntegrator(); virtual ~LinearEulerIntegrator(); diff --git a/panda/src/physics/linearForce.h b/panda/src/physics/linearForce.h index a3208d6e90..b555c99ca8 100644 --- a/panda/src/physics/linearForce.h +++ b/panda/src/physics/linearForce.h @@ -20,7 +20,7 @@ * A force that acts on a PhysicsObject by way of an Integrator. This is a * pure virtual base class. */ -class EXPCL_PANDAPHYSICS LinearForce : public BaseForce { +class EXPCL_PANDA_PHYSICS LinearForce : public BaseForce { PUBLISHED: ~LinearForce(); diff --git a/panda/src/physics/linearFrictionForce.h b/panda/src/physics/linearFrictionForce.h index 7a3dd86bef..cc098c4cce 100644 --- a/panda/src/physics/linearFrictionForce.h +++ b/panda/src/physics/linearFrictionForce.h @@ -19,7 +19,7 @@ /** * Friction-based drag force */ -class EXPCL_PANDAPHYSICS LinearFrictionForce : public LinearForce { +class EXPCL_PANDA_PHYSICS LinearFrictionForce : public LinearForce { PUBLISHED: explicit LinearFrictionForce(PN_stdfloat coef = 1.0f, PN_stdfloat a = 1.0f, bool m = false); LinearFrictionForce(const LinearFrictionForce ©); diff --git a/panda/src/physics/linearIntegrator.h b/panda/src/physics/linearIntegrator.h index 4d0eca841b..4737ae7014 100644 --- a/panda/src/physics/linearIntegrator.h +++ b/panda/src/physics/linearIntegrator.h @@ -23,7 +23,7 @@ * Pure virtual base class for physical modeling. Takes physically modelable * objects and applies forces to them. */ -class EXPCL_PANDAPHYSICS LinearIntegrator : public BaseIntegrator { +class EXPCL_PANDA_PHYSICS LinearIntegrator : public BaseIntegrator { PUBLISHED: virtual ~LinearIntegrator(); public: diff --git a/panda/src/physics/linearJitterForce.h b/panda/src/physics/linearJitterForce.h index 79dd49be85..32433a3f66 100644 --- a/panda/src/physics/linearJitterForce.h +++ b/panda/src/physics/linearJitterForce.h @@ -20,7 +20,7 @@ * Completely random noise force vector. Not repeatable, reliable, or * predictable. */ -class EXPCL_PANDAPHYSICS LinearJitterForce : public LinearRandomForce { +class EXPCL_PANDA_PHYSICS LinearJitterForce : public LinearRandomForce { PUBLISHED: explicit LinearJitterForce(PN_stdfloat a = 1.0f, bool m = false); LinearJitterForce(const LinearJitterForce ©); diff --git a/panda/src/physics/linearNoiseForce.h b/panda/src/physics/linearNoiseForce.h index 1fae5f1217..cfe63183bc 100644 --- a/panda/src/physics/linearNoiseForce.h +++ b/panda/src/physics/linearNoiseForce.h @@ -21,7 +21,7 @@ /** * Repeating noise force vector. */ -class EXPCL_PANDAPHYSICS LinearNoiseForce : public LinearRandomForce { +class EXPCL_PANDA_PHYSICS LinearNoiseForce : public LinearRandomForce { PUBLISHED: explicit LinearNoiseForce(PN_stdfloat a = 1.0f, bool m = false); LinearNoiseForce(const LinearNoiseForce ©); diff --git a/panda/src/physics/linearRandomForce.h b/panda/src/physics/linearRandomForce.h index 7f097ca53a..c637f4a794 100644 --- a/panda/src/physics/linearRandomForce.h +++ b/panda/src/physics/linearRandomForce.h @@ -22,7 +22,7 @@ /** * Pure virtual, parent to noiseForce and jitterForce */ -class EXPCL_PANDAPHYSICS LinearRandomForce : public LinearForce { +class EXPCL_PANDA_PHYSICS LinearRandomForce : public LinearForce { PUBLISHED: virtual ~LinearRandomForce(); diff --git a/panda/src/physics/linearSinkForce.h b/panda/src/physics/linearSinkForce.h index 235085b253..9268e0cdd9 100644 --- a/panda/src/physics/linearSinkForce.h +++ b/panda/src/physics/linearSinkForce.h @@ -19,7 +19,7 @@ /** * Attractor force. Think black hole. */ -class EXPCL_PANDAPHYSICS LinearSinkForce : public LinearDistanceForce { +class EXPCL_PANDA_PHYSICS LinearSinkForce : public LinearDistanceForce { PUBLISHED: explicit LinearSinkForce(const LPoint3& p, FalloffType f, PN_stdfloat r, PN_stdfloat a = 1.0f, bool m = true); diff --git a/panda/src/physics/linearSourceForce.h b/panda/src/physics/linearSourceForce.h index 52af5ee9c6..70e764a468 100644 --- a/panda/src/physics/linearSourceForce.h +++ b/panda/src/physics/linearSourceForce.h @@ -19,7 +19,7 @@ /** * Repellant force. */ -class EXPCL_PANDAPHYSICS LinearSourceForce : public LinearDistanceForce { +class EXPCL_PANDA_PHYSICS LinearSourceForce : public LinearDistanceForce { PUBLISHED: explicit LinearSourceForce(const LPoint3& p, FalloffType f, PN_stdfloat r, PN_stdfloat a = 1.0f, bool mass = true); diff --git a/panda/src/physics/linearUserDefinedForce.h b/panda/src/physics/linearUserDefinedForce.h index 2908313095..e7be671950 100644 --- a/panda/src/physics/linearUserDefinedForce.h +++ b/panda/src/physics/linearUserDefinedForce.h @@ -19,7 +19,7 @@ /** * A programmable force that takes an evaluator function. */ -class EXPCL_PANDAPHYSICS LinearUserDefinedForce : public LinearForce { +class EXPCL_PANDA_PHYSICS LinearUserDefinedForce : public LinearForce { PUBLISHED: explicit LinearUserDefinedForce(LVector3 (*proc)(const PhysicsObject *) = nullptr, PN_stdfloat a = 1.0f, bool md = false); diff --git a/panda/src/physics/linearVectorForce.h b/panda/src/physics/linearVectorForce.h index 75d624cb64..e68f4599da 100644 --- a/panda/src/physics/linearVectorForce.h +++ b/panda/src/physics/linearVectorForce.h @@ -20,7 +20,7 @@ * Simple directed vector force. Suitable for gravity, non-turbulent wind, * etc... */ -class EXPCL_PANDAPHYSICS LinearVectorForce : public LinearForce { +class EXPCL_PANDA_PHYSICS LinearVectorForce : public LinearForce { PUBLISHED: explicit LinearVectorForce(const LVector3& vec, PN_stdfloat a = 1.0f, bool mass = false); explicit LinearVectorForce(PN_stdfloat x = 0.0f, PN_stdfloat y = 0.0f, PN_stdfloat z = 0.0f, diff --git a/panda/src/physics/physical.h b/panda/src/physics/physical.h index 3ab30e9ee4..fd3b9c343a 100644 --- a/panda/src/physics/physical.h +++ b/panda/src/physics/physical.h @@ -34,7 +34,7 @@ class PhysicsManager; * Defines a set of physically modeled attributes. If you want physics * applied to your class, derive it from this. */ -class EXPCL_PANDAPHYSICS Physical : public TypedReferenceCount { +class EXPCL_PANDA_PHYSICS Physical : public TypedReferenceCount { public: // typedef pvector PhysicsObjectVector; typedef pvector LinearForceVector; diff --git a/panda/src/physics/physicalNode.h b/panda/src/physics/physicalNode.h index 57ea5026f6..f88d79dda6 100644 --- a/panda/src/physics/physicalNode.h +++ b/panda/src/physics/physicalNode.h @@ -25,7 +25,7 @@ /** * Graph node that encapsulated a series of physical objects */ -class EXPCL_PANDAPHYSICS PhysicalNode : public PandaNode { +class EXPCL_PANDA_PHYSICS PhysicalNode : public PandaNode { PUBLISHED: explicit PhysicalNode(const std::string &name); INLINE void clear(); diff --git a/panda/src/physics/physicsCollisionHandler.h b/panda/src/physics/physicsCollisionHandler.h index 8811a88756..febcede789 100644 --- a/panda/src/physics/physicsCollisionHandler.h +++ b/panda/src/physics/physicsCollisionHandler.h @@ -23,7 +23,7 @@ * that attempt to move into solid walls. This also puts forces onto the * physics objects */ -class EXPCL_PANDAPHYSICS PhysicsCollisionHandler : +class EXPCL_PANDA_PHYSICS PhysicsCollisionHandler : public CollisionHandlerPusher { PUBLISHED: PhysicsCollisionHandler(); diff --git a/panda/src/physics/physicsManager.h b/panda/src/physics/physicsManager.h index 0dc3ef2c51..b9ca9adf49 100644 --- a/panda/src/physics/physicsManager.h +++ b/panda/src/physics/physicsManager.h @@ -33,7 +33,7 @@ * Physics don't get much higher-level than this. Attach as many Physicals * (particle systems, etc..) as you want, pick an integrator and go. */ -class EXPCL_PANDAPHYSICS PhysicsManager { +class EXPCL_PANDA_PHYSICS PhysicsManager { public: // NOTE that the physicals container is NOT reference counted. this does // indeed mean that you are NOT supposed to use this as a primary storage diff --git a/panda/src/physics/physicsObject.h b/panda/src/physics/physicsObject.h index c2a0dc24bd..a36eb2660f 100644 --- a/panda/src/physics/physicsObject.h +++ b/panda/src/physics/physicsObject.h @@ -24,7 +24,7 @@ * motion to your class, do NOT derive from this. Derive from Physical * instead. */ -class EXPCL_PANDAPHYSICS PhysicsObject : public TypedReferenceCount { +class EXPCL_PANDA_PHYSICS PhysicsObject : public TypedReferenceCount { public: typedef pvector Vector; diff --git a/panda/src/physics/physicsObjectCollection.h b/panda/src/physics/physicsObjectCollection.h index b41f5e6cc2..8a69d49073 100644 --- a/panda/src/physics/physicsObjectCollection.h +++ b/panda/src/physics/physicsObjectCollection.h @@ -22,7 +22,7 @@ * This is a set of zero or more PhysicsObjects. It's handy for returning * from functions that need to return multiple PhysicsObjects. */ -class EXPCL_PANDAPHYSICS PhysicsObjectCollection { +class EXPCL_PANDA_PHYSICS PhysicsObjectCollection { PUBLISHED: PhysicsObjectCollection(); PhysicsObjectCollection(const PhysicsObjectCollection ©);