Improvments for Qt 4.8.7

buzzinglight · Aug 26, 2016 · 81ff14f · 81ff14f
1 parent e732906
commit 81ff14f
Show file tree

Hide file tree

Showing 34 changed files with 515 additions and 737 deletions.
diff --git a/Examples/Fractals.iannix b/Examples/Fractals.iannix
@@ -78,10 +78,12 @@ function addCurve(recursion, start, end) {
 		run("setWidth        current 2");
 
 		//Add a trigger
-		run("add trigger     " + (2000 + index));
-		run("setSize         current 2");
-		run("setGroup        current triggers");
-		run("setPos          current " + ((end.x-start.x)/2 + start.x) + " " + ((end.y-start.y)/2 + start.y) + " 0");
+		if(index % 5 == 4) {
+			run("add trigger     " + (2000 + index));
+			run("setSize         current 2");
+			run("setGroup        current triggers");
+			run("setPos          current " + ((end.x-start.x)/2 + start.x) + " " + ((end.y-start.y)/2 + start.y) + " 0");
+		}
 
 		//Recursivity on segments
 		addCurve(recursion + 1, {x:      start.x, y:      start.y} , {x: x1 + start.x, y: y1 + start.y});

diff --git a/Examples/Performance - Pulsar MF 2014.iannix b/Examples/Performance - Pulsar MF 2014.iannix
@@ -50,7 +50,7 @@ function makeWithScript() {
 		run("add cursor " + (curvesIndex+1));
 		run("setGroup         current historic");
 		run("setCurve         current lastCurve");
-		run("setDepth         current 0");
+		run("setDepth         current 0.001");
 		run("setWidth         current 0.1");
 		run("setActive        current 1");
 		run("setSpeed         current auto 60");
@@ -59,6 +59,7 @@ function makeWithScript() {
 		//run("setColorActive   current 255 255 255 255");
 		//run("setColorInactive current  70  70  70 255");
 		run("setMessage       current 20, osc://ip_out:port_out/cursor cursor_id cursor_group_id cursor_value_x cursor_value_y cursor_value_z cursor_xPos cursor_yPos cursor_zPos, osc://ip_out:57121/cursor cursor_id cursor_value_y");
+		//run("setBoundsSource  current -11 -4.75 -4.25 4");
 	}
 
 
@@ -187,6 +188,7 @@ function drawMagneticDirection() {
 		run("setDepth   current 0.5");
 		run("setPattern current 0 0 1");
 		run("setColor   current 255 0 0 255");
+		run("setMessage current 20,");
 	}
 }
 //Rotation function

diff --git a/Examples/Random 3D lines.iannix b/Examples/Random 3D lines.iannix
@@ -38,7 +38,7 @@ function makeWithScript() {
 		addLine();
 
 	//Add triggers
-	for(var i = 0 ; i < 100 ; i++) {
+	for(var i = 0 ; i < 20 ; i++) {
 		run("add trigger " + (2000+i));
 		run("setPos current " + random(-2, 2) + " " + random(-2, 2) + " " + random(-2, 2));
 	}

diff --git a/Examples/Rosette.iannix b/Examples/Rosette.iannix
@@ -60,11 +60,13 @@ function addCircle(circleIndex, center) {
 	run("setSize          current 1.5");
 	run("setPattern       current 0 0 1");
 
-	run("add trigger      " + (2000 + circleIndex));
-	run("setGroup         current triggers");
-	run("setPos           current " + center.x + " " + center.y + " 0");
-	run("setSize          current 0.5");
-	run("setColor         current 170 180 190 255");
+	if(circleIndex % 7 == 6) {
+		run("add trigger      " + (2000 + circleIndex));
+		run("setGroup         current triggers");
+		run("setPos           current " + center.x + " " + center.y + " 0");
+		run("setSize          current 0.5");
+		run("setColor         current 170 180 190 255");
+	}
 }
 
 

diff --git a/Examples/Shape with Xenakis Score.iannix b/Examples/Shape with Xenakis Score.iannix
@@ -54,10 +54,12 @@ function addLine(lineIndex, start, end) {
 	run("setSpeed        current " + (1 + lineIndex / lineMax));
 	run("setBoundsSource current -7 12 -7 7");
 
-	run("add trigger     " + (2000 + lineIndex));
-	run("setPos          current " + end.x + " " + end.y + " 0");
-	run("setGroup        current triggers");
-	run("setSize         current 0.8");
+	if(lineIndex % 7 == 6) {
+		run("add trigger     " + (2000 + lineIndex));
+		run("setPos          current " + end.x + " " + end.y + " 0");
+		run("setGroup        current triggers");
+		run("setSize         current 0.8");
+	}
 }
 
 

diff --git a/Examples/Torus.iannix b/Examples/Torus.iannix
@@ -63,11 +63,14 @@ function addCircle(circleIndex, center) {
 	run("setColorHue      current " + range(percent, 0, 200) + " 100 192 255");
 	run("setWidth         current 2");
 	run("setPattern       current 0 0 1");
-	run("add              trigger " + (2000 + circleIndex));
-	run("setGroup         current triggers");
-	run("setPos           current " + (center.x*1.7) + " " + (center.y*1.7) + " 0");
-	run("setSize          current 0.5");
-	run("setColorHue      current " + rangeMid(percent, 0, 40, 0) + " 255 255 255");
+
+	if(circleIndex % 7 == 6) {
+		run("add              trigger " + (2000 + circleIndex));
+		run("setGroup         current triggers");
+		run("setPos           current " + (center.x*1.7) + " " + (center.y*1.7) + " 0");
+		run("setSize          current 0.5");
+		run("setColorHue      current " + rangeMid(percent, 0, 40, 0) + " 255 255 255");
+	}
 }
 
 

diff --git a/IanniX.pro b/IanniX.pro
@@ -31,7 +31,7 @@ contains(QT_VERSION, "^4.*") {
     QT      += widgets core gui opengl network script xml
 }
 macx {
-    #QMAKE_LFLAGS += -F/Library/Frameworks
+    QMAKE_LFLAGS      += -F/Library/Frameworks
     contains(QT_VERSION, "4.7.4") {
         message("IanniX for Mac 32bits")
         DEFINES += IANNIX_32

diff --git a/Patches/Max/0.wav b/Patches/Max/0.wav
diff --git a/Patches/Max/1.wav b/Patches/Max/1.wav
diff --git a/Patches/Max/10.wav b/Patches/Max/10.wav
diff --git a/Patches/Max/11.wav b/Patches/Max/11.wav
diff --git a/Patches/Max/12.wav b/Patches/Max/12.wav
diff --git a/Patches/Max/13.wav b/Patches/Max/13.wav
diff --git a/Patches/Max/14.wav b/Patches/Max/14.wav
diff --git a/Patches/Max/15.wav b/Patches/Max/15.wav
diff --git a/Patches/Max/2.wav b/Patches/Max/2.wav
diff --git a/Patches/Max/3.wav b/Patches/Max/3.wav
diff --git a/Patches/Max/4.wav b/Patches/Max/4.wav
diff --git a/Patches/Max/5.wav b/Patches/Max/5.wav
diff --git a/Patches/Max/6.wav b/Patches/Max/6.wav
diff --git a/Patches/Max/7.wav b/Patches/Max/7.wav
diff --git a/Patches/Max/8.wav b/Patches/Max/8.wav
diff --git a/Patches/Max/9.wav b/Patches/Max/9.wav