diff options
| -rwxr-xr-x | Gem/Gem.pd_linux | bin | 27007590 -> 27134523 bytes | |||
| -rw-r--r-- | Gem/develop/include/Gem/Base/CPPExtern.h | 10 | ||||
| -rw-r--r-- | Gem/develop/include/Gem/Base/GemBase.h | 2 | ||||
| -rw-r--r-- | Gem/develop/include/Gem/Base/GemWindow.h | 7 | ||||
| -rwxr-xr-x | Gem/gemglxwindow.pd_linux | bin | 204120 -> 204376 bytes | |||
| -rwxr-xr-x | Gem/pix_drum.pd_linux | bin | 92612 -> 92698 bytes | |||
| -rwxr-xr-x | Gem/pix_fiducialtrack.pd_linux | bin | 250132 -> 250242 bytes | |||
| -rwxr-xr-x | Gem/pix_hit.pd_linux | bin | 62377 -> 62503 bytes | |||
| -rwxr-xr-x | Gem/pix_mano.pd_linux | bin | 144271 -> 144357 bytes |
9 files changed, 18 insertions, 1 deletions
diff --git a/Gem/Gem.pd_linux b/Gem/Gem.pd_linux Binary files differindex 0f424b2..a0f8880 100755 --- a/Gem/Gem.pd_linux +++ b/Gem/Gem.pd_linux 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/gemglxwindow.pd_linux b/Gem/gemglxwindow.pd_linux Binary files differindex 35d4d3e..e346591 100755 --- a/Gem/gemglxwindow.pd_linux +++ b/Gem/gemglxwindow.pd_linux diff --git a/Gem/pix_drum.pd_linux b/Gem/pix_drum.pd_linux Binary files differindex 53dfdc6..46ee9f7 100755 --- a/Gem/pix_drum.pd_linux +++ b/Gem/pix_drum.pd_linux diff --git a/Gem/pix_fiducialtrack.pd_linux b/Gem/pix_fiducialtrack.pd_linux Binary files differindex ea569f2..4f2e989 100755 --- a/Gem/pix_fiducialtrack.pd_linux +++ b/Gem/pix_fiducialtrack.pd_linux diff --git a/Gem/pix_hit.pd_linux b/Gem/pix_hit.pd_linux Binary files differindex 9c5973f..bdde5b7 100755 --- a/Gem/pix_hit.pd_linux +++ b/Gem/pix_hit.pd_linux diff --git a/Gem/pix_mano.pd_linux b/Gem/pix_mano.pd_linux Binary files differindex 234a9fc..3aa6345 100755 --- a/Gem/pix_mano.pd_linux +++ b/Gem/pix_mano.pd_linux |