From 9b779537b6f09bae22bf833017a2dd4026d51f3f Mon Sep 17 00:00:00 2001
From: jancoow <jancokock@gmail.com>
Date: Fri, 19 Jun 2015 12:35:36 +0200
Subject: [PATCH] Some little fixes

---
 control/NetworkHandler.java    |  6 ++--
 model/gameState/MenuState.java |  3 +-
 model/objects/PlayArea.java    | 59 ++++++++++++++++++++--------------
 3 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/control/NetworkHandler.java b/control/NetworkHandler.java
index 6a8675b..b6c49f5 100644
--- a/control/NetworkHandler.java
+++ b/control/NetworkHandler.java
@@ -160,8 +160,10 @@ public class NetworkHandler implements Runnable{
 					jth.onJoystickMoved(JoystickHandler.j);
 				}
 			}else {
-				JoystickHandler.j.setPosition(Position.CENTER);
-				
+				if(JoystickHandler.j.getPos() != Position.CENTER){
+					JoystickHandler.j.setPosition(Position.CENTER);
+					jth.onJoystickMoved(JoystickHandler.j);
+				}
 			}
 		}
 			
diff --git a/model/gameState/MenuState.java b/model/gameState/MenuState.java
index b99a0f2..2cb6f10 100644
--- a/model/gameState/MenuState.java
+++ b/model/gameState/MenuState.java
@@ -30,7 +30,6 @@ import control.GameStateManager.State;
 import control.button.ButtonEvent;
 import control.button.ButtonHandler;
 import control.joystick.Joystick;
-import control.joystick.Joystick.Position;
 import control.joystick.JoystickEvent;
 import control.joystick.JoystickHandler;
 import data.io.SQLConnector;
@@ -280,7 +279,7 @@ public class MenuState extends GameState {
 				
 			}
 			
-			else if(e.getJoystick().getPos() == Position.CENTER)
+			else if(e.getJoystick().getPos() == Joystick.Position.CENTER)
 			{
 				buttons2.clear();
 		 		int instanceNr = 0;
diff --git a/model/objects/PlayArea.java b/model/objects/PlayArea.java
index feec629..6fb418d 100644
--- a/model/objects/PlayArea.java
+++ b/model/objects/PlayArea.java
@@ -28,7 +28,7 @@ public class PlayArea {
 	private Color hitAreaColor,pathColor = null;
 	private VolatileImage background;
 	private boolean hit = false;
-	private int count = 0,maxCount = 100,pathID = -1;
+	private int count = 0,maxCount = 100,pathID = -1, oldPathId = pathID;
 	private Stroke stroke = new BasicStroke(5);
 	
 	private Rectangle2D backgroundPlay = new Rectangle2D.Double(256, 0, 1024, 1024);
@@ -86,24 +86,7 @@ public class PlayArea {
 		paths.add(new Path(outsideHitAreaBorder.xpoints[5] - angleX,outsideHitAreaBorder.ypoints[5] - angleY				,outsideHitAreaBorder.xpoints[5],outsideHitAreaBorder.ypoints[5]));//left	 	-top
 		
 		
-		//drawing into buffer
-		background = Images.initVolatileImage(1280,1024, Transparency.BITMASK);
-		Graphics2D g2 = background.createGraphics();		
-		RenderingHints rh = new RenderingHints(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-	    g2.setRenderingHints(rh);
-//	    g2.setColor(Color.WHITE);
-//	    g2.fillRect(256, 0, 1024, 1024);
-	    Line2D current;	
-		g2.setColor(Color.BLACK);
-		g2.setStroke(stroke);
-		for(int i = 0; i < paths.size(); i++){
-			current = paths.get(i);			
-			g2.draw(current);
-		}
-		g2.draw(innerHitAreaBorder);
-		g2.draw(outsideHitAreaBorder);
-		g2.dispose();
-		background.createGraphics();
+		generateBackground();
 	}	
 	
 	public void draw(Graphics2D g2){		
@@ -115,12 +98,9 @@ public class PlayArea {
 				hit = false;
 			}
 		}		
-		if(pathID >= 0 && pathColor != null){	
-			g2.setColor(new Color(pathColor.getRed(), pathColor.getGreen(), pathColor.getBlue(),50));
-			g2.fill(backgroundPlay);
-			g2.setStroke(stroke);
-			g2.setColor(pathColor);
-			g2.draw(paths.get(pathID));
+		if( oldPathId != pathID){	
+			generateBackground();
+			oldPathId = pathID;
 		}
 	}
 	
@@ -158,4 +138,33 @@ public class PlayArea {
 		this.pathID = pathID;
 		this.pathColor = pathColor;
 	}
+	
+	public void generateBackground(){
+		//drawing into buffer
+		background = Images.initVolatileImage(1280,1024, Transparency.BITMASK);
+		Graphics2D g2 = background.createGraphics();		
+		RenderingHints rh = new RenderingHints(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+	    g2.setRenderingHints(rh);
+ 
+		Line2D current;	
+		g2.setColor(Color.BLACK);
+		g2.setStroke(stroke);
+		for(int i = 0; i < paths.size(); i++){
+			current = paths.get(i);			
+			g2.draw(current);
+		}
+		g2.draw(innerHitAreaBorder);
+		g2.draw(outsideHitAreaBorder);
+		
+	    if(pathID >= 0 && pathColor != null ){
+		    g2.setColor(new Color(pathColor.getRed(), pathColor.getGreen(), pathColor.getBlue(),50));
+			g2.fill(backgroundPlay);
+			g2.setStroke(stroke);
+			g2.setColor(pathColor);
+			g2.draw(paths.get(pathID));
+	    }
+	    
+		g2.dispose();
+		background.createGraphics();
+	}
 }