diff options
Diffstat (limited to 'Gem')
-rwxr-xr-x | Gem/Gem.pd_linux | bin | 33362186 -> 33362186 bytes | |||
-rw-r--r-- | Gem/develop/include/Gem/Gem/GemGL.h | 16 | ||||
-rw-r--r-- | Gem/develop/include/Gem/Utils/GLUtil.h | 4 | ||||
-rw-r--r-- | Gem/v4l2-videoplugin.pd | 38 | ||||
-rw-r--r-- | Gem/vnc-videoplugin.pd | 2 |
5 files changed, 39 insertions, 21 deletions
diff --git a/Gem/Gem.pd_linux b/Gem/Gem.pd_linux Binary files differindex 3a46e4b..67d25f5 100755 --- a/Gem/Gem.pd_linux +++ b/Gem/Gem.pd_linux diff --git a/Gem/develop/include/Gem/Gem/GemGL.h b/Gem/develop/include/Gem/Gem/GemGL.h index a009928..ef3b250 100644 --- a/Gem/develop/include/Gem/Gem/GemGL.h +++ b/Gem/develop/include/Gem/Gem/GemGL.h @@ -32,10 +32,18 @@ # define GLEW_MX #endif -#include "Gem/glew.h" +#ifdef __EMSCRIPTEN__ +# include <GL/glew.h> +# include <SDL/SDL_opengl.h> +# include <GL/gl.h> +# include <GL/glu.h> +#else +# include "Gem/glew.h" +#endif #ifdef __APPLE__ # include <OpenGL/OpenGL.h> +#elif defined(__EMSCRIPTEN__) #elif defined _WIN32 # include "Gem/wglew.h" #elif defined(__linux__) || defined(__FreeBSD_kernel__) @@ -86,4 +94,10 @@ GEM_EXTERN GLXEWContext*glxewGetContext(void); # endif #endif + +// missing from Emscripten's glew implementation +#ifndef GL_TEXTURE_RECTANGLE_EXT +# define GL_TEXTURE_RECTANGLE_EXT 0x84F5 +#endif + #endif /* _INCLUDE__GEM_GEM_GEMGL_H_ */ diff --git a/Gem/develop/include/Gem/Utils/GLUtil.h b/Gem/develop/include/Gem/Utils/GLUtil.h index 7dad69d..fb15b25 100644 --- a/Gem/develop/include/Gem/Utils/GLUtil.h +++ b/Gem/develop/include/Gem/Utils/GLUtil.h @@ -26,7 +26,11 @@ struct _symbol; #include <string> /* for GLenum */ +#ifdef __EMSCRIPTEN__ +#include "Gem/glew.h" +#else #include "Gem/GemGL.h" +#endif #include "Gem/Exception.h" diff --git a/Gem/v4l2-videoplugin.pd b/Gem/v4l2-videoplugin.pd index 45c4cfc..db27c96 100644 --- a/Gem/v4l2-videoplugin.pd +++ b/Gem/v4l2-videoplugin.pd @@ -1,23 +1,23 @@ -#N canvas 8 49 505 589 10; -#X msg 9 219 device usb-0000:00:04.1-4; -#X msg 9 239 device usb-0000:00:06.0-2; -#X msg 9 259 device usb-0000:00:04.0-1; -#X msg -42 366 get driver; -#X msg 48 366 get card; -#X msg 138 366 get bus_info; -#X text -42 304 contrary to /dev/video* files \, this address is not +#N canvas 8 61 505 589 10; +#X msg 109 219 device usb-0000:00:04.1-4; +#X msg 109 239 device usb-0000:00:06.0-2; +#X msg 109 259 device usb-0000:00:04.0-1; +#X msg 58 366 get driver; +#X msg 148 366 get card; +#X msg 238 366 get bus_info; +#X text 58 304 contrary to /dev/video* files \, this address is not related to the plug order of the devices; -#X obj -73 425 cnv 15 150 20 empty \$0-propreadNamev4l2 -- 10 9 0 14 +#X obj 27 425 cnv 15 150 20 empty \$0-propreadNamev4l2 -- 10 9 0 14 -203904 -66577 0; -#X obj 86 425 cnv 15 200 20 empty \$0-propreadValuev4l2 -- 10 9 0 14 --261234 -66577 0; -#X obj -21 282 s \$1-ctl; -#X text -38 176 You can also choose a device by its physical location +#X obj 186 425 cnv 15 200 20 empty \$0-propreadValuev4l2 -- 10 9 0 +14 -261234 -66577 0; +#X obj 79 282 s \$1-ctl; +#X text 62 176 You can also choose a device by its physical location on the bus:; -#X obj -21 132 s \$1-ctl; -#X msg 9 69 device /dev/video0; -#X msg 9 89 device /dev/video4; -#X text -44 350 these are some related read-only properties :; +#X obj 79 132 s \$1-ctl; +#X msg 109 69 device /dev/video0; +#X msg 109 89 device /dev/video4; +#X text 56 350 these are some related read-only properties :; #N canvas 762 178 450 537 getDeviceInfo 0; #X obj 54 38 inlet; #X obj 54 66 s \$1-ctl; @@ -62,8 +62,8 @@ on the bus:; #X connect 18 0 19 0; #X connect 19 0 7 0; #X connect 19 1 12 0; -#X restore -42 394 pd getDeviceInfo; -#X text -38 26 With V4L2 backend you can choose a device via its device-name: +#X restore 58 394 pd getDeviceInfo; +#X text 62 26 With V4L2 backend you can choose a device via its device-name: ; #X connect 0 0 9 0; #X connect 1 0 9 0; diff --git a/Gem/vnc-videoplugin.pd b/Gem/vnc-videoplugin.pd index 5029e0d..a36122d 100644 --- a/Gem/vnc-videoplugin.pd +++ b/Gem/vnc-videoplugin.pd @@ -1,4 +1,4 @@ -#N canvas 344 334 656 389 10; +#N canvas 106 139 656 389 10; #X obj 82 233 s \$1-ctl; #X text 19 72 1- select the backend; #X text 62 27 With VNC backend you can open a remote desktop using |