|
@@ -1,5 +1,6 @@
|
|
|
package model.state;
|
|
package model.state;
|
|
|
|
|
|
|
|
|
|
+import java.awt.Color;
|
|
|
import java.awt.Graphics2D;
|
|
import java.awt.Graphics2D;
|
|
|
import java.awt.event.KeyEvent;
|
|
import java.awt.event.KeyEvent;
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
@@ -7,6 +8,7 @@ import java.util.Iterator;
|
|
|
|
|
|
|
|
import main.Window;
|
|
import main.Window;
|
|
|
import model.GameStateManager;
|
|
import model.GameStateManager;
|
|
|
|
|
+import model.objects.Ball;
|
|
|
import model.objects.Player;
|
|
import model.objects.Player;
|
|
|
import model.objects.ShootingLine;
|
|
import model.objects.ShootingLine;
|
|
|
import resources.image.Images;
|
|
import resources.image.Images;
|
|
@@ -16,13 +18,15 @@ public class PlayState extends State{
|
|
|
|
|
|
|
|
Player player;
|
|
Player player;
|
|
|
ArrayList<ShootingLine> lines;
|
|
ArrayList<ShootingLine> lines;
|
|
|
-
|
|
|
|
|
|
|
+ ArrayList<Ball> balls;
|
|
|
|
|
|
|
|
public PlayState(GameStateManager gsm) {
|
|
public PlayState(GameStateManager gsm) {
|
|
|
super("play", gsm);
|
|
super("play", gsm);
|
|
|
|
|
|
|
|
player = new Player(Images.getImage(ImageType.PLAYER1), 40, 550);
|
|
player = new Player(Images.getImage(ImageType.PLAYER1), 40, 550);
|
|
|
lines = new ArrayList<ShootingLine>();
|
|
lines = new ArrayList<ShootingLine>();
|
|
|
|
|
+ balls = new ArrayList<Ball>();
|
|
|
|
|
+ balls.add(new Ball(5, 10, Color.red, 50, 50));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/* INIT AND EXIT */
|
|
/* INIT AND EXIT */
|
|
@@ -70,6 +74,9 @@ public class PlayState extends State{
|
|
|
for(ShootingLine l:lines){
|
|
for(ShootingLine l:lines){
|
|
|
l.paint(g2d);
|
|
l.paint(g2d);
|
|
|
}
|
|
}
|
|
|
|
|
+ for(Ball b: balls){
|
|
|
|
|
+ b.paint(g2d);
|
|
|
|
|
+ }
|
|
|
player.paint(g2d);
|
|
player.paint(g2d);
|
|
|
}
|
|
}
|
|
|
|
|
|