From 7dcd10686a65a3ea89a798ebc296010951d7b756 Mon Sep 17 00:00:00 2001
From: tpg13002 <tanner.george@uconn.edu>
Date: Wed, 13 Apr 2016 16:00:53 -0400
Subject: [PATCH] Added Player class

---
 src/main/Game.java   | 16 ++++++++++++----
 src/main/Player.java | 29 +++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 src/main/Player.java

diff --git a/src/main/Game.java b/src/main/Game.java
index 58a8222..45cba90 100644
--- a/src/main/Game.java
+++ b/src/main/Game.java
@@ -1,5 +1,6 @@
 package main;
 
+
 import java.awt.Canvas;
 import java.awt.Dimension;
 import java.awt.Graphics;
@@ -24,7 +25,8 @@ public class Game extends Canvas implements Runnable{
 	private BufferedImage spriteSheet =  null;
 	
 	
-	private BufferedImage player;
+	//private BufferedImage player;
+	private Player p;
 	
 	public void init()
 	{
@@ -37,7 +39,8 @@ public class Game extends Canvas implements Runnable{
 			e.printStackTrace();
 		}
 		SpriteSheet ss = new SpriteSheet(spriteSheet);
-		player = ss.grabimage(1, 1, 16, 16);
+		//player = ss.grabimage(1, 1, 16, 16);
+		p = new Player(200, 200, this);
 	}
 	
 	
@@ -114,7 +117,7 @@ public class Game extends Canvas implements Runnable{
 
 
 	private void tick() {
-		
+		p.tick();
 	}
 	private void render(){
 		BufferStrategy bufferstrat = this.getBufferStrategy();
@@ -126,11 +129,16 @@ public class Game extends Canvas implements Runnable{
 		/////////////////
 		g.drawImage(image, 0, 0, getWidth(), getHeight(), this);
 		
-		g.drawImage(player, 100, 100, this);
+		//g.drawImage(player, 100, 100, this);
+		p.render(g);
 		
 		/////////////////
 		g.dispose();
 		bufferstrat.show();
 		
 	}
+	
+	public BufferedImage getSpriteSheet(){
+		return spriteSheet;
+	}
 }
diff --git a/src/main/Player.java b/src/main/Player.java
new file mode 100644
index 0000000..65b2eb0
--- /dev/null
+++ b/src/main/Player.java
@@ -0,0 +1,29 @@
+package main;
+import java.awt.Graphics;
+import java.awt.image.BufferedImage;
+
+public class Player {
+	
+	private double x;
+	private double y;
+	
+	private BufferedImage player;
+	
+	public Player(double x, double y, Game game){
+		this.x = x;
+		this.y = y;
+		
+		SpriteSheet ss = new SpriteSheet(game.getSpriteSheet());
+		
+		player = ss.grabimage(1 ,1, 32, 32);
+	}
+	
+	public void tick(){
+		x++;
+	}
+	
+	public void render(Graphics g){
+		g.drawImage(player, (int)x, (int)y, null);
+	}
+
+}