[Gridflow-cvs] [svn] commit: r5973 - in /trunk: configure examples/qbert.pd src/opengl.cxx

svn-gridflow at artengine.ca svn-gridflow at artengine.ca
Fri Aug 6 21:14:48 EDT 2010


Author: matju
Date: Fri Aug  6 21:14:45 2010
New Revision: 5973

Log:
first test of [gf/gl] (method: vertex)

Added:
    trunk/src/opengl.cxx
Modified:
    trunk/configure
    trunk/examples/qbert.pd

Modified: trunk/configure
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Fri Aug  6 21:14:45 2010
@@ -121,7 +121,7 @@
 	attr2 :status
 	attr2 :uses_pdlib
 	attr2 :uses_so
-	attr2 :uses_o
+	attr2 :produces_o
 	attr2 :uses_h
 	attr2 :uses_feature
 	attr2 :test
@@ -308,7 +308,7 @@
 Feature.add {
 	tag :mmx
 	uses_feature [:pentium]
-	uses_o ["src/mmx.o","src/mmx_loader.o"]
+	produces_o ["src/mmx.o","src/mmx_loader.o"]
 	name "MMX-compatible CPU (using NASM)"
 	options ["HAVE_MMX"]
 	test proc { #!@#$ isn't 64-bit-compatible
@@ -338,7 +338,7 @@
 	name "X11 Display Protocol"
 	uses_so $LIBX11
 	uses_h ["X11/Xlib.h"]
-	uses_o ["src/x11.o"]
+	produces_o ["src/x11.o"]
 	test proc {
 		c_test "
 		#include#
@@ -369,7 +369,7 @@
 	}
 	uses_h ["SDL/SDL.h"]
 	#uses_h ["$$(sdl-config --cflags)"]
-	uses_o ["src/sdl.o"]
+	produces_o ["src/sdl.o"]
 	test proc {
 		c_test "
 		#include#
@@ -391,7 +391,7 @@
 	uses_so ["-lobjc",["-framework","Cocoa"]]
 	uses_feature [:objcpp]
 	uses_h ["objc/Object.h","Cocoa/Cocoa.h"]
-	uses_o ["src/quartz.o"]
+	produces_o ["src/quartz.o"]
 	test proc {
 		c_test "
 		#include#
@@ -402,7 +402,7 @@
 	name "Ascii Art Library"
 	uses_so ["-laa"]
 	uses_h ["aalib.h"]
-	uses_o ["src/aalib.o"]
+	produces_o ["src/aalib.o"]
 	test proc {
 		c_test "
 		#define aa_hardwareparams aa_hardware_params
@@ -415,7 +415,7 @@
 	name "JPEG Library"
 	uses_so ["-ljpeg"]
 	uses_h ["jpeglib.h"]
-	uses_o ["src/jpeg.o"]
+	produces_o ["src/jpeg.o"]
 	test proc {
 		c_test "
 		extern \"C\" {
@@ -429,7 +429,7 @@
 	name "PNG Library"
 	uses_so ["-lpng","-lz"]
 	uses_h Or[["libpng/png.h"],["libpng14/png.h"],["libpng12/png.h"],["png.h"]]
-	uses_o ["src/png.o"]
+	produces_o ["src/png.o"]
 	test proc {|f|
 		f.c_test %`
 		extern "C" {
@@ -445,7 +445,7 @@
 	tag :videodev
 	name "Video4linux Driver Interface Version 1 (kernel)"
 	uses_h ["linux/videodev.h"]
-	uses_o ["src/videodev.o"]
+	produces_o ["src/videodev.o"]
 	test proc {
 		c_test "
 		#include <stdlib.h>
@@ -469,7 +469,7 @@
 	name "Video4linux II Driver Interface Library"
 	uses_h ["libv4l2.h"]
 	uses_so ["-lv4l2"]
-	uses_o ["src/v4l2.o"]
+	produces_o ["src/v4l2.o"]
 	test proc {
 		c_test "
 		#include <libv4l2.h>
@@ -479,7 +479,7 @@
 	name "DC1394 for Linux"
 	uses_so ["-ldc1394_control"]
 	uses_h Or["libdc1394/dc1394_control.h","dc1394/control.h"]
-	uses_o ["src/dc1394.o"]
+	produces_o ["src/dc1394.o"]
 	options ["HAVE_DC1394"]
 	test proc {|f|
 		f.c_test "
@@ -490,7 +490,7 @@
 	name "HeroineWarrior LibMPEG3"
 	uses_so $LIBX11DIR+["-lmpeg3","-lpthread","-lm"]
 	uses_h Or["libmpeg3/libmpeg3.h","libmpeg3.h"]
-	uses_o ["src/mpeg3.o"]
+	produces_o ["src/mpeg3.o"]
 	test proc {|f|
 		f.c_test "
 		#include#
@@ -500,7 +500,7 @@
 	name "Apple's QuickTime"
 	uses_so [["-framework","Quicktime"]]
 	uses_h ["QuickTime/QuickTime.h","QuickTime/Movies.h"]
-	uses_o ["src/quicktimeapple.o","src/quicktimecamera.o"]
+	produces_o ["src/quicktimeapple.o","src/quicktimecamera.o"]
 	test proc {
 		c_test "
 		#include#
@@ -517,7 +517,7 @@
 	uses_h Or[
 		f.map{|x| "lqt/"+x },
 		f.map{|x| "quicktime/"+x }]
-	uses_o ["src/quicktimehw.o"]
+	produces_o ["src/quicktimehw.o"]
 	test proc {|f|
 		f.c_test %`
 		#include <stdio.h>
@@ -561,7 +561,7 @@
 Feature.add {
 	tag :opencv
 	name "Intel OpenCV"
-	uses_o ["src/opencv.o"]
+	produces_o ["src/opencv.o"]
 	uses_so ["-lcv"]
 	options ["HAVE_OPENCV"]
 	defines {{:OPENCV_SHARE_PATH => File.dirname($C_INCLUDE_PATH.find {|x| File.exist?(x+"/opencv/cv.h")}) + "/share/opencv"}}
@@ -572,7 +572,7 @@
 Feature.add {
 	tag :fftw
 	name "FFTW (Fastest Fourier Transform in the West)"
-	uses_o ["src/fftw.o"]
+	produces_o ["src/fftw.o"]
 	uses_so ["-lfftw3f"  ,"-lfftw3"  ]
 	uses_so ["-lfftw3f-3","-lfftw3-3"] if WIN
 	options ["HAVE_FFTW"]
@@ -583,6 +583,7 @@
 Feature.add {
 	tag :opengl
 	name "OpenGL (for GEM support, etc)"
+	produces_o ["src/opengl.o"]
         uses_so $LIBX11DIR+["-lGL"] if not WIN
         uses_h ["GL/gl.h"]
 	options ["HAVE_OPENGL"]
@@ -740,7 +741,7 @@
 	feature.action.call if feature.action
 	$conf[:FEATURES][feature.tag] = feature
 	$conf[:LDSOFLAGS].concat(feature.uses_so||[]).uniq!
-	$conf[:OBJS].concat(feature.uses_o||[])
+	$conf[:OBJS].concat(feature.produces_o||[])
 	$conf[:OPTIONS].concat(feature.options||[])
 	$conf[:PDLIB].concat(feature.uses_pdlib||[])
 	for k,v in feature.defines||{} do $conf[:DEFINES][k]=(if Proc===v then v[] else v end) end

Modified: trunk/examples/qbert.pd
==============================================================================
--- trunk/examples/qbert.pd (original)
+++ trunk/examples/qbert.pd Fri Aug  6 21:14:45 2010
@@ -4,12 +4,12 @@
 #X obj 0 0 doc_demo;
 #X obj 5 179 translateXYZ -3.5 -3.5 -3.5;
 #X obj 209 96 gf/mouse_spy;
-#N canvas 583 52 666 594 cubes 1;
+#N canvas 520 66 666 594 cubes 1;
 #X obj 34 77 repeat 7;
 #X obj 286 153 #store;
 #X obj 78 96 f;
 #X obj 102 96 + 1;
-#X obj 15 436 GEMglEnd;
+#X obj 15 566 GEMglEnd;
 #X obj 15 54 t a a b;
 #X msg 93 71 0;
 #X obj 34 96 t a b;
@@ -28,10 +28,6 @@
 #X obj 241 396 + 1;
 #X obj 78 115 * 1;
 #X obj 22 294 GEMglColor3f;
-#X obj 192 377 GEMglVertex3f;
-#X obj 192 415 GEMglVertex3f;
-#X obj 192 453 GEMglVertex3f;
-#X obj 192 472 GEMglVertex3f;
 #X obj 406 437 + 1;
 #X obj 312 416 GEMglVertex3f;
 #X obj 312 435 GEMglVertex3f;
@@ -54,8 +50,23 @@
 #X obj 340 136 inlet;
 #X obj 288 416 t a;
 #X obj 571 270 t a;
-#X obj 207 434 + 1;
 #X obj 309 505 t a;
+#X obj 43 537 gf/gl;
+#X obj 195 378 GEMglVertex3f;
+#X obj 195 416 GEMglVertex3f;
+#X obj 195 454 GEMglVertex3f;
+#X obj 195 473 GEMglVertex3f;
+#X obj 210 435 + 1;
+#X obj 43 347 pack 0 0 0 0;
+#X msg 79 366 \$2 \$3 \$4;
+#X obj 43 366 t b a;
+#X msg 43 385 0 1;
+#X obj 43 405 #outer +;
+#X obj 27 325 b;
+#X obj 43 424 #to_l;
+#X msg 43 518 vertex \$1 \$2 \$3;
+#X msg 43 495 \$1 \$2 \$3 \, \$4 \$2 \$3 \, \$4 \$5 \$3 \, \$1 \$5
+\$3;
 #X connect 0 0 7 0;
 #X connect 1 0 18 0;
 #X connect 2 0 3 0;
@@ -73,18 +84,19 @@
 #X connect 7 1 13 0;
 #X connect 8 0 5 0;
 #X connect 9 0 10 0;
-#X connect 10 0 42 0;
+#X connect 10 0 38 0;
+#X connect 10 0 37 0;
 #X connect 10 0 22 0;
-#X connect 10 0 41 0;
 #X connect 10 1 11 0;
 #X connect 11 0 12 0;
 #X connect 11 0 16 0;
 #X connect 11 0 19 0;
-#X connect 11 0 23 1;
-#X connect 11 0 24 1;
-#X connect 11 0 32 0;
-#X connect 11 0 44 0;
-#X connect 11 0 49 0;
+#X connect 11 0 28 0;
+#X connect 11 0 40 0;
+#X connect 11 0 47 1;
+#X connect 11 0 48 1;
+#X connect 11 0 51 0;
+#X connect 11 0 52 1;
 #X connect 12 0 11 1;
 #X connect 13 0 11 1;
 #X connect 14 0 9 1;
@@ -94,69 +106,81 @@
 #X connect 16 0 1 0;
 #X connect 17 0 15 0;
 #X connect 18 0 17 0;
-#X connect 19 0 27 0;
-#X connect 19 0 31 3;
-#X connect 19 0 28 3;
-#X connect 19 0 47 0;
-#X connect 19 0 48 0;
-#X connect 20 0 24 2;
-#X connect 20 0 25 2;
+#X connect 19 0 23 0;
+#X connect 19 0 27 3;
+#X connect 19 0 24 3;
+#X connect 19 0 43 0;
+#X connect 19 0 44 0;
+#X connect 19 0 52 3;
+#X connect 20 0 48 2;
+#X connect 20 0 49 2;
 #X connect 21 0 20 0;
-#X connect 21 0 23 2;
-#X connect 21 0 26 2;
-#X connect 21 0 34 0;
-#X connect 21 0 40 0;
-#X connect 22 0 23 0;
-#X connect 23 0 24 0;
+#X connect 21 0 30 0;
+#X connect 21 0 36 0;
+#X connect 21 0 47 2;
+#X connect 21 0 50 2;
+#X connect 21 0 52 2;
+#X connect 22 0 57 0;
+#X connect 23 0 25 3;
+#X connect 23 0 26 3;
 #X connect 24 0 25 0;
 #X connect 25 0 26 0;
-#X connect 27 0 29 3;
-#X connect 27 0 30 3;
+#X connect 27 0 24 0;
+#X connect 28 0 27 1;
+#X connect 28 0 26 1;
 #X connect 28 0 29 0;
-#X connect 29 0 30 0;
-#X connect 31 0 28 0;
-#X connect 32 0 31 1;
-#X connect 32 0 30 1;
+#X connect 29 0 24 1;
+#X connect 29 0 25 1;
+#X connect 30 0 27 2;
+#X connect 30 0 24 2;
+#X connect 30 0 25 2;
+#X connect 30 0 26 2;
+#X connect 31 0 32 0;
 #X connect 32 0 33 0;
-#X connect 33 0 28 1;
-#X connect 33 0 29 1;
-#X connect 34 0 31 2;
-#X connect 34 0 28 2;
-#X connect 34 0 29 2;
-#X connect 34 0 30 2;
-#X connect 35 0 36 0;
-#X connect 36 0 37 0;
-#X connect 38 0 35 0;
-#X connect 39 0 35 2;
-#X connect 39 0 36 2;
-#X connect 40 0 38 2;
-#X connect 40 0 39 0;
-#X connect 40 0 37 2;
-#X connect 41 0 31 0;
-#X connect 42 0 38 0;
-#X connect 43 0 36 3;
-#X connect 43 0 37 3;
-#X connect 44 0 38 1;
-#X connect 44 0 35 1;
-#X connect 44 0 36 1;
-#X connect 44 0 37 1;
-#X connect 45 0 8 0;
-#X connect 46 0 1 1;
-#X connect 47 0 23 3;
-#X connect 47 0 24 3;
-#X connect 47 0 25 3;
-#X connect 47 0 26 3;
-#X connect 48 0 38 3;
-#X connect 48 0 35 3;
-#X connect 48 0 43 0;
-#X connect 49 0 25 1;
-#X connect 49 0 26 1;
-#X connect 50 0 20 1;
-#X connect 50 0 49 1;
-#X connect 50 0 33 1;
-#X connect 50 0 27 1;
-#X connect 50 0 39 1;
-#X connect 50 0 43 1;
+#X connect 34 0 31 0;
+#X connect 35 0 31 2;
+#X connect 35 0 32 2;
+#X connect 36 0 34 2;
+#X connect 36 0 35 0;
+#X connect 36 0 33 2;
+#X connect 37 0 27 0;
+#X connect 38 0 34 0;
+#X connect 39 0 32 3;
+#X connect 39 0 33 3;
+#X connect 40 0 34 1;
+#X connect 40 0 31 1;
+#X connect 40 0 32 1;
+#X connect 40 0 33 1;
+#X connect 41 0 8 0;
+#X connect 42 0 1 1;
+#X connect 43 0 47 3;
+#X connect 43 0 48 3;
+#X connect 43 0 49 3;
+#X connect 43 0 50 3;
+#X connect 44 0 34 3;
+#X connect 44 0 31 3;
+#X connect 44 0 39 0;
+#X connect 45 0 20 1;
+#X connect 45 0 29 1;
+#X connect 45 0 23 1;
+#X connect 45 0 35 1;
+#X connect 45 0 39 1;
+#X connect 45 0 51 1;
+#X connect 47 0 48 0;
+#X connect 48 0 49 0;
+#X connect 49 0 50 0;
+#X connect 51 0 49 1;
+#X connect 51 0 50 1;
+#X connect 52 0 54 0;
+#X connect 53 0 56 1;
+#X connect 54 0 55 0;
+#X connect 54 1 53 0;
+#X connect 55 0 56 0;
+#X connect 56 0 58 0;
+#X connect 57 0 52 0;
+#X connect 58 0 60 0;
+#X connect 59 0 46 0;
+#X connect 60 0 59 0;
 #X restore 123 244 pd cubes;
 #X obj 215 326 loadbang;
 #X msg 215 345 7 7 #;
@@ -398,14 +422,166 @@
 #X connect 10 0 9 0;
 #X restore 209 115 pd keyboard;
 #X obj 209 157 spigot 1;
-#N canvas 181 261 450 300 board 1;
-#X obj 89 65 #many nbx 7 7 14 32;
+#N canvas 181 261 550 321 board 0;
+#X obj 102 58 #many nbx 7 7 14 32;
 #X msg 102 39 delegate size 1;
-#X obj 97 167 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0
-1;
 #X connect 1 0 0 0;
 #X restore 460 330 pd board;
 #X obj 168 375 #many tgl 7 7;
+#N canvas 583 52 666 594 cubes 0;
+#X obj 34 77 repeat 7;
+#X obj 286 153 #store;
+#X obj 78 96 f;
+#X obj 102 96 + 1;
+#X obj 15 436 GEMglEnd;
+#X obj 15 54 t a a b;
+#X msg 93 71 0;
+#X obj 34 96 t a b;
+#X obj 15 35 GEMglBegin 7;
+#X obj 22 148 repeat 7;
+#X obj 22 189 t a b;
+#X obj 59 189 f;
+#X obj 83 189 + 1;
+#X msg 74 170 0;
+#X obj 47 128 + 1;
+#X obj 43 273 #unpack 3;
+#X obj 286 134 pack 0 0;
+#X obj 286 191 #store (2 3 # 255 0 0 0 255 0);
+#X obj 286 172 #outer ignore (0);
+#X obj 458 53 -;
+#X obj 241 396 + 1;
+#X obj 78 115 * 1;
+#X obj 22 294 GEMglColor3f;
+#X obj 192 377 GEMglVertex3f;
+#X obj 192 415 GEMglVertex3f;
+#X obj 192 453 GEMglVertex3f;
+#X obj 192 472 GEMglVertex3f;
+#X obj 406 437 + 1;
+#X obj 312 416 GEMglVertex3f;
+#X obj 312 435 GEMglVertex3f;
+#X obj 312 454 GEMglVertex3f;
+#X obj 312 378 GEMglVertex3f;
+#X obj 329 327 t a;
+#X obj 337 397 + 1;
+#X obj 379 323 t a;
+#X obj 454 399 GEMglVertex3f;
+#X obj 454 418 GEMglVertex3f;
+#X obj 454 437 GEMglVertex3f;
+#X obj 454 380 GEMglVertex3f;
+#X obj 548 390 + 1;
+#X obj 575 314 t a;
+#X obj 312 359 GEMglColor3f 0.7 0.7 0;
+#X obj 454 361 GEMglColor3f 0 0.7 0.7;
+#X obj 548 420 + 1;
+#X obj 477 330 + 1;
+#X obj 15 16 inlet;
+#X obj 340 136 inlet;
+#X obj 288 416 t a;
+#X obj 571 270 t a;
+#X obj 207 434 + 1;
+#X obj 309 505 t a;
+#X connect 0 0 7 0;
+#X connect 1 0 18 0;
+#X connect 2 0 3 0;
+#X connect 2 0 14 0;
+#X connect 2 0 16 1;
+#X connect 2 0 19 1;
+#X connect 2 0 21 0;
+#X connect 3 0 2 1;
+#X connect 5 0 4 0;
+#X connect 5 1 0 0;
+#X connect 5 2 6 0;
+#X connect 6 0 2 1;
+#X connect 7 0 9 0;
+#X connect 7 1 2 0;
+#X connect 7 1 13 0;
+#X connect 8 0 5 0;
+#X connect 9 0 10 0;
+#X connect 10 0 42 0;
+#X connect 10 0 22 0;
+#X connect 10 0 41 0;
+#X connect 10 1 11 0;
+#X connect 11 0 12 0;
+#X connect 11 0 16 0;
+#X connect 11 0 19 0;
+#X connect 11 0 23 1;
+#X connect 11 0 24 1;
+#X connect 11 0 32 0;
+#X connect 11 0 44 0;
+#X connect 11 0 49 0;
+#X connect 12 0 11 1;
+#X connect 13 0 11 1;
+#X connect 14 0 9 1;
+#X connect 15 0 22 1;
+#X connect 15 1 22 2;
+#X connect 15 2 22 3;
+#X connect 16 0 1 0;
+#X connect 17 0 15 0;
+#X connect 18 0 17 0;
+#X connect 19 0 27 0;
+#X connect 19 0 31 3;
+#X connect 19 0 28 3;
+#X connect 19 0 47 0;
+#X connect 19 0 48 0;
+#X connect 20 0 24 2;
+#X connect 20 0 25 2;
+#X connect 21 0 20 0;
+#X connect 21 0 23 2;
+#X connect 21 0 26 2;
+#X connect 21 0 34 0;
+#X connect 21 0 40 0;
+#X connect 22 0 23 0;
+#X connect 23 0 24 0;
+#X connect 24 0 25 0;
+#X connect 25 0 26 0;
+#X connect 27 0 29 3;
+#X connect 27 0 30 3;
+#X connect 28 0 29 0;
+#X connect 29 0 30 0;
+#X connect 31 0 28 0;
+#X connect 32 0 31 1;
+#X connect 32 0 30 1;
+#X connect 32 0 33 0;
+#X connect 33 0 28 1;
+#X connect 33 0 29 1;
+#X connect 34 0 31 2;
+#X connect 34 0 28 2;
+#X connect 34 0 29 2;
+#X connect 34 0 30 2;
+#X connect 35 0 36 0;
+#X connect 36 0 37 0;
+#X connect 38 0 35 0;
+#X connect 39 0 35 2;
+#X connect 39 0 36 2;
+#X connect 40 0 38 2;
+#X connect 40 0 39 0;
+#X connect 40 0 37 2;
+#X connect 41 0 31 0;
+#X connect 42 0 38 0;
+#X connect 43 0 36 3;
+#X connect 43 0 37 3;
+#X connect 44 0 38 1;
+#X connect 44 0 35 1;
+#X connect 44 0 36 1;
+#X connect 44 0 37 1;
+#X connect 45 0 8 0;
+#X connect 46 0 1 1;
+#X connect 47 0 23 3;
+#X connect 47 0 24 3;
+#X connect 47 0 25 3;
+#X connect 47 0 26 3;
+#X connect 48 0 38 3;
+#X connect 48 0 35 3;
+#X connect 48 0 43 0;
+#X connect 49 0 25 1;
+#X connect 49 0 26 1;
+#X connect 50 0 20 1;
+#X connect 50 0 49 1;
+#X connect 50 0 33 1;
+#X connect 50 0 27 1;
+#X connect 50 0 39 1;
+#X connect 50 0 43 1;
+#X restore 480 215 pd cubes using GEMgl;
 #X connect 0 0 43 0;
 #X connect 1 0 23 0;
 #X connect 3 0 41 0;



More information about the Gridflow-cvs mailing list