From f231ba4cd7ecc689e7827b9c21f79621b8d3f651 Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Tue, 20 Mar 2018 00:09:09 -0600 Subject: [PATCH] directbase: Introduce BUILDING_ defines for each component Ditto everything before, but for direct. --- direct/src/dcparser/dcbase.h | 6 -- direct/src/deadrec/config_deadrec.h | 4 +- direct/src/deadrec/smoothMover.h | 2 +- direct/src/directbase/directsymbols.h | 58 +++++++++++++++++-- direct/src/directd/directd.h | 2 +- .../src/distributed/cConnectionRepository.h | 2 +- .../distributed/cDistributedSmoothNodeBase.h | 2 +- direct/src/distributed/config_distributed.h | 4 +- direct/src/interval/cConstrainHprInterval.h | 2 +- .../src/interval/cConstrainPosHprInterval.h | 2 +- direct/src/interval/cConstrainPosInterval.h | 2 +- .../interval/cConstrainTransformInterval.h | 2 +- direct/src/interval/cConstraintInterval.h | 2 +- direct/src/interval/cInterval.h | 4 +- direct/src/interval/cIntervalManager.h | 2 +- direct/src/interval/cLerpAnimEffectInterval.h | 2 +- direct/src/interval/cLerpInterval.h | 2 +- direct/src/interval/cLerpNodePathInterval.h | 2 +- direct/src/interval/cMetaInterval.h | 2 +- direct/src/interval/config_interval.h | 6 +- direct/src/interval/hideInterval.h | 2 +- direct/src/interval/lerpblend.h | 10 ++-- direct/src/interval/showInterval.h | 2 +- direct/src/interval/waitInterval.h | 2 +- direct/src/motiontrail/cMotionTrail.h | 2 +- direct/src/motiontrail/config_motiontrail.cxx | 2 +- direct/src/motiontrail/config_motiontrail.h | 4 +- direct/src/showbase/showBase.h | 22 +++---- 28 files changed, 100 insertions(+), 56 deletions(-) diff --git a/direct/src/dcparser/dcbase.h b/direct/src/dcparser/dcbase.h index fae53a46f8..6d65f16524 100644 --- a/direct/src/dcparser/dcbase.h +++ b/direct/src/dcparser/dcbase.h @@ -80,12 +80,6 @@ using namespace std; #define nassertv(condition) assert(condition) #define nassertv_always(condition) assert(condition) -// Panda defines these export symbols for building DLL's. Outside of Panda, -// we assume we're not putting this code in a DLL, so we define them to -// nothing. -#define EXPCL_DIRECT -#define EXPTP_DIRECT - // Panda defines a special Filename class. We'll use an ordinary string // instead. typedef string Filename; diff --git a/direct/src/deadrec/config_deadrec.h b/direct/src/deadrec/config_deadrec.h index df1b656e32..7dfc36c898 100644 --- a/direct/src/deadrec/config_deadrec.h +++ b/direct/src/deadrec/config_deadrec.h @@ -18,10 +18,10 @@ #include "notifyCategoryProxy.h" #include "configVariableBool.h" -NotifyCategoryDecl(deadrec, EXPCL_DIRECT, EXPTP_DIRECT); +NotifyCategoryDecl(deadrec, EXPCL_DIRECT_DEADREC, EXPTP_DIRECT_DEADREC); extern ConfigVariableBool accept_clock_skew; -extern EXPCL_DIRECT void init_libdeadrec(); +extern EXPCL_DIRECT_DEADREC void init_libdeadrec(); #endif diff --git a/direct/src/deadrec/smoothMover.h b/direct/src/deadrec/smoothMover.h index e9ca5dc76e..aee12bca8e 100644 --- a/direct/src/deadrec/smoothMover.h +++ b/direct/src/deadrec/smoothMover.h @@ -38,7 +38,7 @@ static const int max_timestamp_delays = 10; * update. The assumption is that all SmoothMovers in the world will be * operating in the same mode together. */ -class EXPCL_DIRECT SmoothMover { +class EXPCL_DIRECT_DEADREC SmoothMover { PUBLISHED: SmoothMover(); ~SmoothMover(); diff --git a/direct/src/directbase/directsymbols.h b/direct/src/directbase/directsymbols.h index 4eb2202c1f..cdd07e1a0c 100644 --- a/direct/src/directbase/directsymbols.h +++ b/direct/src/directbase/directsymbols.h @@ -16,12 +16,62 @@ /* See dtoolsymbols.h for a rant on the purpose of this file. */ +/* BUILDING_DIRECT is just a buildsystem shortcut for all of these: */ #ifdef BUILDING_DIRECT - #define EXPCL_DIRECT EXPORT_CLASS - #define EXPTP_DIRECT EXPORT_TEMPL + #define BUILDING_DIRECT_DEADREC + #define BUILDING_DIRECT_DIRECTD + #define BUILDING_DIRECT_INTERVAL + #define BUILDING_DIRECT_MOTIONTRAIL + #define BUILDING_DIRECT_SHOWBASE + #define BUILDING_DIRECT_DISTRIBUTED +#endif + +#ifdef BUILDING_DIRECT_DEADREC + #define EXPCL_DIRECT_DEADREC EXPORT_CLASS + #define EXPTP_DIRECT_DEADREC EXPORT_TEMPL #else - #define EXPCL_DIRECT IMPORT_CLASS - #define EXPTP_DIRECT IMPORT_TEMPL + #define EXPCL_DIRECT_DEADREC IMPORT_CLASS + #define EXPTP_DIRECT_DEADREC IMPORT_TEMPL +#endif + +#ifdef BUILDING_DIRECT_DIRECTD + #define EXPCL_DIRECT_DIRECTD EXPORT_CLASS + #define EXPTP_DIRECT_DIRECTD EXPORT_TEMPL +#else + #define EXPCL_DIRECT_DIRECTD IMPORT_CLASS + #define EXPTP_DIRECT_DIRECTD IMPORT_TEMPL +#endif + +#ifdef BUILDING_DIRECT_INTERVAL + #define EXPCL_DIRECT_INTERVAL EXPORT_CLASS + #define EXPTP_DIRECT_INTERVAL EXPORT_TEMPL +#else + #define EXPCL_DIRECT_INTERVAL IMPORT_CLASS + #define EXPTP_DIRECT_INTERVAL IMPORT_TEMPL +#endif + +#ifdef BUILDING_DIRECT_MOTIONTRAIL + #define EXPCL_DIRECT_MOTIONTRAIL EXPORT_CLASS + #define EXPTP_DIRECT_MOTIONTRAIL EXPORT_TEMPL +#else + #define EXPCL_DIRECT_MOTIONTRAIL IMPORT_CLASS + #define EXPTP_DIRECT_MOTIONTRAIL IMPORT_TEMPL +#endif + +#ifdef BUILDING_DIRECT_SHOWBASE + #define EXPCL_DIRECT_SHOWBASE EXPORT_CLASS + #define EXPTP_DIRECT_SHOWBASE EXPORT_TEMPL +#else + #define EXPCL_DIRECT_SHOWBASE IMPORT_CLASS + #define EXPTP_DIRECT_SHOWBASE IMPORT_TEMPL +#endif + +#ifdef BUILDING_DIRECT_DISTRIBUTED + #define EXPCL_DIRECT_DISTRIBUTED EXPORT_CLASS + #define EXPTP_DIRECT_DISTRIBUTED EXPORT_TEMPL +#else + #define EXPCL_DIRECT_DISTRIBUTED IMPORT_CLASS + #define EXPTP_DIRECT_DISTRIBUTED IMPORT_TEMPL #endif #endif diff --git a/direct/src/directd/directd.h b/direct/src/directd/directd.h index 3aff05e9df..0623c09b4d 100644 --- a/direct/src/directd/directd.h +++ b/direct/src/directd/directd.h @@ -52,7 +52,7 @@ typedef int HANDLE; * presented in order chronologically by their intended usage. The first * group will probably provide everthing needed for DirectD. */ -class EXPCL_DIRECT DirectD { +class EXPCL_DIRECT_DIRECTD DirectD { PUBLISHED: DirectD(); ~DirectD(); diff --git a/direct/src/distributed/cConnectionRepository.h b/direct/src/distributed/cConnectionRepository.h index fbc494423e..420c995e37 100644 --- a/direct/src/distributed/cConnectionRepository.h +++ b/direct/src/distributed/cConnectionRepository.h @@ -53,7 +53,7 @@ class SocketStream; * the C++ layer, while server messages that are not understood by the C++ * layer are returned up to the Python layer for processing. */ -class EXPCL_DIRECT CConnectionRepository { +class EXPCL_DIRECT_DISTRIBUTED CConnectionRepository { PUBLISHED: explicit CConnectionRepository(bool has_owner_view = false, bool threaded_net = false); diff --git a/direct/src/distributed/cDistributedSmoothNodeBase.h b/direct/src/distributed/cDistributedSmoothNodeBase.h index 53763a6a47..d2c43e285c 100644 --- a/direct/src/distributed/cDistributedSmoothNodeBase.h +++ b/direct/src/distributed/cDistributedSmoothNodeBase.h @@ -28,7 +28,7 @@ class CConnectionRepository; * This class defines some basic methods of DistributedSmoothNodeBase which * have been moved into C++ as a performance optimization. */ -class EXPCL_DIRECT CDistributedSmoothNodeBase { +class EXPCL_DIRECT_DISTRIBUTED CDistributedSmoothNodeBase { PUBLISHED: CDistributedSmoothNodeBase(); ~CDistributedSmoothNodeBase(); diff --git a/direct/src/distributed/config_distributed.h b/direct/src/distributed/config_distributed.h index 1ffbc39df9..22814bfa13 100644 --- a/direct/src/distributed/config_distributed.h +++ b/direct/src/distributed/config_distributed.h @@ -21,13 +21,13 @@ #include "configVariableDouble.h" #include "configVariableBool.h" -NotifyCategoryDecl(distributed, EXPCL_DIRECT, EXPTP_DIRECT); +NotifyCategoryDecl(distributed, EXPCL_DIRECT_DISTRIBUTED, EXPTP_DIRECT_DISTRIBUTED); extern ConfigVariableInt game_server_timeout_ms; extern ConfigVariableDouble min_lag; extern ConfigVariableDouble max_lag; extern ConfigVariableBool handle_datagrams_internally; -extern EXPCL_DIRECT void init_libdistributed(); +extern EXPCL_DIRECT_DISTRIBUTED void init_libdistributed(); #endif diff --git a/direct/src/interval/cConstrainHprInterval.h b/direct/src/interval/cConstrainHprInterval.h index a618b98641..73c790100d 100644 --- a/direct/src/interval/cConstrainHprInterval.h +++ b/direct/src/interval/cConstrainHprInterval.h @@ -24,7 +24,7 @@ * A constraint interval that will constrain the orientation of one node to * the orientation of another. */ -class EXPCL_DIRECT CConstrainHprInterval : public CConstraintInterval { +class EXPCL_DIRECT_INTERVAL CConstrainHprInterval : public CConstraintInterval { PUBLISHED: explicit CConstrainHprInterval(const string &name, double duration, const NodePath &node, const NodePath &target, diff --git a/direct/src/interval/cConstrainPosHprInterval.h b/direct/src/interval/cConstrainPosHprInterval.h index d3ce5efa4f..44fedae0f6 100644 --- a/direct/src/interval/cConstrainPosHprInterval.h +++ b/direct/src/interval/cConstrainPosHprInterval.h @@ -24,7 +24,7 @@ * A constraint interval that will constrain the position and orientation of * one node to the position and orientation of another. */ -class EXPCL_DIRECT CConstrainPosHprInterval : public CConstraintInterval { +class EXPCL_DIRECT_INTERVAL CConstrainPosHprInterval : public CConstraintInterval { PUBLISHED: explicit CConstrainPosHprInterval(const string &name, double duration, const NodePath &node, const NodePath &target, diff --git a/direct/src/interval/cConstrainPosInterval.h b/direct/src/interval/cConstrainPosInterval.h index 92055cd0a4..1e66d3aca0 100644 --- a/direct/src/interval/cConstrainPosInterval.h +++ b/direct/src/interval/cConstrainPosInterval.h @@ -23,7 +23,7 @@ * A constraint interval that will constrain the position of one node to the * position of another. */ -class EXPCL_DIRECT CConstrainPosInterval : public CConstraintInterval { +class EXPCL_DIRECT_INTERVAL CConstrainPosInterval : public CConstraintInterval { PUBLISHED: explicit CConstrainPosInterval(const string &name, double duration, const NodePath &node, const NodePath &target, diff --git a/direct/src/interval/cConstrainTransformInterval.h b/direct/src/interval/cConstrainTransformInterval.h index 897f12aea3..a4bb537ec1 100644 --- a/direct/src/interval/cConstrainTransformInterval.h +++ b/direct/src/interval/cConstrainTransformInterval.h @@ -22,7 +22,7 @@ * A constraint interval that will constrain the transform of one node to the * transform of another. */ -class EXPCL_DIRECT CConstrainTransformInterval : public CConstraintInterval { +class EXPCL_DIRECT_INTERVAL CConstrainTransformInterval : public CConstraintInterval { PUBLISHED: explicit CConstrainTransformInterval(const string &name, double duration, const NodePath &node, diff --git a/direct/src/interval/cConstraintInterval.h b/direct/src/interval/cConstraintInterval.h index 32f90ed978..96a47946ec 100644 --- a/direct/src/interval/cConstraintInterval.h +++ b/direct/src/interval/cConstraintInterval.h @@ -21,7 +21,7 @@ * The base class for a family of intervals that constrain some property to a * value over time. */ -class EXPCL_DIRECT CConstraintInterval : public CInterval { +class EXPCL_DIRECT_INTERVAL CConstraintInterval : public CInterval { PUBLISHED: bool bogus_variable; diff --git a/direct/src/interval/cInterval.h b/direct/src/interval/cInterval.h index d62eadc0c7..07672f352f 100644 --- a/direct/src/interval/cInterval.h +++ b/direct/src/interval/cInterval.h @@ -32,7 +32,7 @@ class CIntervalManager; * C++ will inherit from this class; Intervals that must be implemented in * Python will inherit from the similar Python class. */ -class EXPCL_DIRECT CInterval : public TypedReferenceCount { +class EXPCL_DIRECT_INTERVAL CInterval : public TypedReferenceCount { public: CInterval(const string &name, double duration, bool open_ended); virtual ~CInterval(); @@ -202,7 +202,7 @@ private: }; INLINE ostream &operator << (ostream &out, const CInterval &ival); -EXPCL_DIRECT ostream &operator << (ostream &out, CInterval::State state); +EXPCL_DIRECT_INTERVAL ostream &operator << (ostream &out, CInterval::State state); #include "cInterval.I" diff --git a/direct/src/interval/cIntervalManager.h b/direct/src/interval/cIntervalManager.h index 26616dce91..d4279c25fb 100644 --- a/direct/src/interval/cIntervalManager.h +++ b/direct/src/interval/cIntervalManager.h @@ -36,7 +36,7 @@ class EventQueue; * It is also possible to create multiple IntervalManager objects for special * needs. */ -class EXPCL_DIRECT CIntervalManager { +class EXPCL_DIRECT_INTERVAL CIntervalManager { PUBLISHED: CIntervalManager(); ~CIntervalManager(); diff --git a/direct/src/interval/cLerpAnimEffectInterval.h b/direct/src/interval/cLerpAnimEffectInterval.h index ef84b19df0..af657cb7cc 100644 --- a/direct/src/interval/cLerpAnimEffectInterval.h +++ b/direct/src/interval/cLerpAnimEffectInterval.h @@ -29,7 +29,7 @@ * CLerpAnimEffectInterval to adjust the degree to which each animation * affects the actor. */ -class EXPCL_DIRECT CLerpAnimEffectInterval : public CLerpInterval { +class EXPCL_DIRECT_INTERVAL CLerpAnimEffectInterval : public CLerpInterval { PUBLISHED: INLINE explicit CLerpAnimEffectInterval(const string &name, double duration, BlendType blend_type); diff --git a/direct/src/interval/cLerpInterval.h b/direct/src/interval/cLerpInterval.h index 6a6abbe5c9..7011fd70e9 100644 --- a/direct/src/interval/cLerpInterval.h +++ b/direct/src/interval/cLerpInterval.h @@ -21,7 +21,7 @@ * The base class for a family of intervals that linearly interpolate one or * more numeric values over time. */ -class EXPCL_DIRECT CLerpInterval : public CInterval { +class EXPCL_DIRECT_INTERVAL CLerpInterval : public CInterval { PUBLISHED: enum BlendType { BT_no_blend, diff --git a/direct/src/interval/cLerpNodePathInterval.h b/direct/src/interval/cLerpNodePathInterval.h index 9ac5ae46dc..a134faebf0 100644 --- a/direct/src/interval/cLerpNodePathInterval.h +++ b/direct/src/interval/cLerpNodePathInterval.h @@ -23,7 +23,7 @@ * An interval that lerps one or more properties (like pos, hpr, etc.) on a * NodePath over time. */ -class EXPCL_DIRECT CLerpNodePathInterval : public CLerpInterval { +class EXPCL_DIRECT_INTERVAL CLerpNodePathInterval : public CLerpInterval { PUBLISHED: explicit CLerpNodePathInterval(const string &name, double duration, BlendType blend_type, bool bake_in_start, diff --git a/direct/src/interval/cMetaInterval.h b/direct/src/interval/cMetaInterval.h index ea44225842..f1956f4167 100644 --- a/direct/src/interval/cMetaInterval.h +++ b/direct/src/interval/cMetaInterval.h @@ -29,7 +29,7 @@ * own begin and end times. Some of them may overlap and some of them may * not. */ -class EXPCL_DIRECT CMetaInterval : public CInterval { +class EXPCL_DIRECT_INTERVAL CMetaInterval : public CInterval { PUBLISHED: explicit CMetaInterval(const string &name); virtual ~CMetaInterval(); diff --git a/direct/src/interval/config_interval.h b/direct/src/interval/config_interval.h index 8695f4b140..10af86bfb7 100644 --- a/direct/src/interval/config_interval.h +++ b/direct/src/interval/config_interval.h @@ -20,11 +20,11 @@ #include "configVariableDouble.h" #include "configVariableBool.h" -NotifyCategoryDecl(interval, EXPCL_DIRECT, EXPTP_DIRECT); +NotifyCategoryDecl(interval, EXPCL_DIRECT_INTERVAL, EXPTP_DIRECT_INTERVAL); extern ConfigVariableDouble interval_precision; -extern EXPCL_DIRECT ConfigVariableBool verify_intervals; +extern EXPCL_DIRECT_INTERVAL ConfigVariableBool verify_intervals; -extern EXPCL_DIRECT void init_libinterval(); +extern EXPCL_DIRECT_INTERVAL void init_libinterval(); #endif diff --git a/direct/src/interval/hideInterval.h b/direct/src/interval/hideInterval.h index f2a53307b1..91cd1a9bda 100644 --- a/direct/src/interval/hideInterval.h +++ b/direct/src/interval/hideInterval.h @@ -21,7 +21,7 @@ /** * An interval that calls NodePath::hide(). */ -class EXPCL_DIRECT HideInterval : public CInterval { +class EXPCL_DIRECT_INTERVAL HideInterval : public CInterval { PUBLISHED: explicit HideInterval(const NodePath &node, const string &name = string()); diff --git a/direct/src/interval/lerpblend.h b/direct/src/interval/lerpblend.h index f5c583ace9..d0f0bd8cfc 100644 --- a/direct/src/interval/lerpblend.h +++ b/direct/src/interval/lerpblend.h @@ -17,7 +17,7 @@ #include "directbase.h" #include "typedReferenceCount.h" -class EXPCL_DIRECT LerpBlendType : public TypedReferenceCount { +class EXPCL_DIRECT_INTERVAL LerpBlendType : public TypedReferenceCount { PUBLISHED: LerpBlendType() {} virtual ~LerpBlendType(); @@ -47,7 +47,7 @@ private: static TypeHandle _type_handle; }; -class EXPCL_DIRECT EaseInBlendType : public LerpBlendType { +class EXPCL_DIRECT_INTERVAL EaseInBlendType : public LerpBlendType { PUBLISHED: EaseInBlendType() {} virtual ~EaseInBlendType(); @@ -77,7 +77,7 @@ private: static TypeHandle _type_handle; }; -class EXPCL_DIRECT EaseOutBlendType : public LerpBlendType { +class EXPCL_DIRECT_INTERVAL EaseOutBlendType : public LerpBlendType { PUBLISHED: EaseOutBlendType() {} virtual ~EaseOutBlendType(); @@ -107,7 +107,7 @@ private: static TypeHandle _type_handle; }; -class EXPCL_DIRECT EaseInOutBlendType : public LerpBlendType { +class EXPCL_DIRECT_INTERVAL EaseInOutBlendType : public LerpBlendType { PUBLISHED: EaseInOutBlendType() {} virtual ~EaseInOutBlendType(); @@ -136,7 +136,7 @@ private: static TypeHandle _type_handle; }; -class EXPCL_DIRECT NoBlendType : public LerpBlendType { +class EXPCL_DIRECT_INTERVAL NoBlendType : public LerpBlendType { PUBLISHED: NoBlendType() {} virtual ~NoBlendType(); diff --git a/direct/src/interval/showInterval.h b/direct/src/interval/showInterval.h index 5365581339..bff66d8366 100644 --- a/direct/src/interval/showInterval.h +++ b/direct/src/interval/showInterval.h @@ -21,7 +21,7 @@ /** * An interval that calls NodePath::show(). */ -class EXPCL_DIRECT ShowInterval : public CInterval { +class EXPCL_DIRECT_INTERVAL ShowInterval : public CInterval { PUBLISHED: explicit ShowInterval(const NodePath &node, const string &name = string()); diff --git a/direct/src/interval/waitInterval.h b/direct/src/interval/waitInterval.h index dbf0757843..c3607c27b8 100644 --- a/direct/src/interval/waitInterval.h +++ b/direct/src/interval/waitInterval.h @@ -21,7 +21,7 @@ * This interval does absolutely nothing, and is mainly useful for marking * time between other intervals within a sequence. */ -class EXPCL_DIRECT WaitInterval : public CInterval { +class EXPCL_DIRECT_INTERVAL WaitInterval : public CInterval { PUBLISHED: INLINE explicit WaitInterval(double duration); diff --git a/direct/src/motiontrail/cMotionTrail.h b/direct/src/motiontrail/cMotionTrail.h index ef05b4b1c0..fdb5ba1f56 100644 --- a/direct/src/motiontrail/cMotionTrail.h +++ b/direct/src/motiontrail/cMotionTrail.h @@ -69,7 +69,7 @@ public: * coordinate of the texture corresponds to time and the v coordinate * corresponds to the "shape" of the motion trail. */ -class EXPCL_DIRECT CMotionTrail : public TypedReferenceCount { +class EXPCL_DIRECT_MOTIONTRAIL CMotionTrail : public TypedReferenceCount { PUBLISHED: CMotionTrail(); ~CMotionTrail(); diff --git a/direct/src/motiontrail/config_motiontrail.cxx b/direct/src/motiontrail/config_motiontrail.cxx index c805ae1319..0907457acd 100644 --- a/direct/src/motiontrail/config_motiontrail.cxx +++ b/direct/src/motiontrail/config_motiontrail.cxx @@ -14,7 +14,7 @@ #include "config_motiontrail.h" #include "dconfig.h" -extern EXPCL_DIRECT void init_libmotiontrail(); +extern EXPCL_DIRECT_MOTIONTRAIL void init_libmotiontrail(); Configure(config_motiontrail); NotifyCategoryDef(motiontrail, ""); diff --git a/direct/src/motiontrail/config_motiontrail.h b/direct/src/motiontrail/config_motiontrail.h index 79c516d41c..918c839612 100644 --- a/direct/src/motiontrail/config_motiontrail.h +++ b/direct/src/motiontrail/config_motiontrail.h @@ -20,8 +20,8 @@ #include "cMotionTrail.h" -NotifyCategoryDecl(motiontrail, EXPCL_DIRECT, EXPTP_DIRECT); +NotifyCategoryDecl(motiontrail, EXPCL_DIRECT_MOTIONTRAIL, EXPTP_DIRECT_MOTIONTRAIL); -extern EXPCL_DIRECT void init_libmotiontrail(); +extern EXPCL_DIRECT_MOTIONTRAIL void init_libmotiontrail(); #endif diff --git a/direct/src/showbase/showBase.h b/direct/src/showbase/showBase.h index 2347800789..a38a791d3b 100644 --- a/direct/src/showbase/showBase.h +++ b/direct/src/showbase/showBase.h @@ -26,7 +26,7 @@ #include "configVariableSearchPath.h" #include "nodePath.h" -ConfigureDecl(config_showbase, EXPCL_DIRECT, EXPTP_DIRECT); +ConfigureDecl(config_showbase, EXPCL_DIRECT_SHOWBASE, EXPTP_DIRECT_SHOWBASE); class CollisionTraverser; class Camera; @@ -34,24 +34,24 @@ class GraphicsEngine; BEGIN_PUBLISH -EXPCL_DIRECT ConfigVariableSearchPath &get_particle_path(); +EXPCL_DIRECT_SHOWBASE ConfigVariableSearchPath &get_particle_path(); -EXPCL_DIRECT void throw_new_frame(); +EXPCL_DIRECT_SHOWBASE void throw_new_frame(); -EXPCL_DIRECT DConfig &get_config_showbase(); -EXPCL_DIRECT void init_app_for_gui(); +EXPCL_DIRECT_SHOWBASE DConfig &get_config_showbase(); +EXPCL_DIRECT_SHOWBASE void init_app_for_gui(); // klunky interface since we cant pass array from python->C++ -EXPCL_DIRECT void add_fullscreen_testsize(int xsize, int ysize); -EXPCL_DIRECT void runtest_fullscreen_sizes(GraphicsWindow *win); -EXPCL_DIRECT bool query_fullscreen_testresult(int xsize, int ysize); +EXPCL_DIRECT_SHOWBASE void add_fullscreen_testsize(int xsize, int ysize); +EXPCL_DIRECT_SHOWBASE void runtest_fullscreen_sizes(GraphicsWindow *win); +EXPCL_DIRECT_SHOWBASE bool query_fullscreen_testresult(int xsize, int ysize); // to handle windows stickykeys -EXPCL_DIRECT void store_accessibility_shortcut_keys(); -EXPCL_DIRECT void allow_accessibility_shortcut_keys(bool allowKeys); +EXPCL_DIRECT_SHOWBASE void store_accessibility_shortcut_keys(); +EXPCL_DIRECT_SHOWBASE void allow_accessibility_shortcut_keys(bool allowKeys); #ifdef IS_OSX -EXPCL_DIRECT void activate_osx_application(); +EXPCL_DIRECT_SHOWBASE void activate_osx_application(); #endif END_PUBLISH