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

Last fix

Browse Source
This commit is contained in:
jancoow
2015-06-02 11:26:46 +02:00
parent 0e62a2e2b0
commit ab827600b1
6 changed files with 18 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
model/drawObjects/Bullet.java
-106
View File
@@ -1,106 +0,0 @@
package model.drawObjects;
import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.geom.Line2D;
public class Bullet extends DrawObject {
private double speed,lengthOfBullet;
private Line2D bullet;
private Color c;
public Bullet(double speed,Color c,double lengthOfBullet,int index,Line2D path) {
super();
this.speed = speed;
this.lengthOfBullet = lengthOfBullet;
this.c = c;
double beginX = path.getX2();
double beginY = path.getY2();
double endX = beginX;
double endY = beginY;
//the 8 richtingen van de octagon
switch(index){
case 0:
endY = beginY - lengthOfBullet;
break;
case 1:
endX = beginX + lengthOfBullet;
endY = beginY - lengthOfBullet;
break;
case 2:
endX = beginX + lengthOfBullet;
break;
case 3:
endX = beginX + lengthOfBullet;
endY = beginY + lengthOfBullet;
break;
case 4:
endY = beginY + lengthOfBullet;
break;
case 5:
endX = beginX - lengthOfBullet;
endY = beginY + lengthOfBullet;
break;
case 6:
endX = beginX - lengthOfBullet;
break;
case 7:
endX = beginX - lengthOfBullet;
endY = beginY - lengthOfBullet;
break;
}
bullet = new Line2D.Double(beginX, beginY, endX, endY);
}
@Override
public void draw(Graphics2D g2) {
g2.setPaint(c);
g2.draw(bullet);
}
@Override
public void update() {
double x1 = bullet.getX1();
double x2 = bullet.getX2();
double y1 = bullet.getY1();
double y2 = bullet.getY2();
double yDifference = y2 - y1;
double xDifference = x2 - x1;
if(yDifference < 0.0){
y1 -= speed;
y2 = y1-lengthOfBullet;
}else if(yDifference > 0.0){
y1 += speed;
y2 = y1+lengthOfBullet;
}
if(xDifference < 0.0){
x1 -= speed;
x2 = x1-lengthOfBullet;
}else if(xDifference > 0.0){
x1 += speed;
x2 = x1+lengthOfBullet;
}
bullet.setLine(x1, y1, x2, y2);
}
public Color getColor() {
return c;
}
public void setColor(Color c) {
this.c = c;
}
public Line2D getBullet() {
return bullet;
}
public void setBullet(Line2D bullet) {
this.bullet = bullet;
}
}
model/drawObjects/Enemy.java
-99
View File
@@ -1,99 +0,0 @@
package model.drawObjects;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics2D;
import java.awt.geom.Ellipse2D;
import java.awt.geom.Line2D;
import java.awt.geom.Point2D;
public class Enemy extends Person{
private Color color;
private Ellipse2D.Double circle;
private Point2D beginPoint;
private Dimension size;
private double xSpeed,ySpeed;
/**
*
* @param path, the path the player is walking on.
* @param c, the color of the enemy
* @param size, the size of the enemy
* @param stepsToFinishTheMiddle, the speed to finish the middle octagon
*/
public Enemy(Line2D path,Color c,int size,double stepsToFinishTheMiddle) {
super(path.getX1()-size/2,path.getY1()-size/2);
beginPoint = new Point2D.Double(middlePoint.getX(),middlePoint.getY());
this.size = new Dimension(size,size);
color = c;
circle = new Ellipse2D.Double(middlePoint.getX(),middlePoint.getY(),this.size.width,this.size.height);
index = 0;
xSpeed = (path.getX2() - circle.getCenterX())/stepsToFinishTheMiddle;
ySpeed = (path.getY2() - circle.getCenterY())/stepsToFinishTheMiddle;
}
@Override
public void draw(Graphics2D g2) {
g2.setPaint(color);
g2.fill(circle);
}
private void moveTowardsPlayer()
{
double newX, newY;
newX = index*xSpeed+beginPoint.getX();
newY = index*ySpeed+beginPoint.getY();
index++;
middlePoint.setLocation(newX, newY);
circle.setFrame(middlePoint, size);
}
@Override
public void update() {
moveTowardsPlayer();
}
public Color getColor() {
return color;
}
public void setColor(Color color) {
this.color = color;
}
public Ellipse2D.Double getCircle() {
return circle;
}
public void setCircle(Ellipse2D.Double circle) {
this.circle = circle;
}
/**
* Deze methode kijkt of de enemy is geraakt door een bullet
* @param bullet, een kogel om te kijken of hij deze enemy heeft geraakt
* @return, true = raakt, false = mis
*/
public boolean bulletHitMe(Bullet bullet){
if(circle.getBounds2D().intersectsLine(bullet.getBullet())){
return true;
}
return false;
}
/**
* Hier kijk je of de bullet de juiste kleur heeft, om de enemy te vermoorden
* @param bullet, de kogel om te kije of hij de zelfde kleur heeft als deze enemy
* @return,true = zelfde kleur, false = andere kleur
*/
public boolean ColorHitMe(Bullet bullet){
if(this.color.equals(bullet.getColor())){
return true;
}
return false;
}
}
model/drawObjects/Person.java
-13
View File
@@ -1,13 +0,0 @@
package model.drawObjects;
import java.awt.geom.Point2D;
public abstract class Person extends DrawObject {
protected Point2D middlePoint;
public Person(double x, double y) {
super();
middlePoint = new Point2D.Double(x, y);
}
}
model/drawObjects/Player.java
+4 -2
View File
@@ -4,20 +4,22 @@ import image.Images;
import java.awt.Graphics2D;
import java.awt.geom.AffineTransform;
import java.awt.geom.Point2D;
import java.awt.image.BufferedImage;
public class Player extends Person {
public class Player extends DrawObject {
private BufferedImage img;
private AffineTransform transform;
private int lastindex;
private Point2D middlePoint;
public Player(int x, int y){
super(x,y);
img = Images.getImage(Images.ImageType.player2);
width = img.getWidth();
height = img.getHeight();
lastindex = -10;
middlePoint = new Point2D.Double(x,y);
}
public void draw(Graphics2D g2){//
model/gameState/MenuState.java
+9 -1
View File
@@ -1,5 +1,9 @@
package model.gameState;
import image.Images;
import image.Images.ImageType;
import java.awt.Color;
import java.awt.Graphics2D;
import java.util.ArrayList;
@@ -8,6 +12,7 @@ import model.objects.MenuButton;
import control.GameStateManager;
import control.GameStateManager.State;
import control.button.ButtonEvent;
import control.joystick.Joystick;
import control.joystick.JoystickEvent;
public class MenuState extends GameState {
@@ -15,7 +20,10 @@ public class MenuState extends GameState {
int frame = 0;
int maxFrames = 2560;
int animationcounter;
ArrayList<MenuButton> buttons;
int selected;
public MenuState(GameStateManager gsm, SongHandler sh) {
super(gsm, sh);
buttons = new ArrayList<MenuButton>();
model/gameState/PlayState.java
+5 -4
View File
@@ -6,6 +6,7 @@ import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.Stroke;
import java.awt.geom.Area;
import java.awt.geom.Line2D;
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
@@ -14,6 +15,7 @@ import java.util.Iterator;
import java.util.List;
import model.GameModel;
import model.SongHandler;
import model.drawObjects.Player;
import model.drawObjects.enemy.Enemy;
import model.objects.InfoPanel;
@@ -36,12 +38,11 @@ public class PlayState extends GameState{
public static int currentScore = 0;
public static int lifePoints = 100;
public PlayState(GameStateManager gsm) {
super(gsm);
area = new PlayArea(borderRect.getX(),1024,1024,150);
public PlayState(GameStateManager gsm, SongHandler sh) {
super(gsm,sh);
infoPanel = new InfoPanel(0, 0);
enemys = new ArrayList<Enemy>();
area = new PlayArea(256, 1024, 1024, 100);
for(int index = 0; index < 2; index++){
Line2D path = area.paths.get(index);
addEnemy(index, GameModel.colors[index % 6], path.getP1(),path.getP2());