diff --git a/dtool/LocalSetup.pp b/dtool/LocalSetup.pp index a014ba608d..e0e5c12ec5 100644 --- a/dtool/LocalSetup.pp +++ b/dtool/LocalSetup.pp @@ -293,18 +293,9 @@ $[cdefine PYTHON_FRAMEWORK] /* Define if we have RAD game tools, Miles Sound System installed. */ $[cdefine HAVE_RAD_MSS] -/* Define if we have FMODex installed. */ -$[cdefine HAVE_FMODEX] - -/* Define if we have OpenAL installed. */ -$[cdefine HAVE_OPENAL] - /* Define if we have Freetype 2.0 or better available. */ $[cdefine HAVE_FREETYPE] -/* Define if we are using SpeedTree. */ -$[cdefine HAVE_SPEEDTREE] - /* Define if we want to compile in a default font. */ $[cdefine COMPILE_IN_DEFAULT_FONT] @@ -413,9 +404,6 @@ $[cdefine HAVE_FFMPEG] $[cdefine HAVE_SWSCALE] $[cdefine HAVE_SWRESAMPLE] -/* Define if we have ODE installed and want to build for ODE. */ -$[cdefine HAVE_ODE] - /* Define if we have AWESOMIUM installed and want to build for AWESOMIUM. */ $[cdefine HAVE_AWESOMIUM] diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 8bb6a92280..c6645baa6a 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -2037,11 +2037,8 @@ DTOOL_CONFIG=[ ("HAVE_BMP", '1', '1'), ("HAVE_PNM", '1', '1'), ("HAVE_VORBIS", 'UNDEF', 'UNDEF'), - ("HAVE_FMODEX", 'UNDEF', 'UNDEF'), - ("HAVE_OPENAL", 'UNDEF', 'UNDEF'), ("HAVE_NVIDIACG", 'UNDEF', 'UNDEF'), ("HAVE_FREETYPE", 'UNDEF', 'UNDEF'), - ("HAVE_SPEEDTREE", 'UNDEF', 'UNDEF'), ("HAVE_FFTW", 'UNDEF', 'UNDEF'), ("HAVE_OPENSSL", 'UNDEF', 'UNDEF'), ("HAVE_NET", 'UNDEF', 'UNDEF'), @@ -2053,7 +2050,6 @@ DTOOL_CONFIG=[ ("HAVE_SWSCALE", 'UNDEF', 'UNDEF'), ("HAVE_SWRESAMPLE", 'UNDEF', 'UNDEF'), ("HAVE_ARTOOLKIT", 'UNDEF', 'UNDEF'), - ("HAVE_ODE", 'UNDEF', 'UNDEF'), ("HAVE_OPENCV", 'UNDEF', 'UNDEF'), ("HAVE_DIRECTCAM", 'UNDEF', 'UNDEF'), ("HAVE_SQUISH", 'UNDEF', 'UNDEF'), @@ -3126,6 +3122,9 @@ if (not RUNTIME): TargetAdd('p3mathutil_composite1.obj', opts=OPTS, input='p3mathutil_composite1.cxx') TargetAdd('p3mathutil_composite2.obj', opts=OPTS, input='p3mathutil_composite2.cxx') IGATEFILES=GetDirectoryContents('panda/src/mathutil', ["*.h", "*_composite*.cxx"]) + for ifile in IGATEFILES[:]: + if "_src." in ifile: + IGATEFILES.remove(ifile) TargetAdd('libp3mathutil.in', opts=OPTS, input=IGATEFILES) TargetAdd('libp3mathutil.in', opts=['IMOD:panda3d.core', 'ILIB:libp3mathutil', 'SRCDIR:panda/src/mathutil']) TargetAdd('libp3mathutil_igate.obj', input='libp3mathutil.in', opts=["DEPENDENCYONLY"]) diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py index 795d601b2b..138c372af3 100644 --- a/makepanda/makepandacore.py +++ b/makepanda/makepandacore.py @@ -525,9 +525,9 @@ def oscmd(cmd, ignoreError = False): if "interrogate" in cmd.split(" ", 1)[0] and GetVerbose(): print(ColorText("red", "Interrogate failed, retrieving debug output...")) if sys.platform == "win32": - os.spawnl(os.P_WAIT, exe, cmd.split(" ", 1)[0] + " -v " + cmd.split(" ", 1)[1]) + os.spawnl(os.P_WAIT, exe, cmd.split(" ", 1)[0] + " -vv " + cmd.split(" ", 1)[1]) else: - os.system(cmd.split(" ", 1)[0] + " -v " + cmd.split(" ", 1)[1]) + os.system(cmd.split(" ", 1)[0] + " -vv " + cmd.split(" ", 1)[1]) exit("The following command returned a non-zero value: " + str(cmd)) return res diff --git a/panda/src/audiotraits/config_openalAudio.cxx b/panda/src/audiotraits/config_openalAudio.cxx index 7aade3721b..ab89ad775f 100644 --- a/panda/src/audiotraits/config_openalAudio.cxx +++ b/panda/src/audiotraits/config_openalAudio.cxx @@ -13,8 +13,6 @@ //////////////////////////////////////////////////////////////////// #include "pandabase.h" -#ifdef HAVE_OPENAL //[ - #include "config_openalAudio.h" #include "openalAudioManager.h" @@ -65,5 +63,3 @@ get_audio_manager_func_openal_audio() { init_libOpenALAudio(); return &Create_OpenALAudioManager; } - -#endif //] diff --git a/panda/src/audiotraits/config_openalAudio.h b/panda/src/audiotraits/config_openalAudio.h index 3f556d7acd..9a122e2d90 100644 --- a/panda/src/audiotraits/config_openalAudio.h +++ b/panda/src/audiotraits/config_openalAudio.h @@ -17,7 +17,6 @@ #include "pandabase.h" -#ifdef HAVE_OPENAL //[ #include "notifyCategoryProxy.h" #include "dconfig.h" #include "audioManager.h" @@ -28,6 +27,4 @@ NotifyCategoryDecl(openalAudio, EXPCL_OPENAL_AUDIO, EXPTP_OPENAL_AUDIO); extern EXPCL_OPENAL_AUDIO void init_libOpenALAudio(); extern "C" EXPCL_OPENAL_AUDIO Create_AudioManager_proc *get_audio_manager_func_openal_audio(); -#endif //] - #endif // CONFIG_OPENALAUDIO_H diff --git a/panda/src/audiotraits/fmodAudioManager.cxx b/panda/src/audiotraits/fmodAudioManager.cxx index f5c190689a..3a6a4a82e4 100644 --- a/panda/src/audiotraits/fmodAudioManager.cxx +++ b/panda/src/audiotraits/fmodAudioManager.cxx @@ -20,8 +20,6 @@ #include "config_fmodAudio.h" #include "dcast.h" -#ifdef HAVE_FMODEX //[ - //Panda headers. #include "config_audio.h" #include "config_util.h" @@ -897,5 +895,3 @@ get_cache_limit() const { //return _cache_limit; return 0; } - -#endif //] diff --git a/panda/src/audiotraits/fmodAudioManager.h b/panda/src/audiotraits/fmodAudioManager.h index e38a69563e..d43933dc4c 100644 --- a/panda/src/audiotraits/fmodAudioManager.h +++ b/panda/src/audiotraits/fmodAudioManager.h @@ -76,8 +76,6 @@ #include "pandabase.h" #include "pset.h" -#ifdef HAVE_FMODEX //[ - #include "audioManager.h" //The Includes needed for FMOD @@ -235,6 +233,4 @@ private: EXPCL_FMOD_AUDIO AudioManager *Create_FmodAudioManager(); -#endif //] - #endif /* __FMOD_AUDIO_MANAGER_H__ */ diff --git a/panda/src/audiotraits/fmodAudioSound.cxx b/panda/src/audiotraits/fmodAudioSound.cxx index 7eb0fd269f..4b9446f38d 100644 --- a/panda/src/audiotraits/fmodAudioSound.cxx +++ b/panda/src/audiotraits/fmodAudioSound.cxx @@ -19,8 +19,6 @@ #include "pandabase.h" #include "dcast.h" -#ifdef HAVE_FMODEX //[ - //Panda Headers #include "config_audio.h" #include "config_fmodAudio.h" @@ -1107,6 +1105,3 @@ seek_callback(void *handle, unsigned int pos, void *user_data) { return FMOD_OK; } } - - -#endif //] diff --git a/panda/src/audiotraits/fmodAudioSound.h b/panda/src/audiotraits/fmodAudioSound.h index 46aac1c2a3..5be8e97b03 100644 --- a/panda/src/audiotraits/fmodAudioSound.h +++ b/panda/src/audiotraits/fmodAudioSound.h @@ -66,15 +66,11 @@ // //////////////////////////////////////////////////////////////////// - - #ifndef __FMOD_AUDIO_SOUND_H__ #define __FMOD_AUDIO_SOUND_H__ #include -#ifdef HAVE_FMODEX //[ - #include "audioSound.h" #include "reMutex.h" #include "fmodAudioManager.h" @@ -257,11 +253,4 @@ class EXPCL_FMOD_AUDIO FmodAudioSound : public AudioSound { #include "fmodAudioSound.I" -#endif //] - #endif /* __FMOD_AUDIO_SOUND_H__ */ - - - - - diff --git a/panda/src/audiotraits/fmod_audio_composite1.cxx b/panda/src/audiotraits/fmod_audio_composite1.cxx index da514bbdd5..c67bbc3610 100644 --- a/panda/src/audiotraits/fmod_audio_composite1.cxx +++ b/panda/src/audiotraits/fmod_audio_composite1.cxx @@ -2,4 +2,3 @@ #include "config_fmodAudio.cxx" #include "fmodAudioManager.cxx" #include "fmodAudioSound.cxx" - diff --git a/panda/src/audiotraits/openalAudioManager.cxx b/panda/src/audiotraits/openalAudioManager.cxx index df6d756a20..e87ebee5f0 100644 --- a/panda/src/audiotraits/openalAudioManager.cxx +++ b/panda/src/audiotraits/openalAudioManager.cxx @@ -15,8 +15,6 @@ #include "pandabase.h" -#ifdef HAVE_OPENAL //[ - //Panda headers. #include "config_audio.h" #include "config_util.h" @@ -1109,5 +1107,3 @@ discard_excess_cache(int sample_limit) { delete sd; } } - -#endif //] diff --git a/panda/src/audiotraits/openalAudioManager.h b/panda/src/audiotraits/openalAudioManager.h index 2a95aba405..0dcc0e07e2 100644 --- a/panda/src/audiotraits/openalAudioManager.h +++ b/panda/src/audiotraits/openalAudioManager.h @@ -18,7 +18,6 @@ #define __OPENAL_AUDIO_MANAGER_H__ #include "pandabase.h" -#ifdef HAVE_OPENAL //[ #include "audioManager.h" #include "plist.h" @@ -43,11 +42,11 @@ extern void alc_audio_errcheck(const char *context,ALCdevice* device); class EXPCL_OPENAL_AUDIO OpenALAudioManager : public AudioManager { class SoundData; - + friend class OpenALAudioSound; friend class OpenALSoundData; - public: + public: //Constructor and Destructor OpenALAudioManager(); virtual ~OpenALAudioManager(); @@ -55,18 +54,18 @@ class EXPCL_OPENAL_AUDIO OpenALAudioManager : public AudioManager { virtual void shutdown(); virtual bool is_valid(); - + virtual PT(AudioSound) get_sound(const string&, bool positional = false, int mode=SM_heuristic); virtual PT(AudioSound) get_sound(MovieAudio *sound, bool positional = false, int mode=SM_heuristic); - + virtual void uncache_sound(const string&); virtual void clear_cache(); virtual void set_cache_limit(unsigned int count); virtual unsigned int get_cache_limit() const; - + virtual void set_volume(PN_stdfloat); virtual PN_stdfloat get_volume() const; - + void set_play_rate(PN_stdfloat play_rate); PN_stdfloat get_play_rate() const; @@ -80,7 +79,7 @@ class EXPCL_OPENAL_AUDIO OpenALAudioManager : public AudioManager { // ux, uy and uz are the respective components of a unit up-vector // These changes will NOT be invoked until audio_3d_update() is called. virtual void audio_3d_set_listener_attributes(PN_stdfloat px, PN_stdfloat py, PN_stdfloat pz, - PN_stdfloat vx, PN_stdfloat xy, PN_stdfloat xz, + PN_stdfloat vx, PN_stdfloat xy, PN_stdfloat xz, PN_stdfloat fx, PN_stdfloat fy, PN_stdfloat fz, PN_stdfloat ux, PN_stdfloat uy, PN_stdfloat uz); @@ -88,7 +87,7 @@ class EXPCL_OPENAL_AUDIO OpenALAudioManager : public AudioManager { PN_stdfloat *vx, PN_stdfloat *vy, PN_stdfloat *vz, PN_stdfloat *fx, PN_stdfloat *fy, PN_stdfloat *fz, PN_stdfloat *ux, PN_stdfloat *uy, PN_stdfloat *uz); - + // Control the "relative distance factor" for 3D spacialized audio in units-per-foot. Default is 1.0 // OpenAL has no distance factor but we use this as a scale // on the min/max distances of sounds to preserve FMOD compatibility. @@ -121,7 +120,7 @@ private: bool can_use_audio(MovieAudioCursor *source); bool should_load_audio(MovieAudioCursor *source, int mode); - + SoundData *get_sound_data(MovieAudio *source, int mode); // Tell the manager that the sound dtor was called. @@ -129,12 +128,12 @@ private: void increment_client_count(SoundData *sd); void decrement_client_count(SoundData *sd); void discard_excess_cache(int limit); - + void starting_sound(OpenALAudioSound* audio); void stopping_sound(OpenALAudioSound* audio); - + void cleanup(); - + private: // This global lock protects all access to OpenAL library interfaces. static ReMutex _lock; @@ -144,7 +143,7 @@ private: // around for a little while, since it is common to // stop using a sound for a brief moment and then // quickly resume. - + typedef plist ExpirationQueue; ExpirationQueue _expiring_samples; ExpirationQueue _expiring_streams; @@ -175,16 +174,16 @@ private: ExpirationQueue::iterator _expire; }; - + typedef phash_map SampleCache; SampleCache _sample_cache; - + typedef phash_set SoundsPlaying; SoundsPlaying _sounds_playing; typedef phash_set AllSounds; AllSounds _all_sounds; - + // State: int _cache_limit; PN_stdfloat _volume; @@ -195,13 +194,13 @@ private: static int _active_managers; static bool _openal_active; unsigned int _concurrent_sound_limit; - + bool _is_valid; - + typedef pset Managers; static Managers *_managers; - static ALCdevice* _device; + static ALCdevice* _device; static ALCcontext* _context; // cache of openal sources, use only for playing sounds @@ -232,7 +231,7 @@ private: return get_class_type(); } virtual TypeHandle force_init_type() { - init_type(); + init_type(); return get_class_type(); } @@ -247,7 +246,4 @@ private: EXPCL_OPENAL_AUDIO AudioManager *Create_OpenALAudioManager(); - -#endif //] - #endif /* __OPENAL_AUDIO_MANAGER_H__ */ diff --git a/panda/src/audiotraits/openalAudioSound.cxx b/panda/src/audiotraits/openalAudioSound.cxx index af6d658568..eb34d24973 100644 --- a/panda/src/audiotraits/openalAudioSound.cxx +++ b/panda/src/audiotraits/openalAudioSound.cxx @@ -15,8 +15,6 @@ #include "pandabase.h" -#ifdef HAVE_OPENAL //[ - //Panda Headers #include "throw_event.h" #include "openalAudioSound.h" @@ -916,5 +914,3 @@ status() const { return AudioSound::PLAYING; } } - -#endif //] diff --git a/panda/src/audiotraits/openalAudioSound.h b/panda/src/audiotraits/openalAudioSound.h index 5922e0d49b..7a18db21d4 100644 --- a/panda/src/audiotraits/openalAudioSound.h +++ b/panda/src/audiotraits/openalAudioSound.h @@ -13,15 +13,11 @@ // //////////////////////////////////////////////////////////////////// - - #ifndef __OPENAL_AUDIO_SOUND_H__ #define __OPENAL_AUDIO_SOUND_H__ #include "pandabase.h" -#ifdef HAVE_OPENAL //[ - #include "audioSound.h" #include "movieAudioCursor.h" #include "trueClock.h" @@ -232,6 +228,4 @@ private: #include "openalAudioSound.I" -#endif //] - #endif /* __OPENAL_AUDIO_SOUND_H__ */