From 4dbd9699c80863236180e40ec0d18151e04adc78 Mon Sep 17 00:00:00 2001
From: Fiesta87 <jb@pommeret.fr>
Date: Sat, 21 Jan 2017 01:23:38 +0100
Subject: [PATCH] merge

---
 res/textures/perso.png                        | Bin 0 -> 2368 bytes
 src/globalgamejam/game/MainGame.java          |  39 ++++++++++++++++--
 src/globalgamejam/game/Player.java            |  25 +++++++----
 src/globalgamejam/physics/PhysicalEntity.java |  10 +++++
 src/globalgamejam/tiles/Tile.java             |   8 ++--
 5 files changed, 66 insertions(+), 16 deletions(-)
 create mode 100644 res/textures/perso.png

diff --git a/res/textures/perso.png b/res/textures/perso.png
new file mode 100644
index 0000000000000000000000000000000000000000..052aac0b8fb217b84dedab18b10a618884ea98e4
GIT binary patch
literal 2368
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

literal 0
HcmV?d00001

diff --git a/src/globalgamejam/game/MainGame.java b/src/globalgamejam/game/MainGame.java
index d33db98..05331e7 100644
--- a/src/globalgamejam/game/MainGame.java
+++ b/src/globalgamejam/game/MainGame.java
@@ -14,6 +14,8 @@ import java.awt.*;
 import java.util.ArrayList;
 import java.util.Random;
 
+import org.lwjgl.glfw.GLFW;
+
 /**
  * Class created by MrDev023 (Florian RICHER) on 14/01/2017
  */
@@ -38,7 +40,7 @@ public class MainGame extends Game{
 		t.getTransform().scale(10,10,0);
 		tiles.add(t);
 		
-		player1 = new Player(-100, 0);
+		player1 = new Player(200, 150);
 		tiles.add(player1.getTile());
 		
 		rand = new Random();
@@ -63,10 +65,39 @@ public class MainGame extends Game{
 	@Override
 	public void update() {
 	    Camera.transform();
-	  //  player1.setPosition((rand.nextFloat() - 0.5f) * 200f, (rand.nextFloat() - 0.5f) * 150f);
-	  //  player1.applyTransform();
+	    
+	    float xDep = 0, yDep = 0;
+	    if(Input.isKey(GLFW.GLFW_KEY_W)){
+	    	yDep = 10;
+	    }
+	    if(Input.isKey(GLFW.GLFW_KEY_S)){
+	    	yDep = -10;
+	    }
+	    if(Input.isKey(GLFW.GLFW_KEY_A)){
+	    	xDep = -10;
+	    }
+	    if(Input.isKey(GLFW.GLFW_KEY_D)){
+	    	xDep = 10;
+	    }
+	    
+	    if(xDep != 0.0 && yDep != 0.0){
+	    	xDep *= Math.cos(Math.PI / 4);
+	    	yDep *= Math.cos(Math.PI / 4);
+	    }
+	    
+	    player1.move(xDep, yDep);
+	    
+	    if(Input.isKey(GLFW.GLFW_KEY_SPACE)){
+	    	player1.rotate(-5);
+	    }
+	    if(Input.isKey(GLFW.GLFW_KEY_LEFT_ALT)){
+	    	player1.rotate(5);
+	    }
+	    
+	    System.out.println(player1);
+	    
 	    for(GUI g : guis)g.update();
-
+	    
 	}
 
 	@Override
diff --git a/src/globalgamejam/game/Player.java b/src/globalgamejam/game/Player.java
index 19332e3..fe8c093 100644
--- a/src/globalgamejam/game/Player.java
+++ b/src/globalgamejam/game/Player.java
@@ -20,7 +20,7 @@ public class Player extends PhysicalEntity {
 	
 	public Player(float x, float y){
 		super(x, y, 100, 0, 0, 10);
-		this.tile = new PlayerTile("res/textures/default.png", -250, 0);
+		this.tile = new PlayerTile("res/textures/perso.png", x, y);
 		
 		this.longueurBalai = 100;
 		this.brosse = new PhysicalEntity(x, y + this.longueurBalai, 20, 0, 0, 0);
@@ -30,6 +30,14 @@ public class Player extends PhysicalEntity {
 		return this.tile;
 	}
 	
+	public void move(float x, float y){
+		this.addPosition(x, y);
+		this.tile.setPosition(new Vector2f(this.x, this.y));
+		this.tile.applyTransform();
+		
+		this.brosse.addPosition(x, y);
+	}
+	
 	public void rotate(float angleRotation){
 		this.angle += angleRotation;
 		this.angle %= 360;
@@ -38,6 +46,7 @@ public class Player extends PhysicalEntity {
 		}
 		
 		this.tile.setRotation(this.angle);
+		this.tile.applyTransform();
 		
 		float angleRad = (float)(this.angle * (Math.PI / 180));
 		
@@ -51,6 +60,11 @@ public class Player extends PhysicalEntity {
 		return this.brosse.collideWithSquareHitBox(entity);
 	}
 	
+	@Override
+	public String toString(){
+		return this.brosse.toString();
+	}
+	
 	private class PlayerTile extends Tile {
 		
 		public PlayerTile(String texturePath, float x, float y){
@@ -58,16 +72,11 @@ public class Player extends PhysicalEntity {
 			
 			this.setTexture(Texture.loadTexture(texturePath));
 			
-			this.setPosition(x, y);
+			this.setPosition(new Vector2f(x, y));
 			
-			this.setScale(new Vector2f(50, 50));
+			this.setScale(new Vector2f(this.getTexture().width, this.getTexture().height));
 			
 			this.applyTransform();
 		}
-		
-		public void setPosition(float x, float y){
-			this.setPosition(new Vector2f(x, y));
-			
-		}
 	}
 }
diff --git a/src/globalgamejam/physics/PhysicalEntity.java b/src/globalgamejam/physics/PhysicalEntity.java
index abfd803..87d8b54 100644
--- a/src/globalgamejam/physics/PhysicalEntity.java
+++ b/src/globalgamejam/physics/PhysicalEntity.java
@@ -67,4 +67,14 @@ public class PhysicalEntity {
 		this.x = x;
 		this.y = y;
 	}
+	
+	public void addPosition(float x, float y){
+		this.x += x;
+		this.y += y;
+	}
+	
+	@Override
+	public String toString(){
+		return this.x + " " + this.y;
+	}
 }
diff --git a/src/globalgamejam/tiles/Tile.java b/src/globalgamejam/tiles/Tile.java
index dbd6e63..6121961 100644
--- a/src/globalgamejam/tiles/Tile.java
+++ b/src/globalgamejam/tiles/Tile.java
@@ -33,10 +33,10 @@ public abstract class Tile {
         this.color = Color4f.WHITE;
         this.vbo = GL15.glGenBuffers();
         float[] a = new float[]{
-                -.5f,-.5f,        0.0f,0.0f,
-                .5f,-.5f,         1.0f,0.0f,
-                .5f,.5f,          1.0f,1.0f,
-                -.5f,.5f,         0.0f,1.0f
+                -.5f,-.5f,        0.0f,1.0f,
+                .5f,-.5f,         1.0f,1.0f,
+                .5f,.5f,          1.0f,0.0f,
+                -.5f,.5f,         0.0f,0.0f
         };
         FloatBuffer buffer = BufferUtils.createFloatBuffer(a.length);
         buffer.put(a).flip();