From d89f901d176173433e640ebccde6e90397415c71 Mon Sep 17 00:00:00 2001
From: Billy Gallagher <william.j.gallagher@uconn.edu>
Date: Fri, 15 Apr 2016 15:22:34 -0400
Subject: [PATCH] Ability to change ball color is there, along with a few basic
 colors.

---
 res/playerGreen.png         | Bin 0 -> 428 bytes
 res/playerRed.png           | Bin 0 -> 427 bytes
 src/game/Options.java       |  17 +++++++++++++++++
 src/game/entity/Player.java |  32 ++++++++++++++++++++++++++------
 4 files changed, 43 insertions(+), 6 deletions(-)
 create mode 100644 res/playerGreen.png
 create mode 100644 res/playerRed.png

diff --git a/res/playerGreen.png b/res/playerGreen.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c912400a4fcd7e95a732189227119f46a26cd9f
GIT binary patch
literal 428
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmPN3%@Y8nQLs=d7zMFiEBiObAE1aYF-J0b5UwyNotBh
zd1gt5g1e`0KzJjcI0FNth^LEVNX4zUv!nSAEAX%!JoR_I&wp*f1A7h`$t-x&^EM>#
z^^71cb9wIR^Ix;tXzO(<?s}%vDzZF%_D7x%Oz#DZLJsJBn5opp5y5Kb+%lKT{#9N%
z`x_Sdo4m^y?oU1`@}PRtOs+lVi!~2cZ<-}llbsgal7I5t?FCt1vn72b_qDYO2CT2^
z?Bv_A@K=6L2?LWr!SO%OC0;VHC@?T`H~{$#5N5>3`E%|*pFfcgD0VO1rSjj)hB*vJ
z^-dUGWL$e}%BuJ`46K~0Y;Fs#KR9`H{ksNX)hlV+F3ML3)qFO7z{0s!GWQ#6d|P=v
zcTHfEdGPmRC*IA!Qr(@noB7SY*-JIAJrjGw7r)&?^Q&G1!^h9eLX#V#>%XP60|Sx4
M)78&qol`;+04N5civR!s

literal 0
HcmV?d00001

diff --git a/res/playerRed.png b/res/playerRed.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e9ee094745fa9fdf11310c5cb027675adc2a026
GIT binary patch
literal 427
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmPN3%@Y8P-WaEIiQeaiEBiObAE1aYF-J0b5UwyNotBh
zd1gt5g1e`0KzJjcI0FNtu&0Y-NX4zUvmN;kEAX&1PyJs%^Pcv^hJymr9x|q;=Pd7v
zT0ZA<>8FjaKNRn2s6M5u`SY31a}hb+Cz20X;}lZXG-!Nq5KLw{!^AI;c>56luG{w+
zwGXnFHG3W?Pch>B(U+sf{QgWv(1*S?YV7xC+*Elez3H==M)Y4Vw#jYl6B1dTtp0z<
zg<U4_FT0r)10#n;%0KR&5(XxL1_l-dAm0JPJoCf<+^5gSJ=lR_=ZzQH{4a3`Y)BFp
znen0_EZOU7{d)#hPJNyphxG^Nu8zOYXzjJ)OwMBa0`(u?(hu+nNf}3dVU2J5Ue8?<
z*km01|JaFF^RHNUC$45*vv2lN&1=un-tft9x6u5m*TC@hGxNum#^@ihufGAqkipZ{
K&t;ucLK6UZEuk|2

literal 0
HcmV?d00001

diff --git a/src/game/Options.java b/src/game/Options.java
index 416a83b..c74e0da 100644
--- a/src/game/Options.java
+++ b/src/game/Options.java
@@ -1,10 +1,27 @@
 package game;
 
+import game.graphics.Texture;
+
 public class Options {
 	
 	public static boolean isWASD = true;
+	private static int chosenBallColor = 0;
+	
+	private static Texture[] ballColors = new Texture[] {
+			new Texture("res/playerBlue.png"),
+			new Texture("res/playerRed.png"),
+			new Texture("res/playerGreen.png"),
+	};
 	
 	public Options() {
 		
 	}
+	
+	public static void setBallColor(int newBallColor) {
+		chosenBallColor = newBallColor;
+	}
+	
+	public static Texture getBallTexture() {
+		return ballColors[chosenBallColor];
+	}
 }
diff --git a/src/game/entity/Player.java b/src/game/entity/Player.java
index 2d26113..a4eb802 100644
--- a/src/game/entity/Player.java
+++ b/src/game/entity/Player.java
@@ -41,8 +41,8 @@ public class Player {
 		};
 		
 		mesh = new VertexArray(vertices, indices, tcs);
-		// TODO: More color options?
-		texture = new Texture("res/playerBlue.png");
+
+		setColor();
 		
 		if (Options.isWASD) {
 			playerKeyUp = GLFW.GLFW_KEY_W;
@@ -58,16 +58,32 @@ public class Player {
 	}
 	
 	public void update() {
-		if (Input.keys[playerKeyUp])
+		if (Input.keys[playerKeyUp]) {
 			position.y += 0.1f;
-		if (Input.keys[playerKeyDown])
+		}
+		if (Input.keys[playerKeyDown]) {
 			position.y -= 0.1f;
-		if (Input.keys[playerKeyLeft])
+		}
+		if (Input.keys[playerKeyLeft]) {
 			position.x -= 0.1f;
-		if (Input.keys[playerKeyRight])
+		}
+		if (Input.keys[playerKeyRight]) {
 			position.x += 0.1f;
+		}
 		
 //		System.out.println("At (" + position.x + ", " + position.y + ")");
+		
+		// Just for testing, change color by pressing corresponding number buttons
+		if (Input.keys[GLFW.GLFW_KEY_0]) {
+			Options.setBallColor(0);
+			setColor();
+		} else if (Input.keys[GLFW.GLFW_KEY_1]) {
+			Options.setBallColor(1);
+			setColor();
+		} else if (Input.keys[GLFW.GLFW_KEY_2]) {
+			Options.setBallColor(2);
+			setColor();
+		}
 	}
 	
 	public void render() {
@@ -81,4 +97,8 @@ public class Player {
 	public float getY() {
 		return position.y;
 	}
+	
+	private void setColor() {
+		texture = Options.getBallTexture();
+	}
 }