diff options
| author | Christopher Baines <cbaines8@gmail.com> | 2011-09-12 14:21:47 +0100 |
|---|---|---|
| committer | Christopher Baines <cbaines8@gmail.com> | 2011-09-12 14:21:47 +0100 |
| commit | b872e8aaf1f429d9422498cab25d5638e4158502 (patch) | |
| tree | a3147d97d173b6291eaad40c9b04eea162dff4ac /PunchingBag/src/PunchingBagGUI.java | |
| parent | 476322ce729ef56d808be66843fef18a83470191 (diff) | |
| parent | 4a097766a92c6d190e25c860097f20cd1cfbf069 (diff) | |
| download | punchingbag-b872e8aaf1f429d9422498cab25d5638e4158502.tar punchingbag-b872e8aaf1f429d9422498cab25d5638e4158502.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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/PunchingBag/src/PunchingBagGUI.java b/PunchingBag/src/PunchingBagGUI.java index 7af4d71..adf30b0 100644 --- a/PunchingBag/src/PunchingBagGUI.java +++ b/PunchingBag/src/PunchingBagGUI.java @@ -537,12 +537,12 @@ public class PunchingBagGUI implements MouseListener, MouseMotionListener, System.out.println("Button Pressed: " + x + " " + y);
// bag.circleExpand(x, y, 16);
//bag.noise(new Rectangle(0, 0, 9, 20), 5000);
- for (int bx=0; bx<bag.ledWidth; bx++) {
+ /*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);
}
@Override
|