diff options
author | unknown <Adam Martindale@.(none)> | 2011-09-12 15:58:18 +0100 |
---|---|---|
committer | unknown <Adam Martindale@.(none)> | 2011-09-12 15:58:18 +0100 |
commit | 7d06a1bb2ef15c57766886831f47fdc83519e6de (patch) | |
tree | 4f0e84d02eea21a292a2b0ed290e8bd8845fff6b /PunchingBag/src/PunchingBagGUI.java | |
parent | 7cab7709fd96a6c12f2d4b7ac73e224b79dd0385 (diff) | |
parent | 223480547e0c3e54f729356dce80bd40d401cf79 (diff) | |
download | punchingbag-7d06a1bb2ef15c57766886831f47fdc83519e6de.tar punchingbag-7d06a1bb2ef15c57766886831f47fdc83519e6de.tar.gz |
Merge branch 'master' of gitorious.org:punchingbag/punchingbag
Conflicts:
PunchingBag/src/PunchingBagGUI.java
Diffstat (limited to 'PunchingBag/src/PunchingBagGUI.java')
-rw-r--r-- | PunchingBag/src/PunchingBagGUI.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/PunchingBag/src/PunchingBagGUI.java b/PunchingBag/src/PunchingBagGUI.java index cfe9706..5ba30a8 100644 --- a/PunchingBag/src/PunchingBagGUI.java +++ b/PunchingBag/src/PunchingBagGUI.java @@ -48,7 +48,6 @@ public class PunchingBagGUI implements MouseListener, MouseMotionListener, final boolean useDebugScreen = true;
public static void main(String[] args) throws InterruptedException {
-
new PunchingBagGUI();
}
@@ -534,9 +533,15 @@ public class PunchingBagGUI implements MouseListener, MouseMotionListener, @Override
public void buttonPressed(int x, int y) {
- System.out.println("Button Pressed: " + x + " " + y);
- bag.circleExpand(x, y, 16);
+ System.out.println("Button Pressed: " + x + " " + y); + //bag.circleExpand(x, y, 16);
+ bag.setLED(x, y, PunchingBag.Colour.Red);
//bag.noise(new Rectangle(0, 0, 9, 20), 5000);
+ /*for (int bx=0; bx<bag.ledWidth; bx++) {
+ for (int by=0; by<bag.ledHeight; by++) {
+ bag.setLED(bx, by, PunchingBag.Colour.Red);
+ }
+ }*/ //bag.squareExpand(x,y, 16, PunchingBag.Colour.Red);
}
|