diff --git a/lux/plugins/__init__.py b/lux/plugins/__init__.py index 9535eba..2091e86 100644 --- a/lux/plugins/__init__.py +++ b/lux/plugins/__init__.py @@ -19,7 +19,13 @@ # Plugins by Fenn import guilloche import tween_chain -import party_in_your_pants +import butterfly_curve +import harmonograph +#import mesh + +# local only +#import physics +#import sandbox # Plugins by Tristan U. import swallow_tail diff --git a/xenon/Lux/VideoEngine.cc b/xenon/Lux/VideoEngine.cc index 595c021..2d42a8d 100644 --- a/xenon/Lux/VideoEngine.cc +++ b/xenon/Lux/VideoEngine.cc @@ -3,6 +3,7 @@ #include #include +#define GL_GLEXT_PROTOTYPES #ifdef __APPLE__ #include #include @@ -10,6 +11,7 @@ #else // Linux #include #include +#include #endif // OpenCV @@ -163,13 +165,13 @@ void lux::VideoEngine::draw_gl() { if (!m_initialized) return; - +#ifdef __APPLE__ int syphon_width = m_syphon_client.getWidth(); int syphon_height = m_syphon_client.getHeight(); float syphon_aspect = 1.0; if (syphon_width != 0 && syphon_height != 0) syphon_aspect = float(syphon_width) / syphon_height; - +#endif // FIRST: DRAW INTO THE RENDER BUFFER (AT LOW RES) AND READ OUT THE PIXELS glViewport(0, 0, m_viewport_width, m_viewport_height); glMatrixMode(GL_PROJECTION); diff --git a/xenon/Lux/VideoEngine.h b/xenon/Lux/VideoEngine.h index 0d05c0a..54b4db2 100644 --- a/xenon/Lux/VideoEngine.h +++ b/xenon/Lux/VideoEngine.h @@ -11,6 +11,18 @@ #include #endif + +#define GL_GLEXT_PROTOTYPES +#ifdef __APPLE__ +#include +#include +#include +#else // Linux +#include +#include +#include +#endif + // OpenCV #include