diff Propellor/PropTestD6.pd @ 288:07fa2ffc27ab

Various changes to Cavity, Aeolian Harp and Propeller models
author Rod Selfridge <r.selfridge@qmul.ac.uk>
date Mon, 24 Apr 2017 20:32:21 +0100
parents 3b8a33b7ccc4
children cf583cdc6d0c
line wrap: on
line diff
--- a/Propellor/PropTestD6.pd	Fri Apr 07 22:39:12 2017 +0100
+++ b/Propellor/PropTestD6.pd	Mon Apr 24 20:32:21 2017 +0100
@@ -4,7 +4,7 @@
 1;
 #X obj 405 79 s myMet;
 #X obj -251 527 hsl 70 15 0 5000 0 0 empty empty RPM 2 8 0 10 -262144
--1 -1 1408 1;
+-1 -1 3036 1;
 #X floatatom 147 583 5 0 0 0 - - -;
 #X obj 224 414 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
 #X obj 287 414 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
@@ -42,11 +42,11 @@
 -261682 -1 -66577 1634 1;
 #X obj 66 299 r GAIN;
 #X obj -278 417 hsl 70 15 0.1 3 0 0 empty empty Blade_Length 2 8 0
-10 -262144 -1 -1 4663 1;
+10 -262144 -1 -1 2059 1;
 #X floatatom -220 440 0 0 0 0 - - -;
 #X obj -281 376 loadbang;
 #X obj 78 497 hsl 100 20 0 2500 0 0 empty empty Throttle 2 10 0 10
--204800 -1 -1 4039 1;
+-204800 -1 -1 8712 1;
 #X text 117 583 RPM;
 #X floatatom 74 459 0 0 0 0 - - -;
 #X obj -268 685 hsl 70 15 2 4 0 0 empty empty Blades 2 8 0 10 -262144
@@ -58,7 +58,7 @@
 10 -203904 -1 -1 5601 1;
 #X floatatom 695 443 0 0 0 0 - - -;
 #X obj 456 425 hsl 70 15 0 5000 0 0 empty empty Horse_Power 2 8 0 10
--262144 -1 -1 5520 1;
+-262144 -1 -1 414 1;
 #N canvas 345 218 373 219 dist 0;
 #X obj -154 38 *~;
 #X obj -98 40 *~;
@@ -113,8 +113,8 @@
 #X obj 355 459 hsl 70 15 1e-06 0.01 1 0 empty empty Vortex 2 8 0 10
 -204786 -1 -1 4656 1;
 #X floatatom 696 468 0 0 0 0 - - -;
-#X obj 356 488 hsl 70 15 0.01 2e+06 1 0 empty empty Engine 2 8 0 10
--261234 -1 -1 6319 1;
+#X obj 356 488 hsl 70 15 0.01 2e+07 1 0 empty empty Engine 2 8 0 10
+-261234 -1 -1 5640 1;
 #X floatatom 474 445 6 0 0 0 - - -;
 #X text 90 613 Distance;
 #X floatatom 694 496 0 0 0 0 - - -;
@@ -237,11 +237,11 @@
 #X connect 42 0 1 0;
 #X restore 349 362 pd startUp;
 #X obj 444 249 hsl 100 20 -5000 5000 0 0 empty empty PropX 6 10 0 10
--228856 -1 -1 5445 1;
+-228856 -1 -1 5823 1;
 #X obj 553 247 hsl 100 20 -5000 5000 0 0 empty empty PropY 6 10 0 10
--228856 -1 -1 6435 1;
+-228856 -1 -1 4599 1;
 #X obj 395 144 vsl 20 100 0 1500 0 0 empty empty PropZ 0 -9 0 10 -228856
--1 -1 5280 1;
+-1 -1 533 1;
 #X floatatom 486 282 0 0 0 0 - - -;
 #X floatatom 597 273 0 0 0 0 - - -;
 #X floatatom 399 254 0 0 0 0 - - -;
@@ -832,7 +832,7 @@
 #X connect 50 0 51 0;
 #X restore 284 102 pd Angles2;
 #X obj 593 137 hsl 80 20 0 360 0 0 empty empty Yaw(Azimuth) 2 10 0
-10 -232576 -1 -1 1975 1;
+10 -232576 -1 -1 7002 1;
 #X obj 809 137 hsl 80 20 -180 180 0 0 empty empty Roll 2 10 0 10 -232576
 -1 -1 3950 1;
 #X floatatom 863 165 0 0 0 0 - - -;
@@ -1076,12 +1076,12 @@
 #X text 255 664 Preset Flight Paths;
 #X text 267 596 Aircraft Selector;
 #X obj 812 37 hsl 80 20 -90 90 0 0 empty empty Pitch(Elevation) 2 10
-0 10 -232576 -1 -1 3950 1;
+0 10 -232576 -1 -1 4296 1;
 #X floatatom 829 83 0 0 0 0 - - -;
 #X obj 381 531 hsl 70 15 3.6 360 1 0 empty empty Yaw 2 8 0 10 -203904
--1 -1 4823 1;
+-1 -1 6719 1;
 #X obj 381 561 hsl 70 15 -90 90 0 0 empty empty Pitch 2 8 0 10 -204786
--1 -1 3450 1;
+-1 -1 3752 1;
 #X floatatom 457 530 0 0 0 0 - - -;
 #X floatatom 458 559 0 0 0 0 - - -;
 #X obj -25 636 r length;
@@ -1272,9 +1272,9 @@
 #X obj 256 504 pack;
 #X obj 304 503 pack;
 #X obj 922 118 hsl 128 15 -5000 5000 0 0 empty empty x -2 -8 0 10 -262144
--1 -1 6985 1;
+-1 -1 7470 1;
 #X obj 913 160 hsl 128 15 -5000 5000 0 0 empty empty y -2 -8 0 10 -262144
--1 -1 8255 1;
+-1 -1 5900 1;
 #X obj 23 592 <;
 #X floatatom 22 616 0 0 0 0 - - -;
 #X obj 56 592 <;