Hochschulprojekte
/
SpaceScooter
0
0
Fork 0
Code Issues Pull Requests Activity

Merge branch 'master' of github.com:teamteamteam/SpaceScooter

This commit is contained in:
lubiana 2014-11-06 19:02:23 +01:00
parent 6f2857946d c4ab7c3530
commit 090b7ec5b3
10 changed files with 42 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/de/teamteamteam/spacescooter/background/item/Items.java
View File

@ -1,6 +1,6 @@
package de.teamteamteam.spacescooter.background.item; package de.teamteamteam.spacescooter.background.item;
import java.util.LinkedList; import java.util.List;
import de.teamteamteam.spacescooter.entity.Entity; import de.teamteamteam.spacescooter.entity.Entity;
import de.teamteamteam.spacescooter.entity.LivingEntity; import de.teamteamteam.spacescooter.entity.LivingEntity;
@ -20,7 +20,7 @@ public abstract class Items extends LivingEntity{
this.remove(); this.remove();
}; };
if(!this.isAlive()){ if(!this.isAlive()){
LinkedList<Entity> entities = Screen.currentScreen.getEntities(); List<Entity> entities = Screen.currentScreen.getEntities();
for (Entity e : entities) { for (Entity e : entities) {
if(e instanceof Player){ if(e instanceof Player){
itemCollected((Player) e); itemCollected((Player) e);

4
src/de/teamteamteam/spacescooter/entity/HealthBar.java
View File

@ -2,7 +2,7 @@ package de.teamteamteam.spacescooter.entity;
import java.awt.Color; import java.awt.Color;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.util.LinkedList; import java.util.List;
import de.teamteamteam.spacescooter.screen.Screen; import de.teamteamteam.spacescooter.screen.Screen;
@ -18,7 +18,7 @@ public class HealthBar extends Entity {
} }
public void paint(Graphics2D g) { public void paint(Graphics2D g) {
LinkedList<Entity> entities = Screen.currentScreen.getEntities(); List<Entity> entities = Screen.currentScreen.getEntities();
for (Entity e : entities) { for (Entity e : entities) {
if(e instanceof Player){ if(e instanceof Player){
this.width = ((Player) e).getHealthPoints(); this.width = ((Player) e).getHealthPoints();

4
src/de/teamteamteam/spacescooter/entity/LivingEntity.java
View File

@ -1,7 +1,7 @@
package de.teamteamteam.spacescooter.entity; package de.teamteamteam.spacescooter.entity;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.util.LinkedList; import java.util.List;
import de.teamteamteam.spacescooter.background.item.Items; import de.teamteamteam.spacescooter.background.item.Items;
import de.teamteamteam.spacescooter.entity.enemy.Enemy; import de.teamteamteam.spacescooter.entity.enemy.Enemy;
@ -25,7 +25,7 @@ public abstract class LivingEntity extends Entity implements Collidable {
public void update() { public void update() {
if(!(this instanceof ShootingEntity)) return; //Only check collisions for ShootingEntity. if(!(this instanceof ShootingEntity)) return; //Only check collisions for ShootingEntity.
LinkedList<Entity> entities = Screen.currentScreen.getEntities(); List<Entity> entities = Screen.currentScreen.getEntities();
for (Entity e : entities) { for (Entity e : entities) {
if (e.equals(this)) //Do not collide with myself! if (e.equals(this)) //Do not collide with myself!
continue; continue;

4
src/de/teamteamteam/spacescooter/entity/enemy/EnemyThree.java
View File

@ -1,7 +1,7 @@
package de.teamteamteam.spacescooter.entity.enemy; package de.teamteamteam.spacescooter.entity.enemy;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedList; import java.util.List;
import java.util.Random; import java.util.Random;
import de.teamteamteam.spacescooter.background.item.Items; import de.teamteamteam.spacescooter.background.item.Items;
@ -41,7 +41,7 @@ public class EnemyThree extends Enemy{
if(random.nextInt(10) < 5) Items.create(getX(), getY()); if(random.nextInt(10) < 5) Items.create(getX(), getY());
new EnemyThree(0, 0); new EnemyThree(0, 0);
} }
LinkedList<Entity> list = Screen.currentScreen.getEntities(); List<Entity> list = Screen.currentScreen.getEntities();
Iterator<Entity> i = list.iterator(); Iterator<Entity> i = list.iterator();
while (i.hasNext()) { while (i.hasNext()) {
Entity entity = i.next(); Entity entity = i.next();

6
src/de/teamteamteam/spacescooter/screen/GameOverScreen.java
View File

@ -6,7 +6,7 @@ import java.awt.Graphics2D;
import java.awt.event.KeyEvent; import java.awt.event.KeyEvent;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedList; import java.util.List;
import de.teamteamteam.spacescooter.control.Keyboard; import de.teamteamteam.spacescooter.control.Keyboard;
import de.teamteamteam.spacescooter.entity.Entity; import de.teamteamteam.spacescooter.entity.Entity;
@ -38,7 +38,7 @@ public class GameOverScreen extends Screen {
@Override @Override
protected void paint(Graphics2D g) { protected void paint(Graphics2D g) {
g.drawImage(this.img, 0, 0, null); g.drawImage(this.img, 0, 0, null);
LinkedList<Entity> list = this.getEntities(); List<Entity> list = this.getEntities();
Iterator<Entity> i = list.iterator(); Iterator<Entity> i = list.iterator();
while (i.hasNext()) { while (i.hasNext()) {
i.next().paint(g); i.next().paint(g);
@ -54,7 +54,7 @@ public class GameOverScreen extends Screen {
@Override @Override
protected void update() { protected void update() {
LinkedList<Entity> list = this.getEntities(); List<Entity> list = this.getEntities();
Iterator<Entity> i = list.iterator(); Iterator<Entity> i = list.iterator();
while (i.hasNext()) { while (i.hasNext()) {
i.next().update(); i.next().update();

6
src/de/teamteamteam/spacescooter/screen/GamePausedScreen.java
View File

@ -6,7 +6,7 @@ import java.awt.Graphics2D;
import java.awt.event.KeyEvent; import java.awt.event.KeyEvent;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedList; import java.util.List;
import de.teamteamteam.spacescooter.control.Keyboard; import de.teamteamteam.spacescooter.control.Keyboard;
import de.teamteamteam.spacescooter.entity.Entity; import de.teamteamteam.spacescooter.entity.Entity;
@ -38,7 +38,7 @@ public class GamePausedScreen extends Screen {
@Override @Override
protected void paint(Graphics2D g) { protected void paint(Graphics2D g) {
g.drawImage(this.img, 0, 0, null); g.drawImage(this.img, 0, 0, null);
LinkedList<Entity> list = this.getEntities(); List<Entity> list = this.getEntities();
Iterator<Entity> i = list.iterator(); Iterator<Entity> i = list.iterator();
while (i.hasNext()) { while (i.hasNext()) {
i.next().paint(g); i.next().paint(g);
@ -54,7 +54,7 @@ public class GamePausedScreen extends Screen {
@Override @Override
protected void update() { protected void update() {
LinkedList<Entity> list = this.getEntities(); List<Entity> list = this.getEntities();
Iterator<Entity> i = list.iterator(); Iterator<Entity> i = list.iterator();
while (i.hasNext()) { while (i.hasNext()) {
i.next().update(); i.next().update();

6
src/de/teamteamteam/spacescooter/screen/GameScreen.java
View File

@ -5,7 +5,7 @@ import java.awt.Point;
import java.awt.event.KeyEvent; import java.awt.event.KeyEvent;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedList; import java.util.List;
import de.teamteamteam.spacescooter.background.StarBackground; import de.teamteamteam.spacescooter.background.StarBackground;
import de.teamteamteam.spacescooter.background.item.ItemChance; import de.teamteamteam.spacescooter.background.item.ItemChance;
@ -36,7 +36,7 @@ public class GameScreen extends Screen {
@Override @Override
protected void paint(Graphics2D g) { protected void paint(Graphics2D g) {
LinkedList<Entity> list = this.getEntities(); List<Entity> list = this.getEntities();
Iterator<Entity> i = list.iterator(); Iterator<Entity> i = list.iterator();
while (i.hasNext()) { while (i.hasNext()) {
i.next().paint(g); i.next().paint(g);
@ -45,7 +45,7 @@ public class GameScreen extends Screen {
@Override @Override
protected void update() { protected void update() {
LinkedList<Entity> list = this.getEntities(); List<Entity> list = this.getEntities();
Iterator<Entity> i = list.iterator(); Iterator<Entity> i = list.iterator();
while (i.hasNext()) { while (i.hasNext()) {
i.next().update(); i.next().update();

6
src/de/teamteamteam/spacescooter/screen/MainMenuScreen.java
View File

@ -6,7 +6,7 @@ import java.awt.Graphics2D;
import java.awt.event.KeyEvent; import java.awt.event.KeyEvent;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedList; import java.util.List;
import de.teamteamteam.spacescooter.background.StarBackground; import de.teamteamteam.spacescooter.background.StarBackground;
import de.teamteamteam.spacescooter.control.Keyboard; import de.teamteamteam.spacescooter.control.Keyboard;
@ -40,7 +40,7 @@ public class MainMenuScreen extends Screen {
@Override @Override
public void paint(Graphics2D g) { public void paint(Graphics2D g) {
LinkedList<Entity> list = this.getEntities(); List<Entity> list = this.getEntities();
Iterator<Entity> i = list.iterator(); Iterator<Entity> i = list.iterator();
while (i.hasNext()) { while (i.hasNext()) {
i.next().paint(g); i.next().paint(g);
@ -59,7 +59,7 @@ public class MainMenuScreen extends Screen {
@Override @Override
public void update() { public void update() {
LinkedList<Entity> list = this.getEntities(); List<Entity> list = this.getEntities();
Iterator<Entity> i = list.iterator(); Iterator<Entity> i = list.iterator();
while (i.hasNext()) { while (i.hasNext()) {
i.next().update(); i.next().update();

5
src/de/teamteamteam/spacescooter/screen/Screen.java
View File

@ -2,6 +2,7 @@ package de.teamteamteam.spacescooter.screen;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List;
import de.teamteamteam.spacescooter.entity.Entity; import de.teamteamteam.spacescooter.entity.Entity;
@ -32,7 +33,7 @@ public abstract class Screen {
/** /**
* List of entities this screen is taking care of * List of entities this screen is taking care of
*/ */
protected LinkedList<Entity> entities; protected List<Entity> entities;
/** /**
* Initialize parent, overlay and the Entity list * Initialize parent, overlay and the Entity list
@ -61,7 +62,7 @@ public abstract class Screen {
this.entities.remove(e); this.entities.remove(e);
} }
public LinkedList<Entity> getEntities() { public List<Entity> getEntities() {
return new LinkedList<Entity>(this.entities); return new LinkedList<Entity>(this.entities);
} }

28
src/de/teamteamteam/spacescooter/thread/PaintThread.java
View File

@ -5,23 +5,33 @@ import java.awt.EventQueue;
import de.teamteamteam.spacescooter.gui.GameFrame; import de.teamteamteam.spacescooter.gui.GameFrame;
/** /**
* This thread triggers about 60 redraws per second. * This thread triggers the redrawing on the GameFrame.
*/ */
public class PaintThread extends TimedThread { public class PaintThread extends TimedThread {
private GameFrame gf; /**
* Runnable that is passed to the EventQueue for later invocation.
*/
private final Runnable paintRunnable;
/**
* Constructor. Sets the name of the Thread and creates the paintRunnable.
*/
public PaintThread(GameFrame gf) { public PaintThread(GameFrame gf) {
this.gf = gf; final GameFrame gameFrame = gf;
this.setName("PaintThread"); this.setName("PaintThread");
this.paintRunnable = new Runnable() {
public void run() {
gameFrame.draw();
}
};
} }
/**
* The work method invoked by the TimingThread.
*/
public void work() { public void work() {
//Trigger redrawing the things. Important: AWT-Context needed here! //Trigger redrawing the things. Important: AWT-Context needed here!
EventQueue.invokeLater(new Runnable() { EventQueue.invokeLater(this.paintRunnable);
public void run() {
gf.draw();
}
});
} }
} }