aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xGem/Gem.pd_darwinbin5071996 -> 5092328 bytes
-rw-r--r--Gem/develop/include/Gem/Base/CPPExtern.h10
-rw-r--r--Gem/develop/include/Gem/Base/GemBase.h2
-rw-r--r--Gem/develop/include/Gem/Base/GemWindow.h7
-rwxr-xr-xGem/gem_filmAVFoundation.sobin71568 -> 71568 bytes
-rwxr-xr-xGem/gem_imageJPEG.sobin52404 -> 52404 bytes
-rwxr-xr-xGem/gem_imageMAGICK.sobin55740 -> 55740 bytes
-rwxr-xr-xGem/gem_imageSGI.sobin59652 -> 59652 bytes
-rwxr-xr-xGem/gem_imageTIFF.sobin68628 -> 68628 bytes
-rwxr-xr-xGem/gem_modelOBJ.sobin86308 -> 86308 bytes
-rwxr-xr-xGem/gemcocoawindow.pd_darwinbin36772 -> 36876 bytes
-rwxr-xr-xGem/gemglfw2window.pd_darwinbin28732 -> 28836 bytes
-rwxr-xr-xGem/gemglfw3window.pd_darwinbin38512 -> 38608 bytes
-rwxr-xr-xGem/gemglutwindow.pd_darwinbin44660 -> 44764 bytes
-rwxr-xr-xGem/gemsdlwindow.pd_darwinbin41608 -> 41704 bytes
-rwxr-xr-xGem/pix_drum.pd_darwinbin26232 -> 26328 bytes
-rwxr-xr-xGem/pix_fiducialtrack.pd_darwinbin76140 -> 76236 bytes
-rwxr-xr-xGem/pix_hit.pd_darwinbin24408 -> 28592 bytes
-rwxr-xr-xGem/pix_mano.pd_darwinbin40472 -> 40568 bytes
19 files changed, 18 insertions, 1 deletions
diff --git a/Gem/Gem.pd_darwin b/Gem/Gem.pd_darwin
index bf93c79..7ddeeed 100755
--- a/Gem/Gem.pd_darwin
+++ b/Gem/Gem.pd_darwin
Binary files 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 4b17cae..448929c 100755
--- a/Gem/gem_filmAVFoundation.so
+++ b/Gem/gem_filmAVFoundation.so
Binary files differ
diff --git a/Gem/gem_imageJPEG.so b/Gem/gem_imageJPEG.so
index e965983..f3b899e 100755
--- a/Gem/gem_imageJPEG.so
+++ b/Gem/gem_imageJPEG.so
Binary files differ
diff --git a/Gem/gem_imageMAGICK.so b/Gem/gem_imageMAGICK.so
index 76d53f9..147eca4 100755
--- a/Gem/gem_imageMAGICK.so
+++ b/Gem/gem_imageMAGICK.so
Binary files differ
diff --git a/Gem/gem_imageSGI.so b/Gem/gem_imageSGI.so
index a272c77..4fb12fd 100755
--- a/Gem/gem_imageSGI.so
+++ b/Gem/gem_imageSGI.so
Binary files differ
diff --git a/Gem/gem_imageTIFF.so b/Gem/gem_imageTIFF.so
index e5adbc8..2193e80 100755
--- a/Gem/gem_imageTIFF.so
+++ b/Gem/gem_imageTIFF.so
Binary files differ
diff --git a/Gem/gem_modelOBJ.so b/Gem/gem_modelOBJ.so
index 622de1e..f5ce607 100755
--- a/Gem/gem_modelOBJ.so
+++ b/Gem/gem_modelOBJ.so
Binary files differ
diff --git a/Gem/gemcocoawindow.pd_darwin b/Gem/gemcocoawindow.pd_darwin
index 7ff85f5..e5eac2c 100755
--- a/Gem/gemcocoawindow.pd_darwin
+++ b/Gem/gemcocoawindow.pd_darwin
Binary files differ
diff --git a/Gem/gemglfw2window.pd_darwin b/Gem/gemglfw2window.pd_darwin
index 0192a9e..408f706 100755
--- a/Gem/gemglfw2window.pd_darwin
+++ b/Gem/gemglfw2window.pd_darwin
Binary files differ
diff --git a/Gem/gemglfw3window.pd_darwin b/Gem/gemglfw3window.pd_darwin
index b7d6f7b..227036b 100755
--- a/Gem/gemglfw3window.pd_darwin
+++ b/Gem/gemglfw3window.pd_darwin
Binary files differ
diff --git a/Gem/gemglutwindow.pd_darwin b/Gem/gemglutwindow.pd_darwin
index 0c99f42..b13c2fc 100755
--- a/Gem/gemglutwindow.pd_darwin
+++ b/Gem/gemglutwindow.pd_darwin
Binary files differ
diff --git a/Gem/gemsdlwindow.pd_darwin b/Gem/gemsdlwindow.pd_darwin
index 7ca36ba..88456e8 100755
--- a/Gem/gemsdlwindow.pd_darwin
+++ b/Gem/gemsdlwindow.pd_darwin
Binary files differ
diff --git a/Gem/pix_drum.pd_darwin b/Gem/pix_drum.pd_darwin
index 07e8b76..29d04aa 100755
--- a/Gem/pix_drum.pd_darwin
+++ b/Gem/pix_drum.pd_darwin
Binary files differ
diff --git a/Gem/pix_fiducialtrack.pd_darwin b/Gem/pix_fiducialtrack.pd_darwin
index 4fc3984..b788411 100755
--- a/Gem/pix_fiducialtrack.pd_darwin
+++ b/Gem/pix_fiducialtrack.pd_darwin
Binary files differ
diff --git a/Gem/pix_hit.pd_darwin b/Gem/pix_hit.pd_darwin
index 99596e7..59f57f3 100755
--- a/Gem/pix_hit.pd_darwin
+++ b/Gem/pix_hit.pd_darwin
Binary files differ
diff --git a/Gem/pix_mano.pd_darwin b/Gem/pix_mano.pd_darwin
index f99fc68..4ec5150 100755
--- a/Gem/pix_mano.pd_darwin
+++ b/Gem/pix_mano.pd_darwin
Binary files differ