Avans/Arcade
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some little fixes

Browse Source
This commit is contained in:
jancoow
2015-06-19 12:35:48 +02:00
parent 8b18077fff
commit 9b779537b6
3 changed files with 39 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
control/NetworkHandler.java
+4 -2
View File
@@ -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);
}
}
}
model/gameState/MenuState.java
+1 -2
View File
@@ -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;
model/objects/PlayArea.java
+34 -25
View File
@@ -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();
}
}