Merge branch 'master' of https://github.com/ffd8/xyscope

Author: ffd8

src/xyscope/XYscope.java

@@ -90,6 +90,20 @@ public XYscope(PApplet theParent) {
 		initMinim();
 		setMixer();
 	}
+	
+	/**
+	 * Initialize library in setup(), use default system audio out setting.
+	 * 
+	 * @param	theParent	PApplet to apply to, typically 'this'
+	 * @param	outMix	AudioOutput to merge instance and of XYscope to
+	 */
+	//	 * @example basic_shapes
+	
+	public XYscope(PApplet theParent, AudioOutput outMix) {
+		myParent = theParent;
+		initMinim();
+		setWaveTable(outMix);
+	}
 
 	/**
 	 * Initialize library in setup(), custom soundcard by String for XY.
@@ -120,7 +134,6 @@ public XYscope(PApplet theParent, int xyMixer) {
 		setMixer(xyMixer);
 	}
 
-
 	/**
 	 * Initialize library in setup(), custom soundcard by String for XY, custom soundcard by String for Z.
 	 * <p>
@@ -262,6 +275,29 @@ private void setWaveTable(){
 			waveZ.reset();
 		}
 	}
+	
+	private void setWaveTable(AudioOutput outMix){
+		tableX = Waves.randomNHarms(0); 
+		waveX  = new Oscil(freq.x, amp.x, tableX); 
+		tableX.setWaveform(shapeX); 
+		waveX.patch(panX).patch(outMix); 
+
+		tableY = Waves.randomNHarms(0); 
+		waveY  = new Oscil(freq.y, amp.y, tableY); 
+		tableY.setWaveform(shapeY); 
+		waveY.patch(panY).patch(outMix);
+
+		waveX.reset();
+		waveY.reset();
+
+		if(zaxis){
+			tableZ = Waves.randomNHarms(0); 
+			waveZ  = new Oscil(freq.z, amp.z, tableZ); 
+			tableZ.setWaveform(shapeZ); 
+			waveZ.patch(outZ); // need pan?? or gets full amp to both channels?
+			waveZ.reset();
+		}
+	}
 
 	/**
 	 * Check if z-axis waveform is being automatically drawn from added shapes.