Commit 0e15a73d authored by IOhannes m zmölnig's avatar IOhannes m zmölnig
Browse files

Merge branch 'master' into filmDS

parents c969106c 6ea7a457
......@@ -25,9 +25,7 @@ case "$TRAVIS_OS_NAME" in
#CONFIGUREFLAGS="--without-ftgl"
;;
osx)
CONFIGUREFLAGS="--without-ftgl \
--without-QuickTime-framework \
--without-Carbon-framework"
CONFIGUREFLAGS="--without-ftgl"
if [ "x${ARCH}" != "x" ]; then
CONFIGUREFLAGS+=" --enable-fat-binary=${ARCH}"
fi
......
......@@ -164,6 +164,7 @@ GEM_CHECK_WERROR
GEM_CPPFLAGS=""
GEM_CHECK_EXTERNAL
AC_ARG_WITH([GLU], AC_HELP_STRING([--without-GLU], [force building without GLU (*not* recommended!)]))
GEM_ARG_ENABLE([mmx], [MMX-support])
dnl disabled SSE2 by default, since there are still few chips around that fully support it
dnl unlike MMX or SSE
......@@ -185,7 +186,7 @@ GEM_TARGET(Pixes)
GEM_TARGET(openGL)
GEM_TARGET_DISABLED(Vertex)
AC_ARG_ENABLE([experimental], AC_HELP_STRING([--enable-experimental], [enable experimental objects]))
AC_ARG_ENABLE([experimental], AC_HELP_STRING([--enable-experimental], [enable experimental objects (if any)]))
AM_CONDITIONAL(EXPERIMENTAL, [test "x$enable_experimental" = "xyes"])
# checks for default headers
......@@ -198,7 +199,7 @@ GEM_CHECK_THREADS
AC_HEADER_STDC
AC_CHECK_HEADERS([stddef.h stdlib.h unistd.h])
AC_CHECK_HEADERS([fcntl.h float.h memory.h string.h strings.h])
AC_CHECK_HEADERS([sys/select.h sys/ioctl.h sys/time.h])
AC_CHECK_HEADERS([sys/select.h sys/ioctl.h sys/time.h sys/ipc.h sys/shm.h])
AC_CHECK_HEADERS([wordexp.h])
......@@ -250,11 +251,18 @@ AS_IF([test "x$with_x" != "xno"], [
])
IEM_CHECK_GL
IEM_CHECK_GLU
no_glu=yes
AS_IF([test "x$with_GLU" != "xno"], IEM_CHECK_GLU)
AM_CONDITIONAL(HAVE_GLU, [test "x${no_glu}" != "xyes"])
IEM_CHECK_GLUT
IEM_CHECK_GLX
IEM_CHECK_AGL
AS_IF([test "x$no_glu" != "xyes"],
AC_DEFINE([GEM_HAVE_GLU], [1], [whether we can use libGLU (normally: yes)])
)
## use system's libGLEW
GEM_ARG_ENABLE([multicontext], [experimental support for multiple windows])
## glewmx-args default to glew-args
......@@ -471,43 +479,6 @@ AC_LINK_IFELSE([AC_LANG_CALL([], [lqt_open_write])],
AC_MSG_RESULT(no))
LIBS="$gem_tmp_lqt_libs"
# using pix_videoOS rather than pix_video
AC_ARG_WITH([video], AS_HELP_STRING([--with-video=plugins|Darwin|DS|NT],[use plugins for video capture or OS-specific "pix_video"]))
AS_IF(
[test "x$with_video" = "x"], [with_video="plugins"],
[test "x$with_video" = "xyes"], [with_video="plugins"],
[test "x$with_video" = "xno"],
[
# hmm, what to do here?
AC_MSG_RESULT([ignoring request for no video...using plugins])
with_video="plugins"
],
[test "x$with_video" = "xplugins"], [:],
[
AC_DEFINE_UNQUOTED([GEM_VIDEOBACKEND], [GEM_VIDEOBACKEND_$with_video], [backend for deprecated video-capture objects])
AC_MSG_RESULT([using deprecated video-loader $with_video])
])
# using pix_filmOS rather than pix_film
AC_ARG_WITH([film], AS_HELP_STRING([--with-film=plugins|Darwin],[use plugins for video decoding or OS-specific "pix_film"]))
AS_IF(
[test "x$with_film" = "x"], [with_film="plugins"],
[test "x$with_film" = "xyes"], [with_film="plugins"],
[test "x$with_film" = "xno"],
[
# hmm, what to do here?
AC_MSG_RESULT([ignoring request for no film...using plugins])
with_film="plugins"
],
[test "x$with_film" = "xplugins"], [:],
[
AC_DEFINE_UNQUOTED([GEM_FILMBACKEND],
[GEM_FILMBACKEND_$with_film], [backend for deprecated film-decoding objects])
AC_MSG_RESULT([using deprecated film-loader $with_film])
])
# enabling "-freg-struct-return" (for FreeFrame)
# i wonder could we make this the default ???
AS_IF([test "x$enable_registerstruct" != "xno" ], [
......@@ -732,7 +703,7 @@ AS_IF([test "x$no_gl" = "xyes"], [
])
AS_IF([test "x$no_glu" = "xyes" && test "x$no_agl" = "xyes"], [
AC_MSG_ERROR([GLU (headers) not found! you need openGL Utility Library!!!])
AS_IF([test "x$with_GLU" != "xno"],[AC_MSG_ERROR([GLU (headers) not found! you need openGL Utility Library!!!])])
])
AC_MSG_RESULT([Now run make ...])
#N canvas 139 83 602 502 10;
#X declare -lib Gem;
#X obj 240 186 gemhead;
#X floatatom 348 258 0 0 0 0 - - -;
#X obj 240 246 color;
......@@ -49,6 +50,7 @@
#X text 386 157 red;
#X text 389 192 white;
#X text 379 260 (in degree);
#X obj 495 5 declare -lib Gem;
#X connect 0 0 2 0;
#X connect 1 0 13 1;
#X connect 2 0 13 0;
......
#N canvas 396 160 600 500 10;
#X declare -lib Gem;
#X obj 350 159 gemhead;
#X obj 350 337 rotate;
#X floatatom 409 275 0 0 0 0 - - -;
......@@ -51,6 +52,7 @@
#X text 495 146 white;
#X obj 350 219 color 0 0 1;
#X text 422 221 (blue);
#X obj 493 6 declare -lib Gem;
#X connect 0 0 21 0;
#X connect 1 0 8 0;
#X connect 2 0 1 1;
......
#N canvas 28 208 601 392 10;
#X declare -lib Gem;
#X obj 274 138 gemhead;
#X floatatom 350 169 0 0 0 0 - - -;
#X obj 22 325 world_light;
......@@ -46,6 +47,7 @@
#X restore 35 103 pd gemwin;
#X msg 35 79 create;
#X text 31 59 Create window and render;
#X obj 495 5 declare -lib Gem;
#X connect 0 0 6 0;
#X connect 1 0 6 1;
#X connect 1 0 6 2;
......
#N canvas 173 -28 667 537 12;
#N canvas 173 61 667 537 12;
#X declare -lib Gem;
#X obj 306 137 gemhead;
#X obj 306 248 rotate;
#X floatatom 372 194 0 0 0 0 - - -;
......@@ -50,6 +51,7 @@
#X restore 35 153 pd gemwin;
#X msg 35 129 create;
#X text 31 109 Create window and render;
#X obj 543 6 declare -lib Gem;
#X connect 0 0 1 0;
#X connect 1 0 5 0;
#X connect 2 0 1 1;
......
#N canvas 361 165 602 280 10;
#X declare -lib Gem;
#X obj 372 91 gemhead;
#X floatatom 416 122 0 -4.5 4.5 0 - - -;
#X obj 372 197 cube;
......@@ -36,6 +37,7 @@
#X restore 35 153 pd gemwin;
#X msg 35 129 create;
#X text 31 109 Create window and render;
#X obj 495 5 declare -lib Gem;
#X connect 0 0 3 0;
#X connect 1 0 3 1;
#X connect 1 0 3 2;
......
#N canvas 393 222 603 394 10;
#X declare -lib Gem;
#X obj 275 174 gemhead;
#X floatatom 319 205 0 0 0 0 - - -;
#X obj 275 317 sphere;
......@@ -44,6 +45,7 @@
#X restore 36 97 pd gemwin;
#X msg 36 73 create;
#X text 32 53 Create window and render;
#X obj 495 5 declare -lib Gem;
#X connect 0 0 6 0;
#X connect 1 0 6 1;
#X connect 1 0 6 2;
......
#N canvas 393 222 603 394 10;
#X declare -lib Gem;
#X obj 274 138 gemhead;
#X floatatom 318 169 0 0 0 0 - - -;
#X obj 22 325 world_light;
......@@ -48,6 +49,7 @@
#X obj 94 325 world_light;
#X obj 94 283 gemhead 1;
#X obj 94 302 rotateXYZ 12 54 20;
#X obj 495 5 declare -lib Gem;
#X connect 0 0 8 0;
#X connect 1 0 8 1;
#X connect 1 0 8 2;
......
#N canvas 348 152 673 462 12;
#X declare -lib Gem;
#X floatatom 460 79 0 0 0 0 - - -;
#X obj 385 44 gemhead;
#X floatatom 446 179 0 0 0 0 - - -;
......@@ -50,6 +51,7 @@
#X obj 385 205 rotate 0 0 1 0;
#X obj 385 134 translate 0 0 0 1;
#X obj 460 103 / 100;
#X obj 543 6 declare -lib Gem;
#X connect 0 0 14 0;
#X connect 1 0 13 0;
#X connect 2 0 12 1;
......
#N canvas 56 98 635 502 12;
#X declare -lib Gem;
#X obj 350 226 gemhead;
#X floatatom 458 298 0 0 0 0 - - -;
#X obj 350 286 color;
......@@ -51,6 +52,7 @@
#X text 32 73 Create window and render;
#X text 32 261 this is the famous;
#X text 52 294 utah teapot;
#X obj 515 5 declare -lib Gem;
#X connect 0 0 2 0;
#X connect 1 0 6 1;
#X connect 1 0 6 2;
......
#N canvas 0 0 725 412 10;
#N canvas 6 61 725 412 10;
#X declare -lib Gem;
#N canvas 95 194 290 179 Gem.init 0;
#X obj 83 30 loadbang;
#X msg 83 67 reset;
......@@ -58,4 +59,5 @@ understands.;
anymore...;
#X text 249 113 for the sake of simplicity \, from now on the examples
will use the subpatch on the left side to control the Gem-window.;
#X obj 618 8 declare -lib Gem;
#X connect 0 0 1 0;
#N canvas 215 32 781 537 10;
#N canvas 215 61 781 537 10;
#X declare -lib Gem;
#X obj 607 137 separator;
#X msg 697 200 1;
#X msg 734 199 0;
......@@ -100,6 +101,7 @@
#X connect 16 0 0 0;
#X coords 0 -1 1 1 85 40 1 100 100;
#X restore 100 134 pd gemwin;
#X obj 668 8 declare -lib Gem;
#X connect 0 0 37 0;
#X connect 1 0 30 0;
#X connect 2 0 30 0;
......
#N canvas 396 100 600 500 10;
#X declare -lib Gem;
#X obj 358 140 gemhead;
#X floatatom 377 222 0 0 0 0 - - -;
#X obj 358 256 rotateXYZ;
......@@ -71,6 +72,7 @@
#X restore 18 95 pd gemwin;
#X text 142 32 one model is in "perspective" mode;
#X text 159 54 the other is in "orthographic" mode;
#X obj 488 8 declare -lib Gem;
#X connect 0 0 12 0;
#X connect 1 0 2 1;
#X connect 2 0 14 0;
......
#N canvas 55 43 729 499 10;
#N canvas 55 61 729 499 10;
#X declare -lib Gem;
#X obj 309 426 gemhead;
#X obj 179 426 gemhead 1;
#X obj 179 464 world_light;
......@@ -72,6 +73,7 @@
#X connect 16 0 0 0;
#X coords 0 -1 1 1 85 40 1 100 100;
#X restore 29 200 pd gemwin;
#X obj 618 8 declare -lib Gem;
#X connect 0 0 3 0;
#X connect 1 0 2 0;
#X connect 4 0 22 0;
......
#N canvas 50 151 946 464 10;
#X declare -lib Gem;
#N canvas 50 173 290 229 Gem.init 0;
#X obj 71 191 outlet;
#X obj 71 81 loadbang;
......@@ -292,6 +293,7 @@ and cetera...;
#X obj 604 88 tgl 15 1 empty empty empty 17 7 0 10 -262144 -1 -1 2
2;
#X text 632 87 <- should the view affect light position or not;
#X obj 828 8 declare -lib Gem;
#X connect 0 0 32 0;
#X connect 2 0 11 0;
#X connect 3 0 2 0;
......
#N canvas 275 99 721 506 10;
#X declare -lib Gem;
#X floatatom 414 85 0 0 0 0 - - -;
#X obj 385 44 gemhead;
#X floatatom 403 165 0 0 0 0 - - -;
......@@ -82,6 +83,7 @@
#X connect 16 0 0 0;
#X coords 0 -1 1 1 85 40 1 100 100;
#X restore 40 258 pd gemwin;
#X obj 608 8 declare -lib Gem;
#X connect 0 0 6 3;
#X connect 1 0 6 0;
#X connect 2 0 7 1;
......
#N canvas 31 50 600 504 10;
#N canvas 31 61 600 504 10;
#X declare -lib Gem;
#X obj 426 54 gemhead;
#X floatatom 464 134 0 0 0 0 - - -;
#X obj 464 307 gemhead 1;
......@@ -81,6 +82,7 @@ stereo";
#X connect 16 0 0 0;
#X coords 0 -1 1 1 85 40 1 100 100;
#X restore 58 207 pd gemwin;
#X obj 488 8 declare -lib Gem;
#X connect 0 0 6 0;
#X connect 1 0 7 2;
#X connect 2 0 3 0;
......
#N canvas 396 160 600 500 10;
#X declare -lib Gem;
#X obj 198 50 gemhead;
#X obj 198 82 part_head;
#X obj 198 136 part_color;
......@@ -72,6 +73,7 @@
#X connect 16 0 0 0;
#X coords 0 -1 1 1 85 40 1 100 100;
#X restore 31 187 pd gemwin;
#X obj 488 8 declare -lib Gem;
#X connect 0 0 1 0;
#X connect 1 0 2 0;
#X connect 2 0 20 0;
......
#N canvas 396 100 600 375 10;
#X declare -lib Gem;
#X obj 210 252 gemhead;
#X obj 210 312 model ../data/venus.obj;
#X text 117 4 snap a portion of the graphics window into a texture
......@@ -74,6 +75,7 @@ drawing!;
#X connect 16 0 0 0;
#X coords 0 -1 1 1 85 40 1 100 100;
#X restore 30 137 pd gemwin;
#X obj 488 8 declare -lib Gem;
#X connect 0 0 3 0;
#X connect 3 0 1 0;
#X connect 4 0 10 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment