created object to set global FPS and get it in FPS or ms, and made fsclock use it

svn path=/trunk/externals/framesync/; revision=12771

5 files changed, 107 insertions, 32 deletions

diff --git a/fps-help.pd b/fps-help.pd
new file mode 100644
index 0000000..1bc9e9a
--- /dev/null
+++ b/fps-help.pd
@@ -0,0 +1,13 @@
+#N canvas 134 291 450 300 10;
+#X text 38 24 Set the global Frames-Per-Second (FPS) for the global
+clock when using the 'framesync' library. You should only use this
+object once in a project. [frameclock] uses this object to set the
+FPS \, so if you are using [frameclock] \, don't use [fps] also.;
+#X msg 135 206 bang;
+#X floatatom 135 254 5 0 0 0 - - -;
+#X obj 135 230 fps;
+#X obj 135 128 fps 24;
+#X text 39 157 You can use it with no argument to get the current FPS
+(careful not to set the FPS more than once!):;
+#X connect 1 0 3 0;
+#X connect 3 0 2 0;
diff --git a/fps.pd b/fps.pd
new file mode 100644
index 0000000..a30a525
--- /dev/null
+++ b/fps.pd
@@ -0,0 +1,24 @@
+#N canvas 612 683 535 318 10;
+#X obj 110 124 value framesync/fps;
+#X obj 110 18 inlet;
+#X obj 125 259 outlet;
+#X obj 110 153 select 0;
+#X text 10 180 default to 30fps;
+#X obj 110 71 route bang;
+#X obj 167 93 print [framesync/fps]:_no_method_for;
+#X msg 110 180 30;
+#X obj 255 38 initbang;
+#X obj 255 149 print [framesync/fps];
+#X msg 255 126 setting FPS to \$1;
+#X obj 255 59 purepd/float_argument \$1 30;
+#X connect 0 0 3 0;
+#X connect 1 0 5 0;
+#X connect 3 0 7 0;
+#X connect 3 1 2 0;
+#X connect 5 0 0 0;
+#X connect 5 1 6 0;
+#X connect 7 0 2 0;
+#X connect 8 0 11 0;
+#X connect 10 0 9 0;
+#X connect 11 0 0 0;
+#X connect 11 0 10 0;
diff --git a/fps_ms-help.pd b/fps_ms-help.pd
new file mode 100644
index 0000000..7e54c78
--- /dev/null
+++ b/fps_ms-help.pd
@@ -0,0 +1,22 @@
+#N canvas 591 561 450 300 10;
+#X msg 100 98 bang;
+#X obj 100 132 fps_ms;
+#X text 30 34 get the Frames-Per-Second (FPS) in milliseconds (ms)
+to use with [metro] \, [delay] \, etc.;
+#X obj 73 170 metro;
+#X obj 359 77 fps 30;
+#X floatatom 117 158 8 0 0 0 - - -;
+#X obj 56 140 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 73 203 float;
+#X obj 111 203 + 1;
+#X floatatom 73 230 5 0 0 0 - - -;
+#X text 211 77 set the global FPS here:;
+#X connect 0 0 1 0;
+#X connect 1 0 3 1;
+#X connect 1 0 5 0;
+#X connect 3 0 7 0;
+#X connect 6 0 3 0;
+#X connect 7 0 8 0;
+#X connect 7 0 9 0;
+#X connect 8 0 7 1;
diff --git a/fps_ms.pd b/fps_ms.pd
new file mode 100644
index 0000000..fa032e6
--- /dev/null
+++ b/fps_ms.pd
@@ -0,0 +1,16 @@
+#N canvas 723 626 364 267 10;
+#X obj 50 38 inlet;
+#X obj 50 229 outlet;
+#X obj 50 61 route bang;
+#X obj 50 160 /;
+#X msg 50 139 1 \$1;
+#X obj 107 83 print [framesync/fps_ms]:_no_method_for;
+#X obj 50 114 framesync/fps;
+#X obj 50 192 * 1000;
+#X connect 0 0 2 0;
+#X connect 2 0 6 0;
+#X connect 2 1 5 0;
+#X connect 3 0 7 0;
+#X connect 4 0 3 0;
+#X connect 6 0 4 0;
+#X connect 7 0 1 0;
diff --git a/fsclock.pd b/fsclock.pd
index 7b63e07..8f1c422 100644
--- a/fsclock.pd
+++ b/fsclock.pd
@@ -8,7 +8,7 @@
 -4160 -258113;
 #X obj 344 426 outlet;
 #X obj 190 147 nbx 5 35 -1 1e+37 0 0 \$0-numbox \$0-numbox-receive
-empty 0 -8 0 16 -233017 -33289 -33289 200 256;
+empty 0 -8 0 16 -233017 -33289 -33289 0 256;
 #X obj 363 1 inlet;
 #N canvas 524 22 450 300 color 0;
 #X obj 161 16 inlet;
@@ -26,7 +26,6 @@ empty 0 -8 0 16 -233017 -33289 -33289 200 256;
 #X connect 5 0 2 0;
 #X connect 6 0 5 0;
 #X restore 526 369 pd color;
-#X obj 551 64 purepd/float_argument \$2 30;
 #X obj 363 64 purepd/float_argument \$1 1000;
 #X obj 344 366 moses;
 #X obj 551 113 /;
@@ -40,7 +39,7 @@ empty 0 -8 0 16 -233017 -33289 -33289 200 256;
 #X obj 551 134 * 1000;
 #X floatatom 559 164 5 0 0 0 - - -;
 #X obj 123 139 hsl 154 8 0 200 0 0 \$0-hsl \$0-hsl-receive empty -2
--8 0 10 -262130 -1 -1 15300 1;
+-8 0 10 -262130 -1 -1 0 1;
 #X msg 371 88 range 0 \$1;
 #X obj 435 337 bang;
 #X msg 490 20 bang;
@@ -51,36 +50,37 @@ empty 0 -8 0 16 -233017 -33289 -33289 200 256;
 #X obj 526 346 receive \$0-tgl;
 #X obj 526 392 send \$0-tgl-receive;
 #X msg 93 310 set \$1;
-#X connect 0 0 19 0;
-#X connect 1 1 11 0;
+#X obj 551 64 framesync/fps \$2;
+#X connect 0 0 18 0;
+#X connect 1 1 10 0;
 #X connect 2 0 1 0;
-#X connect 2 0 32 0;
-#X connect 3 0 29 0;
+#X connect 2 0 31 0;
+#X connect 3 0 28 0;
 #X connect 4 0 3 0;
 #X connect 6 0 2 1;
-#X connect 7 0 10 0;
-#X connect 8 0 31 0;
-#X connect 9 0 13 0;
-#X connect 10 0 11 1;
-#X connect 10 0 23 0;
-#X connect 11 0 5 0;
-#X connect 11 0 26 0;
-#X connect 11 1 24 0;
-#X connect 12 0 20 0;
-#X connect 13 0 12 0;
-#X connect 15 0 9 0;
-#X connect 17 0 18 0;
-#X connect 18 0 10 0;
-#X connect 18 1 9 0;
-#X connect 19 0 2 0;
-#X connect 20 0 19 1;
-#X connect 20 0 21 0;
-#X connect 23 0 22 0;
-#X connect 24 0 0 0;
-#X connect 25 0 18 0;
-#X connect 26 0 29 0;
-#X connect 27 0 29 0;
-#X connect 29 0 6 0;
-#X connect 30 0 8 0;
-#X connect 32 0 28 0;
+#X connect 7 0 9 0;
+#X connect 8 0 30 0;
+#X connect 9 0 10 1;
+#X connect 9 0 22 0;
+#X connect 10 0 5 0;
+#X connect 10 0 25 0;
+#X connect 10 1 23 0;
+#X connect 11 0 19 0;
+#X connect 12 0 11 0;
+#X connect 14 0 32 0;
+#X connect 16 0 17 0;
+#X connect 17 0 9 0;
+#X connect 17 1 32 0;
+#X connect 18 0 2 0;
+#X connect 19 0 18 1;
+#X connect 19 0 20 0;
+#X connect 22 0 21 0;
+#X connect 23 0 0 0;
+#X connect 24 0 17 0;
+#X connect 25 0 28 0;
+#X connect 26 0 28 0;
+#X connect 28 0 6 0;
+#X connect 29 0 8 0;
+#X connect 31 0 27 0;
+#X connect 32 0 12 0;
 #X coords 0 -1 1 1 159 62 1 120 120;