diff --git a/frontend/android/assets/glassy/raw/BlueSquare.png b/frontend/android/assets/BlueSquare.png
similarity index 100%
rename from frontend/android/assets/glassy/raw/BlueSquare.png
rename to frontend/android/assets/BlueSquare.png
diff --git a/frontend/android/assets/glassy/raw/ColorRushBackground.jpg b/frontend/android/assets/ColorRushBackground.jpg
similarity index 100%
rename from frontend/android/assets/glassy/raw/ColorRushBackground.jpg
rename to frontend/android/assets/ColorRushBackground.jpg
diff --git a/frontend/android/assets/glassy/raw/ConfirmationSprite.png b/frontend/android/assets/ConfirmationSprite.png
similarity index 100%
rename from frontend/android/assets/glassy/raw/ConfirmationSprite.png
rename to frontend/android/assets/ConfirmationSprite.png
diff --git a/frontend/android/assets/glassy/raw/DimmingTexture.png b/frontend/android/assets/DimmingTexture.png
similarity index 100%
rename from frontend/android/assets/glassy/raw/DimmingTexture.png
rename to frontend/android/assets/DimmingTexture.png
diff --git a/frontend/android/assets/glassy/raw/ExitButton.png b/frontend/android/assets/ExitButton.png
similarity index 100%
rename from frontend/android/assets/glassy/raw/ExitButton.png
rename to frontend/android/assets/ExitButton.png
diff --git a/frontend/android/assets/glassy/raw/GreenSquare.png b/frontend/android/assets/GreenSquare.png
similarity index 100%
rename from frontend/android/assets/glassy/raw/GreenSquare.png
rename to frontend/android/assets/GreenSquare.png
diff --git a/frontend/android/assets/glassy/raw/GreySquare.png b/frontend/android/assets/GreySquare.png
similarity index 100%
rename from frontend/android/assets/glassy/raw/GreySquare.png
rename to frontend/android/assets/GreySquare.png
diff --git a/frontend/android/assets/glassy/raw/LoadingCircle.png b/frontend/android/assets/LoadingCircle.png
similarity index 100%
rename from frontend/android/assets/glassy/raw/LoadingCircle.png
rename to frontend/android/assets/LoadingCircle.png
diff --git a/frontend/android/assets/glassy/raw/PauseBackground.jpg b/frontend/android/assets/PauseBackground.jpg
similarity index 100%
rename from frontend/android/assets/glassy/raw/PauseBackground.jpg
rename to frontend/android/assets/PauseBackground.jpg
diff --git a/frontend/android/assets/glassy/raw/PauseButtonBlack.png b/frontend/android/assets/PauseButtonBlack.png
similarity index 100%
rename from frontend/android/assets/glassy/raw/PauseButtonBlack.png
rename to frontend/android/assets/PauseButtonBlack.png
diff --git a/frontend/android/assets/glassy/raw/PauseButtonWhite.png b/frontend/android/assets/PauseButtonWhite.png
similarity index 100%
rename from frontend/android/assets/glassy/raw/PauseButtonWhite.png
rename to frontend/android/assets/PauseButtonWhite.png
diff --git a/frontend/android/assets/glassy/raw/PauseText.png b/frontend/android/assets/PauseText.png
similarity index 100%
rename from frontend/android/assets/glassy/raw/PauseText.png
rename to frontend/android/assets/PauseText.png
diff --git a/frontend/android/assets/glassy/raw/RedSquare.png b/frontend/android/assets/RedSquare.png
similarity index 100%
rename from frontend/android/assets/glassy/raw/RedSquare.png
rename to frontend/android/assets/RedSquare.png
diff --git a/frontend/android/assets/glassy/raw/ResumeButton.png b/frontend/android/assets/ResumeButton.png
similarity index 100%
rename from frontend/android/assets/glassy/raw/ResumeButton.png
rename to frontend/android/assets/ResumeButton.png
diff --git a/frontend/android/assets/glassy/raw/VioletSquare.png b/frontend/android/assets/VioletSquare.png
similarity index 100%
rename from frontend/android/assets/glassy/raw/VioletSquare.png
rename to frontend/android/assets/VioletSquare.png
diff --git a/frontend/android/assets/bubble_popped_1.png b/frontend/android/assets/bubble_popped_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c90959308dc3d16fe0e7b378600f5462b243a5c
Binary files /dev/null and b/frontend/android/assets/bubble_popped_1.png differ
diff --git a/frontend/android/assets/bubble_popped_2.png b/frontend/android/assets/bubble_popped_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5a0c9cb12500e4488c927e120bf22ad8badcaaf
Binary files /dev/null and b/frontend/android/assets/bubble_popped_2.png differ
diff --git a/frontend/android/assets/bubble_popped_3.png b/frontend/android/assets/bubble_popped_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..1078784397635ef1f5ca07c6553f2c2efd40d543
Binary files /dev/null and b/frontend/android/assets/bubble_popped_3.png differ
diff --git a/frontend/android/assets/glassy/raw/bubble_unpopped_1.png b/frontend/android/assets/bubble_unpopped_1.png
similarity index 100%
rename from frontend/android/assets/glassy/raw/bubble_unpopped_1.png
rename to frontend/android/assets/bubble_unpopped_1.png
diff --git a/frontend/android/assets/glassy/raw/bubblewrap_background.jpg b/frontend/android/assets/bubblewrap_background.jpg
similarity index 100%
rename from frontend/android/assets/glassy/raw/bubblewrap_background.jpg
rename to frontend/android/assets/bubblewrap_background.jpg
diff --git a/frontend/android/assets/glassy/raw/button-disabled.png b/frontend/android/assets/button-disabled.png
similarity index 100%
rename from frontend/android/assets/glassy/raw/button-disabled.png
rename to frontend/android/assets/button-disabled.png
diff --git a/frontend/android/assets/glassy/raw/dialog_holo_light.9.png b/frontend/android/assets/dialog_holo_light.9.png
similarity index 100%
rename from frontend/android/assets/glassy/raw/dialog_holo_light.9.png
rename to frontend/android/assets/dialog_holo_light.9.png
diff --git a/frontend/android/assets/glassy/raw/bubble_popped_1.png b/frontend/android/assets/glassy/raw/bubble_popped_1.png
deleted file mode 100644
index 006f49f35147e2dec8b6c21f6ad62bfe95bfa571..0000000000000000000000000000000000000000
Binary files a/frontend/android/assets/glassy/raw/bubble_popped_1.png and /dev/null differ
diff --git a/frontend/android/assets/glassy/raw/bubble_popped_2.png b/frontend/android/assets/glassy/raw/bubble_popped_2.png
deleted file mode 100644
index 0110fa792498982b5a526c91dfd60b2fd9ea1056..0000000000000000000000000000000000000000
Binary files a/frontend/android/assets/glassy/raw/bubble_popped_2.png and /dev/null differ
diff --git a/frontend/android/assets/glassy/raw/bubble_popped_3.png b/frontend/android/assets/glassy/raw/bubble_popped_3.png
deleted file mode 100644
index 2a806cc4558d1a3bd2ab3839a3ad82f8c0948075..0000000000000000000000000000000000000000
Binary files a/frontend/android/assets/glassy/raw/bubble_popped_3.png and /dev/null differ
diff --git a/frontend/core/src/com/gameware/game/sprites/Bubble.java b/frontend/core/src/com/gameware/game/sprites/Bubble.java
index b73e52ffa1225b41cfcb9a8cd9f0328acff56e6b..a7343ae523ad75bbe9dc88d3db387f9589ea7852 100644
--- a/frontend/core/src/com/gameware/game/sprites/Bubble.java
+++ b/frontend/core/src/com/gameware/game/sprites/Bubble.java
@@ -2,85 +2,52 @@ package com.gameware.game.sprites;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Texture;
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
-import com.badlogic.gdx.scenes.scene2d.Actor;
-import com.badlogic.gdx.scenes.scene2d.InputEvent;
-import com.badlogic.gdx.scenes.scene2d.Touchable;
-import com.badlogic.gdx.scenes.scene2d.ui.Image;
-import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
-import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable;
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+import com.badlogic.gdx.math.Vector3;
import java.util.ArrayList;
import java.util.Random;
-public class Bubble extends Actor {
+public class Bubble extends Sprite {
private float width;
private float height;
- private int id;
- private boolean justTouched = false;
+ private Vector3 position;
private boolean textureChanged = false;
- private int timesTouched;
private ArrayList<Texture> poppedTextures;
private Texture unpoppedTex;
+ private Texture currentTexture;
- // Wrapping Texture in Image because Image extends Widget extends Actor, so it can be used in a table
- private Image bubble;
-
- public Bubble(float w, float h, int id, Texture unpoppedTex, Texture poppedTex1, Texture poppedTex2, Texture poppedTex3) {
- this.width = w;
- this.height = h;
- this.id = id;
- this.timesTouched = 0;
-
- this.unpoppedTex = unpoppedTex;
-
- bubble = new Image(unpoppedTex);
+ public Bubble(int x, int y, float width, float height, Texture unpoppedTex, Texture poppedTex1, Texture poppedTex2, Texture poppedTex3) {
+ this.position = new Vector3(x,y,0);
+ this.width = width;
+ this.height = height;
// Add different textures for popped bubbles
this.poppedTextures = new ArrayList<>();
-
poppedTextures.add(poppedTex1);
poppedTextures.add(poppedTex2);
poppedTextures.add(poppedTex3);
- bubble.addListener(new ClickListener() {
- @Override
- public boolean touchDown (InputEvent event, float x, float y, int pointer, int button) {
- justTouched = true;
- timesTouched++;
- System.out.println("Bubble " + getId() + " has been popped " + getTimesTouched() + " time(s).");
- setTouchable(Touchable.disabled);
- return true;
- }
- @Override
- public void touchUp(InputEvent event, float x, float y, int pointer, int button) {
- justTouched = false;
- }
- });
+ this.currentTexture = unpoppedTex;
+
+ //For the reset method.
+ this.unpoppedTex = unpoppedTex;
}
- public Image getTexture() {
- return bubble;
+ public boolean isPressed(int x, int y){
+ return x > this.position.x && x < (this.position.x + this.width) && (Gdx.graphics.getHeight() - y) > this.position.y && (Gdx.graphics.getHeight() - y) < (this.position.y + this.height);
}
public void changeToPoppedTexture() {
Random r = new Random();
- this.bubble.setDrawable(new TextureRegionDrawable(new TextureRegion(poppedTextures.get(r.nextInt(poppedTextures.size())))));
+ this.currentTexture = poppedTextures.get(r.nextInt(poppedTextures.size()));
textureChanged = true;
}
- public boolean isJustTouched() {
- return justTouched;
- }
-
public boolean isTextureChanged() {
return textureChanged;
}
- public int getTimesTouched() {
- return timesTouched;
- }
-
public float getWidth() {
return width;
}
@@ -89,18 +56,25 @@ public class Bubble extends Actor {
return height;
}
- private int getId() {
- return id;
- }
-
public void reset() {
- justTouched = false;
textureChanged = false;
- timesTouched = 0;
- this.bubble.setDrawable(new TextureRegionDrawable(new TextureRegion(this.unpoppedTex)));
+ this.currentTexture = unpoppedTex;
+ }
+
+ @Override
+ public void draw(SpriteBatch sb) {
+ Texture drawnTexture = this.currentTexture;
+ sb.begin();
+ sb.draw(drawnTexture,this.position.x,this.position.y,this.width,this.height);
+ sb.end();
+ }
+
+ @Override
+ public void update(float dt) {
}
public void dispose() {
+ // Textures are shared so they should not be disposed
}
}
diff --git a/frontend/core/src/com/gameware/game/sprites/ConfirmationBox.java b/frontend/core/src/com/gameware/game/sprites/ConfirmationBox.java
index 61845202c01414afc90824dfefc16be113984526..8d13ff817c522f978f000de415f9bf3ef1eea947 100644
--- a/frontend/core/src/com/gameware/game/sprites/ConfirmationBox.java
+++ b/frontend/core/src/com/gameware/game/sprites/ConfirmationBox.java
@@ -16,7 +16,7 @@ public class ConfirmationBox extends Sprite {
this.width = width;
this.height = height;
- this.boxTexture = new Texture(Gdx.files.internal("glassy/raw/ConfirmationSprite.png"));
+ this.boxTexture = new Texture(Gdx.files.internal("ConfirmationSprite.png"));
}
@Override
diff --git a/frontend/core/src/com/gameware/game/sprites/PauseButton.java b/frontend/core/src/com/gameware/game/sprites/PauseButton.java
index 2579fa1776cc1961f72144ed5c253fbce476dcf0..d7ff0296b9bd97c32f0dd53aa007899b3a21d875 100644
--- a/frontend/core/src/com/gameware/game/sprites/PauseButton.java
+++ b/frontend/core/src/com/gameware/game/sprites/PauseButton.java
@@ -32,8 +32,8 @@ public class PauseButton extends Sprite {
this(Gdx.graphics.getWidth() - Gdx.graphics.getWidth()/8,
Gdx.graphics.getHeight() - Gdx.graphics.getHeight()/13,
Gdx.graphics.getWidth()/10,Gdx.graphics.getWidth()/10,
- new Texture(Gdx.files.internal("glassy/raw/PauseButtonBlack.png")),
- new Texture(Gdx.files.internal("glassy/raw/PauseButtonWhite.png")));
+ new Texture(Gdx.files.internal("PauseButtonBlack.png")),
+ new Texture(Gdx.files.internal("PauseButtonWhite.png")));
}
diff --git a/frontend/core/src/com/gameware/game/states/BubbleWrapState.java b/frontend/core/src/com/gameware/game/states/BubbleWrapState.java
index b0fa352fa7790366706e381a2e46cf1f2607fef9..c2893829c3f35841dc50ca7985fa4e6f46941577 100644
--- a/frontend/core/src/com/gameware/game/states/BubbleWrapState.java
+++ b/frontend/core/src/com/gameware/game/states/BubbleWrapState.java
@@ -1,14 +1,10 @@
package com.gameware.game.states;
import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
-import com.badlogic.gdx.scenes.scene2d.ui.Container;
-import com.badlogic.gdx.scenes.scene2d.ui.Image;
import com.badlogic.gdx.scenes.scene2d.ui.Label;
-import com.badlogic.gdx.scenes.scene2d.ui.Table;
import com.gameware.game.GameWare;
import com.gameware.game.sprites.Bubble;
@@ -16,65 +12,68 @@ import java.util.ArrayList;
public class BubbleWrapState extends PlayStateTemplate {
- private ArrayList<Bubble> bubbles;
- private int poppedBubbles;
- private Image background;
- private float currentTime = 0f;
- private float totalTime = totalGameTime;
- private Label timeLabel;
+ private Texture background;
private Texture unpopped;
private Texture popped1;
private Texture popped2;
private Texture popped3;
+ private Label timeLabel;
+ private ArrayList<Bubble> bubbles = new ArrayList<>();
+ private BitmapFont font;
+
+ private int poppedBubbles;
+ private int score;
+ private final int bubbleLength = 170;
+ private final int bubblePadding = 10;
+ private final int bubbleCount = 54;
+ private float currentTime = 0f;
+ private float totalTime = totalGameTime;
+
public BubbleWrapState(GameStateManager gsm) {
super(gsm);
super.setPauseButtonWhite();
-
+
super.screenshot = new Texture(Gdx.files.internal("bubbleWrapPhotoEdit.png"));
- unpopped = new Texture(Gdx.files.internal("glassy/raw/bubble_unpopped_1.png"));
- popped1 = new Texture(Gdx.files.internal("glassy/raw/bubble_popped_1.png"));
- popped2 = new Texture(Gdx.files.internal("glassy/raw/bubble_popped_2.png"));
- popped3 = new Texture(Gdx.files.internal("glassy/raw/bubble_popped_3.png"));
+ //Overrides PlayStateTemplate's gametime, because this game should not be 30 seconds long.
+ this.totalTime = 20f;
+
+ background = new Texture(Gdx.files.internal("bubblewrap_background.jpg"));
+ unpopped = new Texture(Gdx.files.internal("bubble_unpopped_1.png"));
+ popped1 = new Texture(Gdx.files.internal("bubble_popped_1.png"));
+ popped2 = new Texture(Gdx.files.internal("bubble_popped_2.png"));
+ popped3 = new Texture(Gdx.files.internal("bubble_popped_3.png"));
this.poppedBubbles = 0;
- this.background = new Image(new Texture(Gdx.files.internal("glassy/raw/bubblewrap_background.jpg")));
- this.background.setWidth(Gdx.graphics.getWidth());
- this.background.setHeight(Gdx.graphics.getHeight());
- stage.addActor(this.background);
// Label that displays how much time is left
this.timeLabel = new Label("Time left: ", skin);
// Changes the label to a white color
- BitmapFont font = new BitmapFont();
+ font = new BitmapFont();
font.getData().setScale(Gdx.graphics.getWidth() / GameWare.WIDTH * 2.5f);
- Label.LabelStyle style = new Label.LabelStyle(font, Color.WHITE);
- timeLabel.setStyle(style);
-
- timeLabel.setPosition(Gdx.graphics.getWidth()/2 - timeLabel.getWidth() / 2f, Gdx.graphics.getHeight() - Gdx.graphics.getHeight()/10);
-
- stage.addActor(timeLabel);
+ // Fill the table with bubbles
+ for(int i = 0; i<9; i++){
+ for (int j = 0; j < this.bubbleCount/9; j++) {
+ bubbles.add(new Bubble(j*(bubbleLength + bubblePadding),i*(bubbleLength + bubblePadding),bubbleLength,bubbleLength,unpopped,popped1,popped2,popped3));
+ }
+ }
- // Creates the bubbles, the table to put them in and adds them to the stage as Actors
- createBubbles();
- createBubbleWrapLayout();
- }
+ }
@Override
protected void handleInput() {
if (Gdx.input.justTouched()) {
- /* Checks if any bubble has been pressed and that it's not added
- to the counter more than once */
+
+ /* Checks if any bubble has been pressed and that it's not added to the counter more than once */
for (Bubble bubble : bubbles) {
- if (bubble.isJustTouched() && !bubble.isTextureChanged()) {
+ if (bubble.isPressed(Gdx.input.getX(),Gdx.input.getY()) && !bubble.isTextureChanged()) {
bubble.changeToPoppedTexture();
poppedBubbles++;
- System.out.println(poppedBubbles);
}
}
@@ -88,98 +87,58 @@ public class BubbleWrapState extends PlayStateTemplate {
@Override
public void update(float dt) {
- Gdx.input.setInputProcessor(stage);
-
this.handleInput();
this.currentTime += dt;
timeLabel.setText("Time left: " + Math.round((totalTime - currentTime) * 100.0) / 100.0);
- // Game should finish if the time has run out
- if (this.currentTime >= this.totalTime) {
- System.out.println("Score: " + poppedBubbles);
+ // Game should finish if the time has run out or all the bubbles are popped.
+ if ((this.currentTime >= this.totalTime) || poppedBubbles == 54) {
handleFinishedGame();
}
- // Game should finish if all the bubbles are popped
- if (poppedBubbles == 48) {
- System.out.println("All bubbles are popped! Score: " + poppedBubbles);
- handleFinishedGame();
- }
- stage.act();
}
- // Stage uses a Batch to draw
@Override
public void render(SpriteBatch sb) {
- stage.draw();
+ sb.begin();
+ sb.draw(this.background, 0, 0, Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
+ this.font.draw(sb, String.valueOf(Math.round((this.totalTime - this.currentTime) * 100) / 100.0), Gdx.graphics.getWidth()/40,Gdx.graphics.getHeight() - Gdx.graphics.getHeight()/40);
+ sb.end();
- // Renders pause button
super.renderPauseButton(sb);
- }
-
- private void createBubbles() {
- bubbles = new ArrayList<>();
- int bubCount = 48;
- for (int i = 0; i < bubCount; i++) {
- bubbles.add(new Bubble(70, 70, i+1, this.unpopped, this.popped1, this.popped2, this.popped3));
- }
- }
-
- private void createBubbleWrapLayout() {
- Container<Table> tableContainer = new Container<>();
- float sw = Gdx.graphics.getWidth();
- float sh = Gdx.graphics.getHeight();
-
- float cw = sw * 0.8f;
- float ch = sh * 0.8f;
-
- tableContainer.setSize(cw, ch);
- tableContainer.setPosition((sw - cw) / 2.0f, (sh - ch) / 2.0f);
- tableContainer.fillX();
-
- Table table = new Table();
- table.setFillParent(true);
-
-
- // Fill the table with bubbles
- for(int i = 0; i<8; i++){
- table.row();
- for (int j = i*6; j < (i+1)*6; j++) {
- table.add(bubbles.get(j).getTexture());
- stage.addActor(bubbles.get(j));
- }
+ for (Bubble bubble : this.bubbles){
+ bubble.draw(sb);
}
- tableContainer.setActor(table);
- stage.addActor(tableContainer);
}
-
private void handleFinishedGame() {
- System.out.println("Game finished, starting new state");
- this.setScore(this.poppedBubbles);
+ //Score is calculated. One point per bubble popped, pluss three points for each second of remaining time.
+ score = this.poppedBubbles + Math.round(this.totalTime - this.currentTime)*3;
+ this.setScore(score);
this.gameDone();
return;
}
@Override
public void dispose() {
- stage.dispose();
this.unpopped.dispose();
this.popped1.dispose();
this.popped2.dispose();
this.popped3.dispose();
super.pauseButton.dispose();
+ for(Bubble bubble : bubbles){ bubble.dispose(); }
+ this.font.dispose();
+ this.background.dispose();
}
@Override
public void reset() {
this.poppedBubbles = 0;
this.currentTime = 0f;
- createBubbles();
- createBubbleWrapLayout();
+ for(Bubble bubble : bubbles){ bubble.reset(); }
}
}
diff --git a/frontend/core/src/com/gameware/game/states/ColorRushState.java b/frontend/core/src/com/gameware/game/states/ColorRushState.java
index 1e69d5dc72c3803a8bbcf7d9e7983658638759a7..44eb27bae58bb65516c2e693c90d92a8acbd0fd6 100644
--- a/frontend/core/src/com/gameware/game/states/ColorRushState.java
+++ b/frontend/core/src/com/gameware/game/states/ColorRushState.java
@@ -34,7 +34,7 @@ public class ColorRushState extends PlayStateTemplate {
super.screenshot = new Texture(Gdx.files.internal("colorRushPhotoEdit.png"));
// Creates the background
- this.background = new Texture(Gdx.files.internal("glassy/raw/ColorRushBackground.jpg"));
+ this.background = new Texture(Gdx.files.internal("ColorRushBackground.jpg"));
// Creates the bitmapfont
font = new BitmapFont();
@@ -44,12 +44,12 @@ public class ColorRushState extends PlayStateTemplate {
// Creates the color textures
this.colorTextures = new ArrayList<Texture>();
- this.colorTextures.add(new Texture(Gdx.files.internal("glassy/raw/RedSquare.png")));
- this.colorTextures.add(new Texture(Gdx.files.internal("glassy/raw/BlueSquare.png")));
- this.colorTextures.add(new Texture(Gdx.files.internal("glassy/raw/GreenSquare.png")));
- this.colorTextures.add(new Texture(Gdx.files.internal("glassy/raw/VioletSquare.png")));
+ this.colorTextures.add(new Texture(Gdx.files.internal("RedSquare.png")));
+ this.colorTextures.add(new Texture(Gdx.files.internal("BlueSquare.png")));
+ this.colorTextures.add(new Texture(Gdx.files.internal("GreenSquare.png")));
+ this.colorTextures.add(new Texture(Gdx.files.internal("VioletSquare.png")));
- this.disabledColorTexture = new Texture(Gdx.files.internal("glassy/raw/GreySquare.png"));
+ this.disabledColorTexture = new Texture(Gdx.files.internal("GreySquare.png"));
// Randomizes the button arrangement
Collections.shuffle(this.colorTextures);
diff --git a/frontend/core/src/com/gameware/game/states/PauseState.java b/frontend/core/src/com/gameware/game/states/PauseState.java
index 8dccc6cd8c050b78bf8a3ec7420a1bdc766fb44d..1e787044956b07dc7b8c64243b3b50bcc2ddaf07 100644
--- a/frontend/core/src/com/gameware/game/states/PauseState.java
+++ b/frontend/core/src/com/gameware/game/states/PauseState.java
@@ -26,9 +26,9 @@ public class PauseState extends State {
public PauseState(GameStateManager gsm, PlayStateTemplate pausedGame) {
super(gsm);
- this.background = new Texture(Gdx.files.internal("glassy/raw/PauseBackground.jpg"));
- this.pauseText = new Texture(Gdx.files.internal("glassy/raw/PauseText.png"));
- this.dimmingTexture = new Texture(Gdx.files.internal("glassy/raw/DimmingTexture.png"));
+ this.background = new Texture(Gdx.files.internal("PauseBackground.jpg"));
+ this.pauseText = new Texture(Gdx.files.internal("PauseText.png"));
+ this.dimmingTexture = new Texture(Gdx.files.internal("DimmingTexture.png"));
this.pauseCircles = new ArrayList<PauseCircle>();
@@ -41,8 +41,8 @@ public class PauseState extends State {
int buttonWidth = Gdx.graphics.getWidth()/3;
int buttonHeight = buttonWidth/2;
- this.resumeButton = new PauseMenuButton(new Texture(Gdx.files.internal("glassy/raw/ResumeButton.png")), buttonWidth/3, Gdx.graphics.getHeight()/7, buttonWidth, buttonHeight);
- this.exitButton = new PauseMenuButton(new Texture(Gdx.files.internal("glassy/raw/ExitButton.png")), buttonWidth + buttonWidth*2/3, Gdx.graphics.getHeight()/7, buttonWidth, buttonHeight);
+ this.resumeButton = new PauseMenuButton(new Texture(Gdx.files.internal("ResumeButton.png")), buttonWidth/3, Gdx.graphics.getHeight()/7, buttonWidth, buttonHeight);
+ this.exitButton = new PauseMenuButton(new Texture(Gdx.files.internal("ExitButton.png")), buttonWidth + buttonWidth*2/3, Gdx.graphics.getHeight()/7, buttonWidth, buttonHeight);
for(int i = 0; i<25; i++){