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

Code cleanup and some improvements

Browse Source
This commit is contained in:
jancoow
2015-05-28 12:25:42 +02:00
parent fab4ac6ce7
commit ea6895c6c1
6 changed files with 49 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/Window.java
+9 -24
View File
@@ -1,15 +1,11 @@
package main;
import java.awt.GraphicsDevice;
import java.awt.GraphicsEnvironment;
import java.awt.Cursor;
import java.awt.GraphicsDevice;
import java.awt.GraphicsEnvironment;
import java.awt.Point;
import java.awt.Toolkit;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.awt.image.BufferedImage;
@@ -24,11 +20,7 @@ import control.LedHandler;
import control.button.ButtonHandler;
import control.joystick.JoystickHandler;
public class Window extends JFrame {
/**
*
*/
public class Window extends JFrame {
private static final long serialVersionUID = -9222956702898533696L;
public static boolean ON_RASP;
@@ -37,10 +29,7 @@ public class Window extends JFrame {
//Create window
super("Arcade");
setSize(1280, 1024);
Window.ON_RASP = ON_RASP;
// System.out.println(ON_RASP);
//Set window close listener
setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
addWindowListener(new WindowAdapter(){
@@ -49,28 +38,24 @@ public class Window extends JFrame {
}
});
//Create Events
LedHandler led = null;
Window.ON_RASP = ON_RASP;
if(ON_RASP)
{
if(ON_RASP){ //Only on the raspberry pi
led = new LedHandler();
GraphicsEnvironment graphicsEnvironment = GraphicsEnvironment.getLocalGraphicsEnvironment();
GraphicsDevice[] devices = graphicsEnvironment.getScreenDevices();
if (!devices[0].isFullScreenSupported ())
{
if (!devices[0].isFullScreenSupported ()){
throw new UnsupportedOperationException ("Fullscreen mode is unsupported.");
}
devices[0].setFullScreenWindow(this);
//dissapear cursor
}else{
devices[0].setFullScreenWindow(this);
}
//Remove cursor
BufferedImage cursorImg = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB);
Cursor blankCursor = Toolkit.getDefaultToolkit().createCustomCursor(cursorImg, new Point(0, 0), "blank cursor");
this.setCursor(blankCursor);
}
ButtonHandler bth = new ButtonHandler(led);
model/GameModel.java
+3 -3
View File
@@ -12,10 +12,10 @@ import control.button.ButtonHandler;
public class GameModel implements ActionListener{
GameView view;
Timer update;
private GameView view;
private Timer update;
public static Color[] colors = {Color.MAGENTA,Color.RED,Color.GREEN,Color.YELLOW,Color.CYAN,Color.BLUE};
GameStateManager gsm;
private GameStateManager gsm;
public GameModel(GameView view,GameStateManager gsm)
{
model/drawObjects/Bullet.java
+20 -21
View File
@@ -7,8 +7,7 @@ import java.awt.geom.Line2D;
public class Bullet extends DrawObject {
private double speed,lengthOfBullet;
public Line2D bullet;
private Line2D bullet;
private Color c;
public Bullet(double speed,Color c,double lengthOfBullet,int index,Line2D path) {
@@ -16,12 +15,11 @@ public class Bullet extends DrawObject {
this.speed = speed;
this.lengthOfBullet = lengthOfBullet;
this.c = c;
double beginX,beginY,endX,endY;
beginX = path.getX2();
beginY = path.getY2();
endX = beginX;
endY = beginY;
double beginX = path.getX2();
double beginY = path.getY2();
double endX = beginX;
double endY = beginY;
//the 8 richtingen van de octagon
switch(index){
@@ -55,9 +53,6 @@ public class Bullet extends DrawObject {
break;
}
bullet = new Line2D.Double(beginX, beginY, endX, endY);
// System.out.println("Index: "+index);
// System.out.println("X difference: "+(bullet.getX2()-bullet.getX1()));
// System.out.println("Y difference: "+(bullet.getY2()-bullet.getY1()));
}
@Override
@@ -68,13 +63,12 @@ public class Bullet extends DrawObject {
@Override
public void update() {
double x1,x2,y1,y2,yDifference,xDifference;
x1 = bullet.getX1();
x2 = bullet.getX2();
y1 = bullet.getY1();
y2 = bullet.getY2();
yDifference = y2 - y1;
xDifference = x2 - x1;
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;
@@ -91,7 +85,6 @@ public class Bullet extends DrawObject {
x1 += speed;
x2 = x1+lengthOfBullet;
}
bullet.setLine(x1, y1, x2, y2);
}
@@ -101,7 +94,13 @@ public class Bullet extends DrawObject {
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
+1 -1
View File
@@ -78,7 +78,7 @@ public class Enemy extends Person{
* @return, true = raakt, false = mis
*/
public boolean bulletHitMe(Bullet bullet){
if(circle.getBounds2D().intersectsLine(bullet.bullet)){
if(circle.getBounds2D().intersectsLine(bullet.getBullet())){
return true;
}
return false;
model/drawObjects/Player.java
+10 -4
View File
@@ -9,12 +9,15 @@ import java.awt.image.BufferedImage;
public class Player extends Person {
private BufferedImage img;
private AffineTransform transform;
private int lastindex;
public Player(int x, int y){
super(x,y);
img = Images.getImage(Images.ImageType.player2);
width = img.getWidth();
height = img.getHeight();
height = img.getHeight();
lastindex = -10;
}
public void draw(Graphics2D g2){//
@@ -23,9 +26,12 @@ public class Player extends Person {
}
public void update(){
transform = new AffineTransform();
transform.rotate(Math.toRadians(index*45),middlePoint.getX(),middlePoint.getY());
transform.translate(middlePoint.getX() - width/2, middlePoint.getY() - height);
if(lastindex != index){
transform = new AffineTransform();
transform.rotate(Math.toRadians(index*45),middlePoint.getX(),middlePoint.getY());
transform.translate(middlePoint.getX() - width/2, middlePoint.getY() - height);
lastindex = index;
}
}
}
model/gameState/PlayState.java
+6 -13
View File
@@ -37,8 +37,8 @@ public class PlayState extends GameState{
super(gsm);
area = new PlayArea((int) borderRect.getX(),1024,1024,100);
infoPanel = new InfoPanel(0, 0);
enemys = Collections.synchronizedList(new ArrayList<Enemy>());
bullets = Collections.synchronizedList(new ArrayList<Bullet>());
enemys = new ArrayList<Enemy>();
bullets =new ArrayList<Bullet>();
player = new Player(1280-1024+1024/2, 1024/2);
for(int i = 0; i < 8; i++){
Line2D line = area.getLine(i);
@@ -56,19 +56,15 @@ public class PlayState extends GameState{
@Override
public void update() {
player.update();
bulletIterator = bullets.iterator();
while(bulletIterator.hasNext()){
Bullet b = bulletIterator.next();
//als de bullet de border raakt verwijder hem, anders update je hem
if(!borderRect.intersectsLine(b.bullet)){
if(!borderRect.intersectsLine(b.getBullet())){
bulletIterator.remove();
break;
}
else{
}else{
b.update();
}
}
@@ -121,10 +117,8 @@ public class PlayState extends GameState{
area.draw(g2);
if(enemys != null){
if(!enemys.isEmpty()){
for(Enemy enemy : enemys){
enemy.draw(g2);
}
for(Enemy enemy : enemys){
enemy.draw(g2);
}
}
@@ -150,7 +144,6 @@ public class PlayState extends GameState{
@Override
public void buttonReleased(ButtonEvent e) {
// System.out.println("Playstate button released: "+e.getButton().getButtonID());
}
@Override