try merge, still have gson bug

.gitignore

@@ -48,7 +48,6 @@ local.properties
 
 # Package Files #
 *.jar
-
 #lib
 !lib/*.jar
 

What-does-the-box-say.iml

@@ -8,6 +8,15 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$USER_HOME$/Desktop/gson-2.8.0.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntry type="library" name="gson-2.8.0" level="project" />
   </component>
 </module>

src/Input/MoveAction.java

@@ -10,7 +10,6 @@
  */
 public class MoveAction extends AbstractAction {
     private int direction;
-
     public MoveAction(int dir) {
         direction = dir;
     }

src/Input/RotateAction.java

@@ -0,0 +1,27 @@
+package Input;
+
+import renderer.data.DynamicObjectManager;
+import tcp.tcpClient.RealTcpClient;
+
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+
+/**
+ * Created by TsunglinYang on 2016/12/9.
+ */
+public class RotateAction extends AbstractAction {
+    private int direction;
+    static double degree = 0;
+    public RotateAction(int dir) {
+        this.direction = dir;
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
+        try {
+            //RealTcpClient.getInstance().inputMoves(angle);
+        } catch (Exception e1) {
+            e1.printStackTrace();
+        }
+    }
+}

src/pseudomain/Game.java

@@ -7,6 +7,8 @@
 
 import Input.FetchAction;
 import Input.MoveAction;
+
+import Input.RotateAction;
 import renderer.engine.RenderEngine;
 import tcp.tcpClient.RealTcpClient;
 import udp.update.server.UDP_Server;
@@ -28,6 +30,8 @@ public class Game extends Canvas implements Runnable {
     private final static int TURNSOUTH = 1;
     private final static int TURNNORTH = 2;
     private final static int TURNWEST = 3;
+    private final static int ROTATE_CLOCKWISE = 0;
+    private final static int ROTATE_COUNTER_CLOCKWISE = 1;
     private final static String GET = "get";
 
 
@@ -45,11 +49,17 @@ private void initialKeyBinding() {
         frame.getRootPane().getInputMap(IFW).put(KeyStroke.getKeyStroke("RIGHT"), TURNEAST);
         frame.getRootPane().getInputMap(IFW).put(KeyStroke.getKeyStroke("GET"), GET);
 
+        frame.getRootPane().getInputMap(IFW).put(KeyStroke.getKeyStroke("A"),ROTATE_CLOCKWISE);
+        frame.getRootPane().getInputMap(IFW).put(KeyStroke.getKeyStroke("D"),ROTATE_COUNTER_CLOCKWISE);
+
         frame.getRootPane().getActionMap().put(TURNNORTH, new MoveAction(TURNNORTH));
         frame.getRootPane().getActionMap().put(TURNSOUTH, new MoveAction(TURNSOUTH));
         frame.getRootPane().getActionMap().put(TURNWEST, new MoveAction(TURNWEST));
         frame.getRootPane().getActionMap().put(TURNEAST, new MoveAction(TURNEAST));
         frame.getRootPane().getActionMap().put(GET, new FetchAction());
+
+        frame.getRootPane().getActionMap().put(ROTATE_CLOCKWISE,new RotateAction(ROTATE_CLOCKWISE));
+        frame.getRootPane().getActionMap().put(ROTATE_COUNTER_CLOCKWISE, new RotateAction(ROTATE_COUNTER_CLOCKWISE));
     }
 
     public synchronized void start() {

src/renderer/data/DynamicObjectManager.java

@@ -36,7 +36,7 @@ public void addItem(String name, int index, Boolean shared, int x, int y) {
         this.itemList.add(new Item(name, index, shared, x, y));
     }
 
-    public void updateVirtualCharacter(int clientno, int dir, int speed, int x, int y) {
+    public void updateVirtualCharacter(int clientno, double dir, int speed, int x, int y) {
         Character character = this.characterList.get(clientno);
         character.update(dir, speed, x, y);
     }

src/renderer/data/entity/Character.java

@@ -2,11 +2,11 @@
 
 import pseudomain.Game;
 import renderer.data.DynamicObjectManager;
+import renderer.engine.EntityRenderEngine;
 import renderer.graphics.Sprite;
 
 public class Character extends Entity {
 
-    private int dir;
     private int speed;
     private int clientno;
 
@@ -23,11 +23,18 @@ public void Initialize() {
         sprite = Sprite.PLAYER;
     }
 
-    public void update(int dir, int speed, int x, int y) {
+    public void update(double dir, int speed, int x, int y) {
         this.dir = dir;
         this.speed = speed;
         this.x = x;
         this.y = y;
+        //this.sprite = Sprite.rotate(Sprite.PLAYER,Math.toRadians(dir));
+    }
+
+    public void render(int[] pixels){
+        //TODO: If attack flag == true, draw addition animation
+        //TODO: bullet should have additional class and draw additionally.
+        super.render(pixels);
     }
 
 

src/renderer/data/entity/Entity.java

@@ -2,38 +2,27 @@
 
 import pseudomain.Game;
 import renderer.data.DynamicObjectManager;
+import renderer.engine.EntityRenderEngine;
 import renderer.graphics.Sprite;
 
+import java.util.Map;
 import java.util.Random;
 
 /**
  * Created by tsunglin on 2016/12/2.
  */
 public abstract class Entity {
     public int x, y;
+    protected double dir;
     private boolean removed = false;
     protected Sprite sprite;
+
     public void update() {
 
     }
 
     public void render(int pixels[]) {
-        int offsetX = DynamicObjectManager.getInstance().getVirtualCharacterXY().x - Game.WIDTH/2;
-        int offsetY = DynamicObjectManager.getInstance().getVirtualCharacterXY().y - Game.HEIGHT/2;
-        int xp = this.x;
-        int yp = this.y;
-        xp -= offsetX;
-        yp -= offsetY;
-        for (int y = 0; y < sprite.SIZE; y++) {
-            int ya = y + yp;
-            for (int x = 0; x < sprite.SIZE; x++) {
-                int xa = x + xp;
-                if (xa < -sprite.SIZE || xa >= Game.WIDTH || ya < 0 || ya >= Game.HEIGHT) break;
-                if (xa < 0) xa = 0;
-                int color = sprite.pixels[x + y * sprite.SIZE];
-                if (color != 0xffffffff) pixels[xa + ya * Game.WIDTH] = color;
-            }
-        }
+        EntityRenderEngine.renderEntity(this,pixels);
     }
 
 
@@ -42,6 +31,10 @@ public void remove() {
         removed = true;
     }
 
+    public double getDirection() {
+        return dir;
+    }
+    public Sprite getSprite() {return sprite;}
     public boolean isRemoved() {
         return removed;
     }

src/renderer/data/entity/Item.java

@@ -2,6 +2,7 @@
 
 import pseudomain.Game;
 import renderer.data.DynamicObjectManager;
+import renderer.engine.EntityRenderEngine;
 import renderer.graphics.Sprite;
 
 public class Item extends Entity {
@@ -25,6 +26,10 @@ public void update(boolean shared, int owner){
         this.owner = owner;
     }
 
+    public void render(int[] pixels){
+        super.render(pixels);
+    }
+
     public String getName() {
         return name;
     }

src/renderer/engine/EntityRenderEngine.java

@@ -2,7 +2,9 @@
 
 import pseudomain.Game;
 import renderer.data.DynamicObjectManager;
+import renderer.data.entity.Character;
 import renderer.data.entity.Entity;
+import renderer.data.entity.Item;
 import renderer.graphics.Sprite;
 
 import java.util.List;
@@ -25,5 +27,24 @@ public void render(int pixels[]) {
             e.render(pixels);
         }
     }
+    public static void renderEntity(Entity character, int pixels[]){
+        int offsetX = DynamicObjectManager.getInstance().getVirtualCharacterXY().x - Game.WIDTH / 2;
+        int offsetY = DynamicObjectManager.getInstance().getVirtualCharacterXY().y - Game.HEIGHT / 2;
+        int xp = character.x;
+        int yp = character.y;
+        xp -= offsetX;
+        yp -= offsetY;
+        Sprite s = character.getSprite();
+        for (int y = 0; y < s.SIZE; y++) {
+            int ya = y + yp;
+            for (int x = 0; x < s.SIZE; x++) {
+                int xa = x + xp;
+                if (xa < -s.SIZE || xa >= Game.WIDTH || ya < 0 || ya >= Game.HEIGHT) break;
+                if (xa < 0) xa = 0;
+                int color = s.pixels[x + y * s.SIZE];
+                if (color != 0xffffffff) pixels[xa + ya * Game.WIDTH] = color;
+            }
+        }
+    }
 
 }