From 634451fa20813481cc90035a9a726fd6f7717409 Mon Sep 17 00:00:00 2001 From: Kenneth van Ewijk Date: Mon, 8 Jun 2015 14:13:25 +0200 Subject: [PATCH] Fixed leds --- model/GameModel.java | 12 +++++++++--- view/GameView.java | 45 ++++++++++++++++++++------------------------ 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/model/GameModel.java b/model/GameModel.java index ed1ebd6..5c55122 100644 --- a/model/GameModel.java +++ b/model/GameModel.java @@ -12,6 +12,7 @@ public class GameModel { public static Color[] colors = { Color.GREEN, Color.YELLOW, Color.RED, Color.MAGENTA, Color.CYAN, Color.WHITE }; private GameStateManager gsm; private LedHandler led; + private int count = 0; public GameModel(SongHandler sh, GameStateManager gsm, LedHandler led) { this.gsm = gsm; @@ -29,10 +30,15 @@ public class GameModel { Color c = colors[(int) (Math.random() * (colors.length - 1) + 1)]; if (Window.ON_RASP) { - for (int i = 7; i < 54; i++) { - led.setLed(i, c.getRed(), c.getGreen(), c.getBlue()); + count++; + if(count>15) + { + for (int i = 7; i < 54; i++) { + led.setLed(i, c.getRed(), c.getGreen(), c.getBlue()); + } + led.show(); + count = 0; } - led.show(); } } } diff --git a/view/GameView.java b/view/GameView.java index d6fd431..12de944 100644 --- a/view/GameView.java +++ b/view/GameView.java @@ -13,41 +13,36 @@ import javax.swing.JPanel; import control.GameStateManager; import control.LedHandler; -public class GameView extends JPanel{ - +public class GameView extends JPanel { + /** * */ private static final long serialVersionUID = 1939480784205689618L; - - + LedHandler led; GameStateManager gsm; - Font fpsfont = new Font("OCR A Extended", Font.BOLD, 60); - - public GameView(LedHandler led,GameStateManager gsm) - { - this.led=led; - this.gsm = gsm; - this. - setPreferredSize(new Dimension(1280,1024)); + + // Font fpsfont = new Font("OCR A Extended", Font.BOLD, 60); + + public GameView(LedHandler led, GameStateManager gsm) { + this.led = led; + this.gsm = gsm; + this.setPreferredSize(new Dimension(1280, 1024)); } @Override - public void paintComponent(Graphics g) - { + public void paintComponent(Graphics g) { super.paintComponent(g); - + Graphics2D g2d = (Graphics2D) g; - RenderingHints rh = new RenderingHints( - RenderingHints.KEY_ANTIALIASING, - RenderingHints.VALUE_ANTIALIAS_ON); - g2d.setRenderingHints(rh); - gsm.currentState.draw(g2d); - - g2d.setColor(Color.RED); - g2d.setFont(fpsfont); - g2d.drawString(gsm.fps + "fps", 1000, 40); + RenderingHints rh = new RenderingHints(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + g2d.setRenderingHints(rh); + gsm.currentState.draw(g2d); + + //g2d.setColor(Color.RED); + //g2d.setFont(fpsfont); + //g2d.drawString(gsm.fps + "fps", 1000, 40); Toolkit.getDefaultToolkit().sync(); - } + } }