From fa1b53319b6424bd9c88ba7009bbd1063556619b Mon Sep 17 00:00:00 2001 From: Travis CI Date: Sat, 21 Mar 2015 00:04:59 +0000 Subject: Gem 136832db9e7bc7721b329539d6756e51b5f02abe osx/i386 built 'master:136832db9e7bc7721b329539d6756e51b5f02abe' for osx/i386 --- Gem/Gem.pd_darwin | Bin 4848716 -> 4868632 bytes Gem/develop/include/Gem/Base/CPPExtern.h | 10 +++++++++- Gem/develop/include/Gem/Base/GemBase.h | 2 ++ Gem/develop/include/Gem/Base/GemWindow.h | 7 +++++++ Gem/gem_filmAVFoundation.so | Bin 34800 -> 34800 bytes Gem/gem_imageJPEG.so | Bin 50444 -> 50444 bytes Gem/gem_imageMAGICK.so | Bin 53588 -> 53588 bytes Gem/gem_imageSGI.so | Bin 57464 -> 57464 bytes Gem/gem_imageTIFF.so | Bin 65624 -> 65624 bytes Gem/gem_modelOBJ.so | Bin 86692 -> 86692 bytes Gem/gemcocoawindow.pd_darwin | Bin 38916 -> 39008 bytes Gem/gemglfw2window.pd_darwin | Bin 27288 -> 27384 bytes Gem/gemglfw3window.pd_darwin | Bin 36884 -> 36976 bytes Gem/gemglutwindow.pd_darwin | Bin 42752 -> 42848 bytes Gem/gemsdlwindow.pd_darwin | Bin 40396 -> 40488 bytes Gem/pix_drum.pd_darwin | Bin 25496 -> 25584 bytes Gem/pix_fiducialtrack.pd_darwin | Bin 73668 -> 73756 bytes Gem/pix_hit.pd_darwin | Bin 27384 -> 27472 bytes Gem/pix_mano.pd_darwin | Bin 39544 -> 39632 bytes 19 files changed, 18 insertions(+), 1 deletion(-) (limited to 'Gem') diff --git a/Gem/Gem.pd_darwin b/Gem/Gem.pd_darwin index 9b9fc20..b999958 100755 Binary files a/Gem/Gem.pd_darwin and b/Gem/Gem.pd_darwin differ diff --git a/Gem/develop/include/Gem/Base/CPPExtern.h b/Gem/develop/include/Gem/Base/CPPExtern.h index 0350681..ddacc54 100644 --- a/Gem/develop/include/Gem/Base/CPPExtern.h +++ b/Gem/develop/include/Gem/Base/CPPExtern.h @@ -122,6 +122,12 @@ class GEM_EXTERN CPPExtern // Creation callback static void real_obj_setupCallback(t_class *) {} + /////////// + // called directly before the destructor + // normally you should not override this (use the dtor!) + // if you do override this, make sure that you call the parent as well + virtual void beforeDeletion(); + private: ////////// @@ -157,7 +163,9 @@ class GEM_EXTERN CPPExtern #define CPPEXTERN_HEADER(NEW_CLASS, PARENT_CLASS) \ public: \ static void obj_freeCallback(void *data) \ -{ CPPExtern *mydata = ((Obj_header *)data)->data; delete mydata; \ +{ CPPExtern *mydata = ((Obj_header *)data)->data; \ + GetMyClass(data)->beforeDeletion(); \ + delete mydata; \ ((Obj_header *)data)->Obj_header::~Obj_header(); } \ static void real_obj_setupCallback(t_class *classPtr) \ { PARENT_CLASS::real_obj_setupCallback(classPtr); \ diff --git a/Gem/develop/include/Gem/Base/GemBase.h b/Gem/develop/include/Gem/Base/GemBase.h index 09e6a8f..9b0d362 100644 --- a/Gem/develop/include/Gem/Base/GemBase.h +++ b/Gem/develop/include/Gem/Base/GemBase.h @@ -128,6 +128,8 @@ class GEM_EXTERN GemBase : public CPPExtern protected: enum RenderState getState(void); + + virtual void beforeDeletion(void); }; #endif // for header file diff --git a/Gem/develop/include/Gem/Base/GemWindow.h b/Gem/develop/include/Gem/Base/GemWindow.h index c5105c4..18ad28f 100644 --- a/Gem/develop/include/Gem/Base/GemWindow.h +++ b/Gem/develop/include/Gem/Base/GemWindow.h @@ -30,6 +30,7 @@ DESCRIPTION namespace gem { class Context; }; +class GemBase; class GEM_EXTERN GemWindow : public CPPExtern { @@ -86,6 +87,12 @@ class GEM_EXTERN GemWindow : public CPPExtern */ static gem::Context*destroyContext(gem::Context*); + /* + * call stopRendering() of a given objects for all valid contexts + * (this will make each context current, call obj->stopRendering and switch back to the original context) + */ + static void stopInAllContexts(GemBase*obj); + /* this MUST be called from the derived classes * as it will eventually establish a new GemContext (if m_context is non-NULL) * if you want to share GemContext's you MUST call diff --git a/Gem/gem_filmAVFoundation.so b/Gem/gem_filmAVFoundation.so index 4a6f9c3..602291c 100755 Binary files a/Gem/gem_filmAVFoundation.so and b/Gem/gem_filmAVFoundation.so differ diff --git a/Gem/gem_imageJPEG.so b/Gem/gem_imageJPEG.so index a053d10..d8b542e 100755 Binary files a/Gem/gem_imageJPEG.so and b/Gem/gem_imageJPEG.so differ diff --git a/Gem/gem_imageMAGICK.so b/Gem/gem_imageMAGICK.so index 1e5fc70..8d57484 100755 Binary files a/Gem/gem_imageMAGICK.so and b/Gem/gem_imageMAGICK.so differ diff --git a/Gem/gem_imageSGI.so b/Gem/gem_imageSGI.so index 2f465d1..f36db5b 100755 Binary files a/Gem/gem_imageSGI.so and b/Gem/gem_imageSGI.so differ diff --git a/Gem/gem_imageTIFF.so b/Gem/gem_imageTIFF.so index deb3e69..3faebca 100755 Binary files a/Gem/gem_imageTIFF.so and b/Gem/gem_imageTIFF.so differ diff --git a/Gem/gem_modelOBJ.so b/Gem/gem_modelOBJ.so index ad86337..7f22e46 100755 Binary files a/Gem/gem_modelOBJ.so and b/Gem/gem_modelOBJ.so differ diff --git a/Gem/gemcocoawindow.pd_darwin b/Gem/gemcocoawindow.pd_darwin index 50b8dd2..50b902a 100755 Binary files a/Gem/gemcocoawindow.pd_darwin and b/Gem/gemcocoawindow.pd_darwin differ diff --git a/Gem/gemglfw2window.pd_darwin b/Gem/gemglfw2window.pd_darwin index f284dc3..5b82bc5 100755 Binary files a/Gem/gemglfw2window.pd_darwin and b/Gem/gemglfw2window.pd_darwin differ diff --git a/Gem/gemglfw3window.pd_darwin b/Gem/gemglfw3window.pd_darwin index e73066f..5beac3e 100755 Binary files a/Gem/gemglfw3window.pd_darwin and b/Gem/gemglfw3window.pd_darwin differ diff --git a/Gem/gemglutwindow.pd_darwin b/Gem/gemglutwindow.pd_darwin index 5daf034..ea0dd8a 100755 Binary files a/Gem/gemglutwindow.pd_darwin and b/Gem/gemglutwindow.pd_darwin differ diff --git a/Gem/gemsdlwindow.pd_darwin b/Gem/gemsdlwindow.pd_darwin index 066740f..dacee9f 100755 Binary files a/Gem/gemsdlwindow.pd_darwin and b/Gem/gemsdlwindow.pd_darwin differ diff --git a/Gem/pix_drum.pd_darwin b/Gem/pix_drum.pd_darwin index e27b538..1377972 100755 Binary files a/Gem/pix_drum.pd_darwin and b/Gem/pix_drum.pd_darwin differ diff --git a/Gem/pix_fiducialtrack.pd_darwin b/Gem/pix_fiducialtrack.pd_darwin index 6b43b77..cdb411c 100755 Binary files a/Gem/pix_fiducialtrack.pd_darwin and b/Gem/pix_fiducialtrack.pd_darwin differ diff --git a/Gem/pix_hit.pd_darwin b/Gem/pix_hit.pd_darwin index f5f5480..679a7d9 100755 Binary files a/Gem/pix_hit.pd_darwin and b/Gem/pix_hit.pd_darwin differ diff --git a/Gem/pix_mano.pd_darwin b/Gem/pix_mano.pd_darwin index 8a6595e..29cbfbe 100755 Binary files a/Gem/pix_mano.pd_darwin and b/Gem/pix_mano.pd_darwin differ -- cgit v1.2.1