Merge branch 'master' of gitorious.org:punchingbag/punchingbag

1 files changed, 85 insertions, 0 deletions

diff --git a/PunchingBag/src/PunchingBag.java b/PunchingBag/src/PunchingBag.java
index 85553a5..e046842 100644
--- a/PunchingBag/src/PunchingBag.java
+++ b/PunchingBag/src/PunchingBag.java
@@ -217,6 +217,91 @@ public class PunchingBag implements Runnable {
 		}
 	}
 
+	public boolean drawRectCenter(int x, int y, int height, int width,
+			Colour colour) {
+		if (height < 0) {
+			height = 0;
+		}
+		if (width < 0) {
+			width = 0;
+		}
+		if (height == 0 && width == 0) {
+			return setLEDInternal(x, y, colour);
+		}
+
+		boolean doneSomething = false;
+		int widthEx = 0;
+		int heightEx = 0;
+
+		do {
+			if (setLEDInternal((x - (height / 2)) + widthEx, y - (height / 2),
+					colour)) {
+				doneSomething = true;
+			}
+			if (setLEDInternal(x - (height / 2), (y - (height / 2)) + heightEx,
+					colour)) {
+				doneSomething = true;
+			}
+			if (setLEDInternal((x - (height / 2)) + widthEx, y + (height / 2),
+					colour)) {
+				doneSomething = true;
+			}
+			if (setLEDInternal(x + (height / 2), (y - (height / 2)) + heightEx)) {
+				doneSomething = true;
+			}
+			if (heightEx < height) {
+				heightEx++;
+			}
+			if (widthEx < width) {
+				widthEx++;
+			}
+
+		} while (height && width >= 0);
+
+		return doneSomething;
+	}
+
+	public boolean drawRectCorner(int x, int y, int height, int width,
+			Colour colour) {
+		if (height < 0) {
+			height = 0;
+		}
+		if (width < 0) {
+			width = 0;
+		}
+		if (height == 0 && width == 0) {
+			return setLEDInternal(x, y, colour);
+		}
+
+		boolean doneSomething = false;
+		int heightEx = 0;
+		int widthEx = 0;
+
+		do {
+			if (setLEDInternal(x + widthEx, y, colour)) {
+				doneSomething = true;
+			}
+
+			if (setLEDInternal(x, y + heightEx, colour)) {
+				doneSomething = true;
+			}
+			if (setLEDInternal(x + widthEx, y + height, colour)) {
+				doneSomething = true;
+			}
+			if (setLEDInternal(x + width, y + heightEx, colour)) {
+				doneSomething = true;
+			}
+			if (heightEx < height) {
+				heightEx++;
+			}
+			if (widthEx < width) {
+				heightEx++;
+			}
+		} while (height >= 0 && width >= 0);
+
+		return doneSomething;
+	}
+
 	public boolean drawEllipse(int x, int y, int radx, int rady, Colour colour) {
 		if (radx == 0 && rady == 0) {
 			return setLEDInternal(x, y, colour);