|
@@ -3,27 +3,27 @@ package model.state;
|
|
|
import java.awt.Graphics2D;
|
|
import java.awt.Graphics2D;
|
|
|
import java.awt.event.KeyEvent;
|
|
import java.awt.event.KeyEvent;
|
|
|
|
|
|
|
|
-import resources.image.Images;
|
|
|
|
|
-import resources.image.Images.ImageType;
|
|
|
|
|
import main.Window;
|
|
import main.Window;
|
|
|
import model.GameStateManager;
|
|
import model.GameStateManager;
|
|
|
import model.objects.DrawObject;
|
|
import model.objects.DrawObject;
|
|
|
|
|
+import model.objects.Player;
|
|
|
|
|
+import resources.image.Images;
|
|
|
|
|
+import resources.image.Images.ImageType;
|
|
|
|
|
|
|
|
public class PlayState extends State{
|
|
public class PlayState extends State{
|
|
|
|
|
|
|
|
- DrawObject player;
|
|
|
|
|
|
|
+ Player player;
|
|
|
|
|
|
|
|
public PlayState(GameStateManager gsm) {
|
|
public PlayState(GameStateManager gsm) {
|
|
|
super("play", gsm);
|
|
super("play", gsm);
|
|
|
|
|
|
|
|
- player = new DrawObject(Images.getImage(ImageType.PLAYER));
|
|
|
|
|
|
|
+ player = new Player(Images.getImage(ImageType.PLAYER1), 60, 500);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/* INIT AND EXIT */
|
|
/* INIT AND EXIT */
|
|
|
@Override
|
|
@Override
|
|
|
public void init() {
|
|
public void init() {
|
|
|
System.out.println("Starting play state");
|
|
System.out.println("Starting play state");
|
|
|
- player.setPosition(0, 0);
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -38,21 +38,13 @@ public class PlayState extends State{
|
|
|
public void update() {
|
|
public void update() {
|
|
|
if(player.getX() + player.getWidth() >= Window.WIDTH)
|
|
if(player.getX() + player.getWidth() >= Window.WIDTH)
|
|
|
{
|
|
{
|
|
|
- player.setX(Window.WIDTH - player.getWidth());
|
|
|
|
|
- }
|
|
|
|
|
- if(player.getY() + player.getHeigth() >= Window.HEIGHT)
|
|
|
|
|
- {
|
|
|
|
|
- player.setY(Window.HEIGHT - player.getHeigth());
|
|
|
|
|
|
|
+ player.setX(Window.WIDTH - player.getWidth()-1);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
if(player.getX() <= 0)
|
|
if(player.getX() <= 0)
|
|
|
{
|
|
{
|
|
|
- player.setX(0);
|
|
|
|
|
- }
|
|
|
|
|
- if(player.getY() <= 0)
|
|
|
|
|
- {
|
|
|
|
|
- player.setY(0);
|
|
|
|
|
|
|
+ player.setX(1);
|
|
|
}
|
|
}
|
|
|
|
|
+ player.update();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -69,16 +61,10 @@ public class PlayState extends State{
|
|
|
switch(e.getKeyCode())
|
|
switch(e.getKeyCode())
|
|
|
{
|
|
{
|
|
|
case KeyEvent.VK_RIGHT:
|
|
case KeyEvent.VK_RIGHT:
|
|
|
- player.setX(player.getX()+5);
|
|
|
|
|
|
|
+ player.setX(player.getX()+10);
|
|
|
break;
|
|
break;
|
|
|
case KeyEvent.VK_LEFT:
|
|
case KeyEvent.VK_LEFT:
|
|
|
- player.setX(player.getX()-5);
|
|
|
|
|
- break;
|
|
|
|
|
- case KeyEvent.VK_UP:
|
|
|
|
|
- player.setY(player.getY()-5);
|
|
|
|
|
- break;
|
|
|
|
|
- case KeyEvent.VK_DOWN:
|
|
|
|
|
- player.setY(player.getY()+5);
|
|
|
|
|
|
|
+ player.setX(player.getX()-10);
|
|
|
break;
|
|
break;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|