made blends[] public, slowed standard bpm, added fxFM

data/saves.sav

@@ -1,2 +1,2 @@
 //globals
-uptime = 116634213
+uptime = 116636389

mnglctrlr.pde

@@ -1,3 +1,5 @@
+ //182l 31h 25t
+
 import drop.*;
 import controlP5.*;
 

oscillator.pde

@@ -15,8 +15,8 @@ class Oscillator {
   boolean playing, pause, valInvert;
 
   Oscillator(float bpm_, int[] osciModes_) {
-    minBPM = 5;
-    maxBPM = 15;
+    minBPM = 2;
+    maxBPM = 5;
       
     bpm(bpm_);
     possibleModes = osciModes_;

secondapplet.pde

@@ -365,7 +365,7 @@ public class SecondApplet extends PApplet {
       label = label_ + (mode == INTVAL ? " (INT)" : " (FLOAT)");
       osciModes = osciModes_;
 
-      osci = new Oscillator(int(random(5, 15)), osciModes);
+      osci = new Oscillator(int(random(2, 5)), osciModes);
       osci.amplitude(minVal, maxVal);
       osci.update();
       setValue(osci.value);
@@ -463,76 +463,13 @@ public class SecondApplet extends PApplet {
         case(1): 
         shaderManager.addShader(new DISTORTER()); 
         break;
-        /*
         case(2): 
-         shaderManager.addShader(new WAHWAH()); 
-         break;
+        shaderManager.addShader(new FM()); 
+        break;
+        /*
          case(3): 
          shaderManager.addShader(new AUECHO()); 
          break;
-         case(4): 
-         shaderManager.addShader(new PHASER()); 
-         break;
-         case(0): 
-         shaderManager.addShader(new WZIP()); 
-         break;
-         case(0): 
-         shaderManager.addShader(new DARKER()); 
-         break;
-         case(0): 
-         shaderManager.addShader(new BRIGHTER()); 
-         break;
-         case(0): 
-         shaderManager.addShader(new MOVE()); 
-         break;
-         case(0): 
-         shaderManager.addShader(new SCALE()); 
-         break;
-         case(0): 
-         shaderManager.addShader(new EPILEPSY()); 
-         break;
-         case(0): 
-         shaderManager.addShader(new POSTERIZE()); 
-         break;
-         case(0): 
-         shaderManager.addShader(new COPYZOOM()); 
-         break;
-         case(0): 
-         shaderManager.addShader(new DUAL()); 
-         break;
-         case(0): 
-         shaderManager.addShader(new SCANKER()); 
-         break;
-         case(0): 
-         shaderManager.addShader(new PIXELSORT()); 
-         break;
-         case(0): 
-         shaderManager.addShader(new HSB()); 
-         break;
-         case(0): 
-         shaderManager.addShader(new ECHO()); 
-         break;
-         case(0): 
-         shaderManager.addShader(new SUBTLESORT()); 
-         break;
-         case(0): 
-         shaderManager.addShader(new BLACKWHITE()); 
-         break;
-         case(0): 
-         shaderManager.addShader(new DRAWGENERATIVE()); 
-         break;
-         case(0): 
-         shaderManager.addShader(new DRAWSTROKES()); 
-         break;
-         case(0): 
-         shaderManager.addShader(new FM()); 
-         break;
-         case(0): 
-         shaderManager.addShader(new GRAUZONE()); 
-         break;
-         case(0): 
-         shaderManager.addShader(new SLITSCAN()); 
-         break;
          */
       default:
         break;

statics_and_lists.pde

@@ -1,6 +1,9 @@
 final static int INTVAL = 100;
 final static int FLOATVAL = 101;
 
+
+final int[] blends = {ADD, SUBTRACT, DARKEST, LIGHTEST, DIFFERENCE, EXCLUSION, MULTIPLY, SCREEN, OVERLAY, HARD_LIGHT, SOFT_LIGHT, DODGE, BURN};
+
 //waveforms for oscillator
 final static int SINE = 0; //add 0.25 to phase to get cos
 final static int SAWTOOTH = 1;
@@ -14,10 +17,33 @@ final static int RAMPINVERSE = 8; //line for half the sequence up to 1, then sta
 final static int RAMPUPDOWN = 9; //line up, stay, line down, stay
 final static int RANDOM = 10;
 
+//colorspaces from tomasz sulej's FM effect
+
+final static int COLORSPACES = 16;
+
+final static int OHTA = 0;
+// RGB == 1; defined in processing
+final static int CMY = 2;
+// HSB == 3; defined in processing
+final static int XYZ = 4;
+final static int YXY = 5;
+final static int HCL = 6;
+final static int LUV = 7;
+final static int LAB = 8;
+final static int HWB = 9;
+final static int RGGBG = 10;
+final static int YPbPr = 11;
+final static int YCbCr = 12;
+final static int YDbDr = 13;
+final static int GS = 14;
+final static int YUV = 15;
+
+
 //available shaders
 String availableFx[] = {
   "fxASDFPixelSort", 
   "fxDistorter", 
+  "fxFM",
   "fxWahWah", 
   "fxAuEcho", 
   "fxPhaser", 
@@ -38,7 +64,6 @@ String availableFx[] = {
   "fxBlackWhite", 
   "fxDrawGenerative", 
   "fxDrawStrokes", 
-  "fxFM", 
   "fxGrauzone", 
   "fxSlitScan"
 };