VRGNYMusicLights visualizer Ok

pfrison
1 parent b191d7e7
Showing 8 changed files with 277 additions and 51 deletions Show diff stats
VRGNYMusicLights/Sources/AnimationPlayer.java
VRGNYMusicLights/Sources/Interface.java
VRGNYMusicLights/Sources/LightCanvasJPanel.java
VRGNYMusicLights/Sources/Main.java
VRGNYMusicLights/Sources/Music.java
VRGNYMusicLights/Sources/MusicList.java
VRGNYMusicLights/Sources/MusicPath.java
VRGNYMusicLights/Sources/MusicPattern.java
@@ -10,14 +10,50 @@ import javax.swing.JPanel;
 public class AnimationPlayer extends JPanel implements ActionListener {
 	private static final long serialVersionUID = 1L;
+	private LightCanvasJPanel lightCanvas;
+	private MusicList musicList;
+	
 	private JButton backward;
 	private JButton stop;
 	private JButton play;
 	private JButton pause;
 	private JButton forward;
+	
+	private long tick = 0;
+	private boolean go = false;
+	private boolean stopClock = false;
+	private static final int TICK_JUMP = 20;
+	private Thread tickClock = new Thread(new Runnable() {
+		@Override
+		public void run() {
+			while(!stopClock) {
+				if(!go) { // pause
+					try { Thread.sleep(100); }
+					catch (InterruptedException ignored) {}
+					continue;
+				}
+				
+				long before = System.currentTimeMillis();
+				lightCanvas.paintLights(musicList.render(tick));
+				tick += TICK_JUMP;
+				long after = System.currentTimeMillis();
+				
+				if(after - before < TICK_JUMP) {
+					try { Thread.sleep(10 - after + before);}
+					catch (InterruptedException ignored) {}
+				} else if(after - before > TICK_JUMP) {
+					System.err.println("Animation were slowed down by " + String.valueOf(after - before - 10) + " ticks !");
+				}
+			}
+		}
+	});
+	public void stopTickClock() {stopClock = true;}
-	public AnimationPlayer() { this(BoxLayout.LINE_AXIS); }
-	public AnimationPlayer(int direction) {
+	public AnimationPlayer(LightCanvasJPanel lightCanvas, MusicList musicList) { this(lightCanvas, musicList, BoxLayout.LINE_AXIS); }
+	public AnimationPlayer(LightCanvasJPanel lightCanvas, MusicList musicList, int direction) {
+		this.lightCanvas = lightCanvas;
+		this.musicList = musicList;
+		
 		setLayout(new BoxLayout(this, direction));
 		add(Box.createHorizontalGlue());
@@ -48,21 +84,26 @@ public class AnimationPlayer extends JPanel implements ActionListener {
 		add(forward);
 		add(Box.createHorizontalGlue());
+		
+		tickClock.start();
 	}
 	@Override
 	public void actionPerformed(ActionEvent e) {
 		// TODO player actions
 		if(e.getSource() == backward) {
-			
+			tick -= 500;
+			if(tick < 0)
+				tick = 0;
 		}else if(e.getSource() == stop) {
-			
+			go = false;
+			tick = 0;
 		}else if(e.getSource() == play) {
-			
+			go = true;
 		}else if(e.getSource() == pause) {
-			
+			go = false;
 		}else if(e.getSource() == forward) {
-			
+			tick += 500;
 		}
 	}
 }
@@ -3,7 +3,6 @@ import java.awt.Font;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import javax.swing.BoxLayout;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -12,10 +11,13 @@ public class Interface extends JFrame{
 	private static final long serialVersionUID = 1L;
 	private static final Font titleFont = new Font(new JLabel().getFont().getName(), Font.BOLD, 14);
 	private static final Font defaultFont = new Font(new JLabel().getFont().getName(), Font.PLAIN, new JLabel().getFont().getSize());
+	
+	private MusicList musicList;
+	private AnimationPlayer animPlayer;
-	public Interface(final Runnable executeOnClose) {
+	public Interface(MusicList musicList, final Runnable executeOnClose) {
 		super("VRGNYMusicLights");
-		//this.actionList = actionList;
+		this.musicList = musicList;
 		setResizable(false);
 		populateWindow();
 		pack();
@@ -24,6 +26,8 @@ public class Interface extends JFrame{
 		addWindowListener(new WindowAdapter() {
         	@Override
         	public void windowClosing(WindowEvent e) {
+        		if(animPlayer != null)
+        			animPlayer.stopTickClock();
         		if(executeOnClose != null)
         			executeOnClose.run();
         		dispose();
@@ -34,6 +38,7 @@ public class Interface extends JFrame{
 	private void populateWindow() {
 		JPanel mainPanel = new JPanel(new BorderLayout());
 		addPlayPanel(mainPanel);
+		addTimeLine(mainPanel);
 		add(mainPanel);
 	}
@@ -41,18 +46,23 @@ public class Interface extends JFrame{
 		JPanel playPanel = new JPanel(new BorderLayout());
 		// title
-		JLabel title = new JLabel("Player :");
+		JLabel title = new JLabel("Visualizer :");
 		title.setFont(titleFont);
 		playPanel.add(title, BorderLayout.NORTH);
 		// lights
-		playPanel.add(new LightCanvasJPanel(), BorderLayout.CENTER);
+		LightCanvasJPanel lightCanvas = new LightCanvasJPanel();
+		playPanel.add(lightCanvas, BorderLayout.CENTER);
 		// controls
-		AnimationPlayer animPlayer = new AnimationPlayer();
+		animPlayer = new AnimationPlayer(lightCanvas, musicList);
 		animPlayer.setAlignmentX(CENTER_ALIGNMENT);
 		playPanel.add(animPlayer, BorderLayout.SOUTH);
 		parent.add(playPanel, BorderLayout.SOUTH);
 	}
+
+	private void addTimeLine(JPanel parent) {
+		JPanel timeLine = new JPanel();
+	}
 }
@@ -5,33 +5,29 @@ import java.awt.Graphics;
 import javax.swing.JPanel;
 public class LightCanvasJPanel extends JPanel {
-	public static final double[][] DEFAULT_LIGHT_COORDS = new double[][] {
-		{0, 0}  , {0.2, 0}  , {0.4, 0}  , {0.6  , 0}, {0.8, 0}  , {1, 0}  ,
-		{0, 0.2}, {0.2, 0.2}, {0.4, 0.2}, {0.6, 0.2}, {0.8, 0.2}, {1, 0.2},
-		{0, 0.4}, {0.2, 0.4}, {0.4, 0.4}, {0.6, 0.4}, {0.8, 0.4}, {1, 0.4},
-		{0, 0.6}, {0.2, 0.6}, {0.4, 0.6}, {0.6, 0.6}, {0.8, 0.6}, {1, 0.6},
-		{0, 0.8}, {0.2, 0.8}, {0.4, 0.8}, {0.6, 0.8}, {0.8, 0.8}, {1, 0.8},
-		{0, 1}  , {0.2, 1}  , {0.4, 1}  , {0.6, 1}  , {0.8, 1}  , {1, 1}  ,
-	};
-	
 	private static final long serialVersionUID = 1L;
 	private static final int WIDTH = 320; // = 300 + padding * 2
 	private static final int HEIGHT = 220; // = 200 + padding * 2
 	private static final int LIGHT_RADIUS = 4;
 	private static final int PADDING = 10;
 	private double[][] lightsCoords;
+	private double[] lights = null;
-	/**
-	 * @param lightCoords : double[LightID][X = 0, Y = 1] = coordinates as a percentage [0, 1]
-	 */
-	public LightCanvasJPanel() {this(DEFAULT_LIGHT_COORDS);}
+	public LightCanvasJPanel() { this(MusicPath.LIGHT_COORDS); }
 	public LightCanvasJPanel(double[][] lightsCoords) {
 		this.lightsCoords = lightsCoords;
 		setPreferredSize(new Dimension(WIDTH, HEIGHT));
 	}
+	public void paintLights(double[] lights) {
+		this.lights = lights;
+		repaint();
+	}
+	
 	@Override
 	protected void paintComponent(Graphics g) {
+		super.paintComponent(g);
+		
 		// background
 		g.setColor(Color.WHITE);
 		g.fillRect(0, 0, WIDTH, HEIGHT);
@@ -47,5 +43,21 @@ public class LightCanvasJPanel extends JPanel {
 			g.fillOval(centerX - LIGHT_RADIUS, centerY - LIGHT_RADIUS, LIGHT_RADIUS * 2, LIGHT_RADIUS * 2);
 		}
+		
+		// lights values
+		if(lights == null || lights.length != lightsCoords.length)
+			return;
+		g.setColor(Color.YELLOW);
+		for(int i=0; i<lights.length; i++) {
+			if(lightsCoords[i].length != 2)
+				throw new MalformedCoordinates();
+			int centerX = (int) (lightsCoords[i][0] * (WIDTH - PADDING * 2)) + PADDING;
+			int centerY = (int) (lightsCoords[i][1] * (HEIGHT - PADDING * 2)) + PADDING;
+			
+			g.fillOval((int) (centerX - (LIGHT_RADIUS * lights[i])),
+					(int) (centerY - (LIGHT_RADIUS * lights[i])),
+					(int) (LIGHT_RADIUS * lights[i] * 2),
+					(int) (LIGHT_RADIUS * lights[i] * 2));
+		}
 	}
 }
+import javax.swing.JOptionPane;
 /* TODO list :
  *  - keyboard listener for animation player (play / pause = space, forward = semicolon, backward = comma, stop = backspace)
  */
 public class Main {
 	public static void main(String[] args) throws InterruptedException {
-		/* FIXME interface testing in progress
-		
-		String serialPort = null;
+		// FIXME interface testing in progress
+		/*String serialPort = null;
 		try {
 			serialPort = SerialPortChooserDialog.showSerialPortChooserDialog();
 		} catch (NoSerialPortException e) {
@@ -19,7 +19,14 @@ public class Main {
 		// arduino need time before accepting serial data
 		Thread.sleep(1000);*/
-		Interface i = new Interface(new Runnable() {
+		MusicList musicList = new MusicList(null);
+		musicList.addMusic(
+				new Music(
+						new MusicPattern(new int[] {1000, 0, 0, 1000}, 1000, 0),
+						new MusicPath(MusicPath.CENTER_IN, 1000),
+						1));
+		
+		Interface i = new Interface(musicList, new Runnable() {
 			@Override
 			public void run() {
 				//serialCom.close();
 public class Music {
 	private MusicPattern pattern;
-	private MusicPath path;
-	private long startDelai; // in ms
-	private long length; // in ms
+	private int[] lightTickDelais;
+	private double volume;
-	public Music(MusicPattern pattern, MusicPath path, long startDelai, long length) {
+	public Music(MusicPattern pattern, MusicPath path, double volume) {
 		this.pattern = pattern;
-		this.path = path;
-		this.startDelai = startDelai;
-		this.length = length;
-		
-		//call MusicPath transform()
+		this.lightTickDelais = path.calculateTickDelais();
+		this.volume = volume;
+	}
+	
+	public double[] render(long tick) {
+		double[] lights = new double[lightTickDelais.length];
+		for(int i=0; i<lights.length; i++)
+			lights[i] = pattern.render(lightTickDelais[i] + tick) * volume;
+		return lights;
 	}
 }
@@ -8,4 +8,24 @@ public class MusicList {
 		this.serialCom = serialCom;
 		musics = new ArrayList<>();
 	}
+
+	public void addMusic(Music music) { musics.add(music); }
+	public void deleteMusic(int index) { musics.remove(index); }
+	
+	public double[] render(long tick) {
+		if(musics.size() == 0)
+			return null;
+		double[] lights = musics.get(0).render(tick);
+		for(int i=1; i<musics.size(); i++) {
+			double[] tmpRender = musics.get(i).render(tick);
+			for(int j=0; j<lights.length; j++) {
+				lights[j] += tmpRender[j];
+				if(lights[j] < 0)
+					lights[j] = 0;
+				if(lights[j] > 1)
+					lights[j] = 1;
+			}
+		}
+		return lights;
+	}
 }
 public class MusicPath {
-	private static final int VERTICAL_DOWN = 0;
-	private static final int VERTICAL_UP = 1;
-	private static final int HORIZONTAL_DOWN = 2;
-	private static final int HORIZONTAL_UP = 3;
-	private static final int DIAGONAL_TOP_RIGHT_DOWN_LEFT = 4;
-	private static final int DIAGONAL_TOP_LEFT_DOWN_RIGHT = 5;
-	private static final int CENTER_OUT = 6;
-	private static final int CENTER_IN = 7;
+	public static final double[][] LIGHT_COORDS = new double[][] {
+		// Planche 1
+		{0.0383, 0}, {0.0766, 0}, {0.115, 0}, {0.1533, 0}, {0.1916, 0}, {0.23, 0}, //M1L1
+		{0.2683, 0}, {0.306, 0}, {0.345, 0}, {0.383, 0}, {0.4216, 0}, {0.46, 0}, {0.4983, 0}, //M1L2
+		{0.0333, 0.25}, {0.0666, 0.25}, {0.0999, 0.25}, {0.1333, 0.25}, //P1-1
+		{0.3016, 0.25}, {0.3366, 0.25}, {0.3733, 0.25}, {0.4099, 0.25}, {0.4466, 0.25}, {0.4833, 0.25}, {0.5199, 0.25}, //P1-2
+		{0.3366, 0.3}, {0.3366, 0.35}, //P1-3
+		{0, 0.3075}, {0, 0.365}, {0, 0.4225}, //M1l1
+
+		// Planche 2
+		{0.5366, 0}, {0.575, 0}, {0.6133, 0}, {0.6516, 0}, {0.69, 0}, {0.7283, 0}, {0.7666, 0}, //M2L1
+		{0.805, 0}, {0.8433, 0}, {0.8816, 0}, {0.92, 0}, {0.9583, 0}, //M2L2
+		{0.5566, 0.25}, {0.5933, 0.25}, {0.6299, 0.25}, {0.6666, 0.25}, //P2-1
+		{0.8366, 0.25}, {0.8699, 0.25}, {0.9032, 0.25}, {0.9366, 0.25}, {0.9699, 0.25}, //P2-2
+		{1, 0.06}, {1, 0.115}, {1, 0.17}, {1, 0.225}, {1, 0.28}, {1, 0.335}, {1, 0.39}, //M2l1
+		
+		// Planche 3
+		{0.3366, 0.4}, {0.3366, 0.45}, {0.3366, 0.5}, //P3-1
+		{0.3366, 0.75}, {0.3366, 0.8}, //P3-2
+		{0, 0.48}, {0, 0.5375}, {0, 0.595}, {0, 0.6525}, {0, 0.71}, {0, 0.7675}, //M3l1
+		
+		// Planche 4
+		{1, 0.445}, {1, 0.5}, {1, 0.555}, {1, 0.61}, {1, 0.665}, {1, 0.72}, {1, 0.775}, //M4l1
+		
+		// Planche 5
+		{0.0383, 1}, {0.0766, 1}, {0.115, 1}, {0.1533, 1}, {0.1916, 1}, {0.23, 1}, //M5L1
+		{0.2683, 1}, {0.306, 1}, {0.345, 1}, {0.383, 1}, {0.4216, 1}, {0.46, 1}, {0.4983, 1}, //M5L2
+		{0.3366, 0.85}, {0.3366, 0.9}, {0.3366, 0.95}, //P5-1
+		{0, 0.8255}, {0, 0.8835}, {0, 0.9415}, //M5l1
+		
+		// Planche 6
+		{0.5366, 1}, {0.575, 1}, {0.6133, 1}, {0.6516, 1}, {0.69, 1}, {0.7283, 1}, {0.7666, 1}, //M6L1
+		{0.805, 1}, {0.8433, 1}, {0.8816, 1}, {0.92, 1}, {0.9583, 1}, //M6L2
+		{1, 0.83}, {1, 0.885}, {1, 0.94} //M6l1
+	};
+	
+	public static final int VERTICAL_DOWN = 0;
+	public static final int VERTICAL_UP = 1;
+	public static final int HORIZONTAL_TO_LEFT = 2;
+	public static final int HORIZONTAL_TO_RIGHT = 3;
+	public static final int DIAGONAL_TOP_RIGHT_DOWN_LEFT = 4;
+	public static final int DIAGONAL_DOWN_LEFT_TOP_RIGHT = 5;
+	public static final int DIAGONAL_TOP_LEFT_DOWN_RIGHT = 6;
+	public static final int DIAGONAL_DOWN_RIGHT_TOP_LEFT = 7;
+	public static final int CENTER_OUT = 8;
+	public static final int CENTER_IN = 9;
+	public static final int ALL = 10;
 	private int animation;
+	private int effectDuration;
+	private double[][] lightsCoords;
-	public MusicPath(int animation) {
+	public MusicPath(int animation, int effectDuration) { this(animation, effectDuration, LIGHT_COORDS); }
+	public MusicPath(int animation, int effectDuration, double[][] lightsCoords) {
 		this.animation = animation;
+		this.effectDuration = effectDuration;
+		this.lightsCoords = lightsCoords;
 	}
-	// TODO transform music according to animation
-	// what format ? int[nled][pattern] (ms) ?
+	public int[] calculateTickDelais() { // tick in ms
+		int[] ticksDelais = new int[lightsCoords.length];
+		for(int i=0; i<ticksDelais.length; i++) {
+			ticksDelais[i] = 0;
+			if(animation == VERTICAL_DOWN
+					|| animation == VERTICAL_UP
+					|| animation == HORIZONTAL_TO_LEFT
+					|| animation == HORIZONTAL_TO_RIGHT
+					|| animation == DIAGONAL_TOP_RIGHT_DOWN_LEFT
+					|| animation == DIAGONAL_DOWN_LEFT_TOP_RIGHT
+					|| animation == DIAGONAL_TOP_LEFT_DOWN_RIGHT
+					|| animation == DIAGONAL_DOWN_RIGHT_TOP_LEFT
+					|| animation == CENTER_OUT
+					|| animation == CENTER_IN) {
+				switch (animation) {
+				case VERTICAL_DOWN:
+					ticksDelais[i] += tickLateVerticalDown(LIGHT_COORDS[i][1]);
+					break;
+				case VERTICAL_UP:
+					ticksDelais[i] += tickLateVerticalUp(LIGHT_COORDS[i][1]);
+					break;
+				case HORIZONTAL_TO_LEFT:
+					ticksDelais[i] += tickLateHorizontalToLeft(LIGHT_COORDS[i][0]);
+					break;
+				case HORIZONTAL_TO_RIGHT:
+					ticksDelais[i] += tickLateHorizontalToRight(LIGHT_COORDS[i][0]);
+					break;
+				case DIAGONAL_TOP_RIGHT_DOWN_LEFT:
+					ticksDelais[i] += tickLateDiagTRDL(LIGHT_COORDS[i][0], LIGHT_COORDS[i][1]);
+					break;
+				case DIAGONAL_DOWN_LEFT_TOP_RIGHT:
+					ticksDelais[i] += tickLateDiagDLTR(LIGHT_COORDS[i][0], LIGHT_COORDS[i][1]);
+					break;
+				case DIAGONAL_TOP_LEFT_DOWN_RIGHT:
+					ticksDelais[i] += tickLateDiagTLDR(LIGHT_COORDS[i][0], LIGHT_COORDS[i][1]);
+					break;
+				case DIAGONAL_DOWN_RIGHT_TOP_LEFT:
+					ticksDelais[i] += tickLateDiagDRTL(LIGHT_COORDS[i][0], LIGHT_COORDS[i][1]);
+					break;
+				case CENTER_OUT:
+					ticksDelais[i] += tickLateCenterOut(LIGHT_COORDS[i][0], LIGHT_COORDS[i][1]);
+					break;
+				case CENTER_IN:
+					ticksDelais[i] += tickLateCenterIn(LIGHT_COORDS[i][0], LIGHT_COORDS[i][1]);
+					break;
+				}
+			}
+			else if(animation == ALL);
+		}
+		return ticksDelais;
+	}
+
+	private int tickLateVerticalDown(double y) {return (int) ((1-y) * effectDuration);}
+	private int tickLateVerticalUp(double y) {return (int) (y * effectDuration);}
+	private int tickLateHorizontalToRight(double x) {return (int) ((1-x) * effectDuration);}
+	private int tickLateHorizontalToLeft(double x) {return (int) (x * effectDuration);}
+	private int tickLateDiagTRDL(double x, double y) {return (int) ((x - y) / 2d * (double) effectDuration);}
+	private int tickLateDiagDLTR(double x, double y) {return (int) ((-x + y) / 2d * (double) effectDuration);}
+	private int tickLateDiagDRTL(double x, double y) {return (int) ((x + y) / 2d * (double) effectDuration);}
+	private int tickLateDiagTLDR(double x, double y) {return (int) ((-x - y) / 2d * (double) effectDuration);}
+	private int tickLateCenterOut(double x, double y) {return (int) ((1 - (x-0.5)*(x-0.5) - (y-0.5)*(y-0.5)) * 2 * (double) effectDuration);}
+	private int tickLateCenterIn(double x, double y) {return (int) (((x-0.5)*(x-0.5) + (y-0.5)*(y-0.5)) * 2 * (double) effectDuration);}
+
+	public int getNumberOfLights() {
+		return this.lightsCoords.length;
+	}
 }
@@ -7,10 +7,35 @@ public class MusicPattern {
 	 *  3 : fall time
 	 */
 	private int[] pattern; // in ms
+	private int totalLentgh;
+	private int[] patternTiming = new int[4]; // in ms
+	private long begin; // in ms
+	private long stop; // in ms
-	public MusicPattern(int[] pattern) {
+	public MusicPattern(int[] pattern, int repeat, long begin) {
 		if(pattern.length != 4)
 			throw new InvalidPatternException();
 		this.pattern = pattern;
+		this.totalLentgh = pattern[0] + pattern[1] + pattern[2] + pattern[3];
+		this.patternTiming[0] = pattern[0];
+		for(int i=1; i<4; i++)
+			this.patternTiming[i] = this.patternTiming[i-1] + pattern[i];
+		this.begin = begin;
+		this.stop = repeat * totalLentgh;
+	}
+	
+	public double render(long tick) { // tick in ms
+		if(tick <= begin)
+			return 0;
+		if(tick >= stop)
+			return 0;
+		int tickMod = (int) (tick % totalLentgh);
+		if(tickMod < patternTiming[0])
+			return 0;
+		if(tickMod < patternTiming[1])
+			return (double) (tickMod - patternTiming[0]) / (double) (pattern[1]);
+		if(tickMod < patternTiming[2])
+			return 1;
+		return 1 - ((double) (tickMod - patternTiming[2]) / (double) (pattern[3]));
 	}
 }