release v1

added Pachabel's canon because it's in the example of the readme
finalised(?) the readme...

Author: EHummerston

readme.md

@@ -16,17 +16,14 @@ A time signature is used in White Noise to decide *when* to play notes.
 
 We represent a time signature with a list of evenly-spaced segments of a [bar](https://en.wikipedia.org/wiki/Bar_(music)).  
 Example:  
-
 `_` `_` `_` `_`
 
 In each entry, a non-zero value represents the possibility that a note can be played in that space of time.  
 Example: ([Swing](https://en.wikipedia.org/wiki/Swing_(jazz_performance_style)#Swing_as_a_rhythmic_style) Feel)  
-
 `■` `_` `■` `■` `_` `■` `■` `_` `■` `■` `_` `■`
 
 Finally each entry has a value indicating the *likelihood* that a note should be played in that space. (Lower values have a higher chance of being played.)  
 Example:  
-
 `1` `_` `3` `1` `_` `3` `1` `_` `3` `1` `_` `3`
 
 ### Chords
@@ -46,8 +43,9 @@ These notes are then offset by some number of octaves (multiples of twelve in MI
 
 A single time signature for a piece is fine, but only one chord would be boring. White Noise uses [Chord Progressions](https://en.wikipedia.org/wiki/Chord_progression) to change between chords and therefore available pitches. It plays through one iteration of the **Time Signature** bar, using notes from the first **Chord** in the progression, and then repeats the bar again with the next chord.
 
-So finally we have a **Piece** which is composed of a **Time Signature**, some **Chords** and a **Chord Progression**.  
-Example: (*Pachebel's Canon in D*)
+So finally we have a **Piece** which is composed of a **Time Signature**, some **Chords** and a **Chord Progression**.
+
+### Example: (*Pachebel's Canon in D*)
 
 #### Time Signature
 

src/Rain.java

@@ -48,6 +48,7 @@ public class Rain {
 	final static int[] fourFour = {1,4,8,4,1,4,8,4,1,4,8,4,1,4,8,4};
 	final static int[] swing = {1,0,2,1,0,3,1,0,2,1,0,3};
 	final static int[] swing2 = {1,0,2,1,0,3};
+	final static int[] canonTime = {1,8,4,8,2,8,4,8};
 
 	final static Chord[] frun = {
 		new Chord(69,new int[] {0,4,7}),
@@ -99,6 +100,18 @@ public class Rain {
 		new Chord(70,new int[] {0,4,7}),
 		new Chord(70,new int[] {0,4,7}),
 	};
+	
+	final static Chord[] canon = {
+			new Chord(74,new int[] {0,4,7}),	// D Maj
+			new Chord(69,new int[] {0,4,7}),	// A Maj
+			new Chord(71,new int[] {0,3,7}),	// B Min	
+			new Chord(66,new int[] {0,3,7}),	// F# min
+
+			new Chord(67,new int[] {0,4,7}),	// G Maj
+			new Chord(74,new int[] {0,4,7}),	// D Maj
+			new Chord(67,new int[] {0,4,7}),	// G Maj
+			new Chord(69,new int[] {0,4,7}),	// A Maj
+		};
 
 
 	public static void main(String[] args) {
@@ -350,7 +363,7 @@ private void doDrawing(Graphics g) {
 						g2d.drawString(txt,0,screenHeight/2);
 
 						txt = new String();
-						txt+="1 and 2 change styles";
+						txt+="1 - 4 change styles";
 						g2d.drawString(txt,0,screenHeight/2+g.getFontMetrics().getHeight());
 
 						helpAlpha-=(float)1/TARGET_FPS/4;
@@ -390,6 +403,9 @@ public void keyPressed(KeyEvent e) {
 			case KeyEvent.VK_3:
 				changeToWay();
 				break;
+			case KeyEvent.VK_4:
+				changeToCanon();
+				break;
 			case KeyEvent.VK_R:
 				drawFPS=!drawFPS;
 				helpAlpha = 1;
@@ -456,7 +472,14 @@ public void changeToMablas()
 
 	public void changeToWay()
 	{
+		
 		phatBeats = new Signature(swing2, 80, way, System.nanoTime());
 	}
+	
+	public void changeToCanon()
+	{
+		phatBeats = new Signature(canonTime, 30, canon, System.nanoTime());
+	}
+
 
 }