Commit 8c5a57f4 authored by Turid Cecilie Dahl's avatar Turid Cecilie Dahl
Browse files

Merge branch '104-revert-to-pausecircles' into 'dev'

Resolve "Revert to PauseCircles"

Closes #104

See merge request tobiasio/progark-gruppe-3!111
parents 4333456d 13836cf0
...@@ -9,12 +9,12 @@ import com.gameware.game.sprites.Sprite; ...@@ -9,12 +9,12 @@ import com.gameware.game.sprites.Sprite;
// These are the animated circles that can be seen in the background of the pause state // These are the animated circles that can be seen in the background of the pause state
public class PauseBackgroundCircle extends Sprite { public class PauseCircle extends Sprite {
private int radius; private int radius;
private Vector3 velocity; private Vector3 velocity;
private ShapeRenderer sr; private ShapeRenderer sr;
public PauseBackgroundCircle(){ public PauseCircle(){
this.position = new Vector3(); this.position = new Vector3();
this.velocity = new Vector3(); this.velocity = new Vector3();
......
...@@ -7,7 +7,7 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch; ...@@ -7,7 +7,7 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.gameware.game.GameWare; import com.gameware.game.GameWare;
import com.gameware.game.sprites.pauseStateSprites.ConfirmationBox; import com.gameware.game.sprites.pauseStateSprites.ConfirmationBox;
import com.gameware.game.sprites.LoadingText; import com.gameware.game.sprites.LoadingText;
import com.gameware.game.sprites.pauseStateSprites.PauseBackgroundCircle; import com.gameware.game.sprites.pauseStateSprites.PauseCircle;
import com.gameware.game.sprites.pauseStateSprites.PauseMenuButton; import com.gameware.game.sprites.pauseStateSprites.PauseMenuButton;
import com.gameware.game.states.games.PlayStateUnion; import com.gameware.game.states.games.PlayStateUnion;
...@@ -42,7 +42,7 @@ public class PauseState extends State { ...@@ -42,7 +42,7 @@ public class PauseState extends State {
private boolean needsConfirmation; private boolean needsConfirmation;
// Widgets // Widgets
private List<PauseBackgroundCircle> pauseBackgroundCircles; private List<PauseCircle> pauseBackgroundCircles;
private ConfirmationBox confirmationBox; private ConfirmationBox confirmationBox;
private PauseMenuButton resumeButton; private PauseMenuButton resumeButton;
private PauseMenuButton exitButton; private PauseMenuButton exitButton;
...@@ -63,7 +63,7 @@ public class PauseState extends State { ...@@ -63,7 +63,7 @@ public class PauseState extends State {
this.countdownDurationLeft = 3f; this.countdownDurationLeft = 3f;
this.countdownStarted = false; this.countdownStarted = false;
this.pauseBackgroundCircles = new ArrayList<PauseBackgroundCircle>(); this.pauseBackgroundCircles = new ArrayList<PauseCircle>();
this.pausedGame = pausedGame; this.pausedGame = pausedGame;
this.originalFontColor = new Color(this.pausedGame.getFontColor()); this.originalFontColor = new Color(this.pausedGame.getFontColor());
...@@ -85,7 +85,7 @@ public class PauseState extends State { ...@@ -85,7 +85,7 @@ public class PauseState extends State {
for(int i = 0; i<25; i++){ for(int i = 0; i<25; i++){
this.pauseBackgroundCircles.add(new PauseBackgroundCircle()); this.pauseBackgroundCircles.add(new PauseCircle());
} }
} }
...@@ -157,7 +157,7 @@ public class PauseState extends State { ...@@ -157,7 +157,7 @@ public class PauseState extends State {
} }
} }
for(PauseBackgroundCircle pc : this.pauseBackgroundCircles){ for(PauseCircle pc : this.pauseBackgroundCircles){
pc.update(dt); pc.update(dt);
} }
} }
...@@ -173,7 +173,7 @@ public class PauseState extends State { ...@@ -173,7 +173,7 @@ public class PauseState extends State {
// Animated circles // Animated circles
for(PauseBackgroundCircle pc : pauseBackgroundCircles){ for(PauseCircle pc : pauseBackgroundCircles){
pc.draw(sb); pc.draw(sb);
} }
...@@ -213,7 +213,7 @@ public class PauseState extends State { ...@@ -213,7 +213,7 @@ public class PauseState extends State {
@Override @Override
public void dispose() { public void dispose() {
for(PauseBackgroundCircle pc : pauseBackgroundCircles){ for(PauseCircle pc : pauseBackgroundCircles){
pc.dispose(); pc.dispose();
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment