diff --git a/frontend/android/assets/bubbleWrapPhotoEdit.png b/frontend/android/assets/gameTextures/BubbleWrap/bubbleWrapPhotoEdit.png similarity index 100% rename from frontend/android/assets/bubbleWrapPhotoEdit.png rename to frontend/android/assets/gameTextures/BubbleWrap/bubbleWrapPhotoEdit.png diff --git a/frontend/android/assets/bubble_popped_1.png b/frontend/android/assets/gameTextures/BubbleWrap/bubble_popped_1.png similarity index 100% rename from frontend/android/assets/bubble_popped_1.png rename to frontend/android/assets/gameTextures/BubbleWrap/bubble_popped_1.png diff --git a/frontend/android/assets/bubble_popped_2.png b/frontend/android/assets/gameTextures/BubbleWrap/bubble_popped_2.png similarity index 100% rename from frontend/android/assets/bubble_popped_2.png rename to frontend/android/assets/gameTextures/BubbleWrap/bubble_popped_2.png diff --git a/frontend/android/assets/bubble_popped_3.png b/frontend/android/assets/gameTextures/BubbleWrap/bubble_popped_3.png similarity index 100% rename from frontend/android/assets/bubble_popped_3.png rename to frontend/android/assets/gameTextures/BubbleWrap/bubble_popped_3.png diff --git a/frontend/android/assets/bubble_unpopped_1.png b/frontend/android/assets/gameTextures/BubbleWrap/bubble_unpopped_1.png similarity index 100% rename from frontend/android/assets/bubble_unpopped_1.png rename to frontend/android/assets/gameTextures/BubbleWrap/bubble_unpopped_1.png diff --git a/frontend/android/assets/bubblewrap_background.jpg b/frontend/android/assets/gameTextures/BubbleWrap/bubblewrap_background.jpg similarity index 100% rename from frontend/android/assets/bubblewrap_background.jpg rename to frontend/android/assets/gameTextures/BubbleWrap/bubblewrap_background.jpg diff --git a/frontend/android/assets/BlueSquare.png b/frontend/android/assets/gameTextures/ColorRush/BlueSquare.png similarity index 100% rename from frontend/android/assets/BlueSquare.png rename to frontend/android/assets/gameTextures/ColorRush/BlueSquare.png diff --git a/frontend/android/assets/ColorRushBackground.jpg b/frontend/android/assets/gameTextures/ColorRush/ColorRushBackground.jpg similarity index 100% rename from frontend/android/assets/ColorRushBackground.jpg rename to frontend/android/assets/gameTextures/ColorRush/ColorRushBackground.jpg diff --git a/frontend/android/assets/GreenSquare.png b/frontend/android/assets/gameTextures/ColorRush/GreenSquare.png similarity index 100% rename from frontend/android/assets/GreenSquare.png rename to frontend/android/assets/gameTextures/ColorRush/GreenSquare.png diff --git a/frontend/android/assets/GreySquare.png b/frontend/android/assets/gameTextures/ColorRush/GreySquare.png similarity index 100% rename from frontend/android/assets/GreySquare.png rename to frontend/android/assets/gameTextures/ColorRush/GreySquare.png diff --git a/frontend/android/assets/RedSquare.png b/frontend/android/assets/gameTextures/ColorRush/RedSquare.png similarity index 100% rename from frontend/android/assets/RedSquare.png rename to frontend/android/assets/gameTextures/ColorRush/RedSquare.png diff --git a/frontend/android/assets/VioletSquare.png b/frontend/android/assets/gameTextures/ColorRush/VioletSquare.png similarity index 100% rename from frontend/android/assets/VioletSquare.png rename to frontend/android/assets/gameTextures/ColorRush/VioletSquare.png diff --git a/frontend/android/assets/colorRushPhotoEdit.png b/frontend/android/assets/gameTextures/ColorRush/colorRushPhotoEdit.png similarity index 100% rename from frontend/android/assets/colorRushPhotoEdit.png rename to frontend/android/assets/gameTextures/ColorRush/colorRushPhotoEdit.png diff --git a/frontend/android/assets/FruitSlicerBackground.png b/frontend/android/assets/gameTextures/FruitSlicer/FruitSlicerBackground.png similarity index 100% rename from frontend/android/assets/FruitSlicerBackground.png rename to frontend/android/assets/gameTextures/FruitSlicer/FruitSlicerBackground.png diff --git a/frontend/android/assets/FruitSlicerPhotoEdit.png b/frontend/android/assets/gameTextures/FruitSlicer/FruitSlicerPhotoEdit.png similarity index 100% rename from frontend/android/assets/FruitSlicerPhotoEdit.png rename to frontend/android/assets/gameTextures/FruitSlicer/FruitSlicerPhotoEdit.png diff --git a/frontend/android/assets/FruitTexture1.png b/frontend/android/assets/gameTextures/FruitSlicer/FruitTexture1.png similarity index 100% rename from frontend/android/assets/FruitTexture1.png rename to frontend/android/assets/gameTextures/FruitSlicer/FruitTexture1.png diff --git a/frontend/android/assets/FruitTexture10.png b/frontend/android/assets/gameTextures/FruitSlicer/FruitTexture10.png similarity index 100% rename from frontend/android/assets/FruitTexture10.png rename to frontend/android/assets/gameTextures/FruitSlicer/FruitTexture10.png diff --git a/frontend/android/assets/FruitTexture11.png b/frontend/android/assets/gameTextures/FruitSlicer/FruitTexture11.png similarity index 100% rename from frontend/android/assets/FruitTexture11.png rename to frontend/android/assets/gameTextures/FruitSlicer/FruitTexture11.png diff --git a/frontend/android/assets/FruitTexture12.png b/frontend/android/assets/gameTextures/FruitSlicer/FruitTexture12.png similarity index 100% rename from frontend/android/assets/FruitTexture12.png rename to frontend/android/assets/gameTextures/FruitSlicer/FruitTexture12.png diff --git a/frontend/android/assets/FruitTexture13.png b/frontend/android/assets/gameTextures/FruitSlicer/FruitTexture13.png similarity index 100% rename from frontend/android/assets/FruitTexture13.png rename to frontend/android/assets/gameTextures/FruitSlicer/FruitTexture13.png diff --git a/frontend/android/assets/FruitTexture14.png b/frontend/android/assets/gameTextures/FruitSlicer/FruitTexture14.png similarity index 100% rename from frontend/android/assets/FruitTexture14.png rename to frontend/android/assets/gameTextures/FruitSlicer/FruitTexture14.png diff --git a/frontend/android/assets/FruitTexture15.png b/frontend/android/assets/gameTextures/FruitSlicer/FruitTexture15.png similarity index 100% rename from frontend/android/assets/FruitTexture15.png rename to frontend/android/assets/gameTextures/FruitSlicer/FruitTexture15.png diff --git a/frontend/android/assets/FruitTexture16.png b/frontend/android/assets/gameTextures/FruitSlicer/FruitTexture16.png similarity index 100% rename from frontend/android/assets/FruitTexture16.png rename to frontend/android/assets/gameTextures/FruitSlicer/FruitTexture16.png diff --git a/frontend/android/assets/FruitTexture17.png b/frontend/android/assets/gameTextures/FruitSlicer/FruitTexture17.png similarity index 100% rename from frontend/android/assets/FruitTexture17.png rename to frontend/android/assets/gameTextures/FruitSlicer/FruitTexture17.png diff --git a/frontend/android/assets/FruitTexture18.png b/frontend/android/assets/gameTextures/FruitSlicer/FruitTexture18.png similarity index 100% rename from frontend/android/assets/FruitTexture18.png rename to frontend/android/assets/gameTextures/FruitSlicer/FruitTexture18.png diff --git a/frontend/android/assets/FruitTexture19.png b/frontend/android/assets/gameTextures/FruitSlicer/FruitTexture19.png similarity index 100% rename from frontend/android/assets/FruitTexture19.png rename to frontend/android/assets/gameTextures/FruitSlicer/FruitTexture19.png diff --git a/frontend/android/assets/FruitTexture2.png b/frontend/android/assets/gameTextures/FruitSlicer/FruitTexture2.png similarity index 100% rename from frontend/android/assets/FruitTexture2.png rename to frontend/android/assets/gameTextures/FruitSlicer/FruitTexture2.png diff --git a/frontend/android/assets/FruitTexture20.png b/frontend/android/assets/gameTextures/FruitSlicer/FruitTexture20.png similarity index 100% rename from frontend/android/assets/FruitTexture20.png rename to frontend/android/assets/gameTextures/FruitSlicer/FruitTexture20.png diff --git a/frontend/android/assets/FruitTexture3.png b/frontend/android/assets/gameTextures/FruitSlicer/FruitTexture3.png similarity index 100% rename from frontend/android/assets/FruitTexture3.png rename to frontend/android/assets/gameTextures/FruitSlicer/FruitTexture3.png diff --git a/frontend/android/assets/FruitTexture4.png b/frontend/android/assets/gameTextures/FruitSlicer/FruitTexture4.png similarity index 100% rename from frontend/android/assets/FruitTexture4.png rename to frontend/android/assets/gameTextures/FruitSlicer/FruitTexture4.png diff --git a/frontend/android/assets/FruitTexture5.png b/frontend/android/assets/gameTextures/FruitSlicer/FruitTexture5.png similarity index 100% rename from frontend/android/assets/FruitTexture5.png rename to frontend/android/assets/gameTextures/FruitSlicer/FruitTexture5.png diff --git a/frontend/android/assets/FruitTexture6.png b/frontend/android/assets/gameTextures/FruitSlicer/FruitTexture6.png similarity index 100% rename from frontend/android/assets/FruitTexture6.png rename to frontend/android/assets/gameTextures/FruitSlicer/FruitTexture6.png diff --git a/frontend/android/assets/FruitTexture7.png b/frontend/android/assets/gameTextures/FruitSlicer/FruitTexture7.png similarity index 100% rename from frontend/android/assets/FruitTexture7.png rename to frontend/android/assets/gameTextures/FruitSlicer/FruitTexture7.png diff --git a/frontend/android/assets/FruitTexture8.png b/frontend/android/assets/gameTextures/FruitSlicer/FruitTexture8.png similarity index 100% rename from frontend/android/assets/FruitTexture8.png rename to frontend/android/assets/gameTextures/FruitSlicer/FruitTexture8.png diff --git a/frontend/android/assets/FruitTexture9.png b/frontend/android/assets/gameTextures/FruitSlicer/FruitTexture9.png similarity index 100% rename from frontend/android/assets/FruitTexture9.png rename to frontend/android/assets/gameTextures/FruitSlicer/FruitTexture9.png diff --git a/frontend/android/assets/SlicingVisualEffect.png b/frontend/android/assets/gameTextures/FruitSlicer/SlicingVisualEffect.png similarity index 100% rename from frontend/android/assets/SlicingVisualEffect.png rename to frontend/android/assets/gameTextures/FruitSlicer/SlicingVisualEffect.png diff --git a/frontend/android/assets/cog.png b/frontend/android/assets/menu/cog.png similarity index 100% rename from frontend/android/assets/cog.png rename to frontend/android/assets/menu/cog.png diff --git a/frontend/android/assets/logOut.png b/frontend/android/assets/menu/logOut.png similarity index 100% rename from frontend/android/assets/logOut.png rename to frontend/android/assets/menu/logOut.png diff --git a/frontend/android/assets/person.png b/frontend/android/assets/menu/person.png similarity index 100% rename from frontend/android/assets/person.png rename to frontend/android/assets/menu/person.png diff --git a/frontend/android/assets/trophy.png b/frontend/android/assets/menu/trophy.png similarity index 100% rename from frontend/android/assets/trophy.png rename to frontend/android/assets/menu/trophy.png diff --git a/frontend/android/assets/bensound-goinghigher.mp3 b/frontend/android/assets/music/bensound-goinghigher.mp3 similarity index 100% rename from frontend/android/assets/bensound-goinghigher.mp3 rename to frontend/android/assets/music/bensound-goinghigher.mp3 diff --git a/frontend/android/assets/ConfirmationSprite.png b/frontend/android/assets/pause/ConfirmationSprite.png similarity index 100% rename from frontend/android/assets/ConfirmationSprite.png rename to frontend/android/assets/pause/ConfirmationSprite.png diff --git a/frontend/android/assets/DimmingTexture.png b/frontend/android/assets/pause/DimmingTexture.png similarity index 100% rename from frontend/android/assets/DimmingTexture.png rename to frontend/android/assets/pause/DimmingTexture.png diff --git a/frontend/android/assets/ExitButton.png b/frontend/android/assets/pause/ExitButton.png similarity index 100% rename from frontend/android/assets/ExitButton.png rename to frontend/android/assets/pause/ExitButton.png diff --git a/frontend/android/assets/Number1.png b/frontend/android/assets/pause/Number1.png similarity index 100% rename from frontend/android/assets/Number1.png rename to frontend/android/assets/pause/Number1.png diff --git a/frontend/android/assets/Number2.png b/frontend/android/assets/pause/Number2.png similarity index 100% rename from frontend/android/assets/Number2.png rename to frontend/android/assets/pause/Number2.png diff --git a/frontend/android/assets/Number3.png b/frontend/android/assets/pause/Number3.png similarity index 100% rename from frontend/android/assets/Number3.png rename to frontend/android/assets/pause/Number3.png diff --git a/frontend/android/assets/PauseBackground.jpg b/frontend/android/assets/pause/PauseBackground.jpg similarity index 100% rename from frontend/android/assets/PauseBackground.jpg rename to frontend/android/assets/pause/PauseBackground.jpg diff --git a/frontend/android/assets/PauseButtonBlack.png b/frontend/android/assets/pause/PauseButtonBlack.png similarity index 100% rename from frontend/android/assets/PauseButtonBlack.png rename to frontend/android/assets/pause/PauseButtonBlack.png diff --git a/frontend/android/assets/PauseButtonWhite.png b/frontend/android/assets/pause/PauseButtonWhite.png similarity index 100% rename from frontend/android/assets/PauseButtonWhite.png rename to frontend/android/assets/pause/PauseButtonWhite.png diff --git a/frontend/android/assets/PauseText.png b/frontend/android/assets/pause/PauseText.png similarity index 100% rename from frontend/android/assets/PauseText.png rename to frontend/android/assets/pause/PauseText.png diff --git a/frontend/android/assets/ResumeButton.png b/frontend/android/assets/pause/ResumeButton.png similarity index 100% rename from frontend/android/assets/ResumeButton.png rename to frontend/android/assets/pause/ResumeButton.png diff --git a/frontend/android/assets/state/DimmingTexture.png b/frontend/android/assets/state/DimmingTexture.png new file mode 100644 index 0000000000000000000000000000000000000000..660a9ad25cc2fc6574570093cd25ca857ef67e71 Binary files /dev/null and b/frontend/android/assets/state/DimmingTexture.png differ diff --git a/frontend/android/assets/LoadingText.png b/frontend/android/assets/state/LoadingText.png similarity index 100% rename from frontend/android/assets/LoadingText.png rename to frontend/android/assets/state/LoadingText.png diff --git a/frontend/android/assets/bg1.jpg b/frontend/android/assets/state/bg1.jpg similarity index 100% rename from frontend/android/assets/bg1.jpg rename to frontend/android/assets/state/bg1.jpg diff --git a/frontend/android/assets/bg1_finTourn.jpg b/frontend/android/assets/state/bg1_finTourn.jpg similarity index 100% rename from frontend/android/assets/bg1_finTourn.jpg rename to frontend/android/assets/state/bg1_finTourn.jpg diff --git a/frontend/android/assets/bg_score.jpg b/frontend/android/assets/state/bg_score.jpg similarity index 100% rename from frontend/android/assets/bg_score.jpg rename to frontend/android/assets/state/bg_score.jpg diff --git a/frontend/android/assets/questionMarkIcon.png b/frontend/android/assets/state/questionMarkIcon.png similarity index 100% rename from frontend/android/assets/questionMarkIcon.png rename to frontend/android/assets/state/questionMarkIcon.png diff --git a/frontend/android/assets/tableBGRounded.png b/frontend/android/assets/state/tableBGRounded.png similarity index 100% rename from frontend/android/assets/tableBGRounded.png rename to frontend/android/assets/state/tableBGRounded.png diff --git a/frontend/core/src/com/gameware/game/GameWare.java b/frontend/core/src/com/gameware/game/GameWare.java index 1abb03b1e8343d729c96cd94a44278eb184393c2..8d54c87aaa6b350c7bf02093a1bbf47bfaea1804 100644 --- a/frontend/core/src/com/gameware/game/GameWare.java +++ b/frontend/core/src/com/gameware/game/GameWare.java @@ -79,7 +79,7 @@ public class GameWare extends ApplicationAdapter { batch = new SpriteBatch(); - music = Gdx.audio.newMusic(Gdx.files.internal(("bensound-goinghigher.mp3"))); + music = Gdx.audio.newMusic(Gdx.files.internal(("music/bensound-goinghigher.mp3"))); music.setLooping(true); music.setVolume(0.1f); musicOn = true; diff --git a/frontend/core/src/com/gameware/game/sprites/ConfirmationBox.java b/frontend/core/src/com/gameware/game/sprites/ConfirmationBox.java index b62b00e61f84c0a98e033a847a5777516fd5a968..1dd4fd91ce87ed1644a3f7372a95533a0aa370bf 100644 --- a/frontend/core/src/com/gameware/game/sprites/ConfirmationBox.java +++ b/frontend/core/src/com/gameware/game/sprites/ConfirmationBox.java @@ -13,7 +13,7 @@ public class ConfirmationBox extends Sprite { this.width = width; this.height = height; - this.boxTexture = new Texture(Gdx.files.internal("ConfirmationSprite.png")); + this.boxTexture = new Texture(Gdx.files.internal("pause/ConfirmationSprite.png")); } @Override diff --git a/frontend/core/src/com/gameware/game/sprites/LoadingText.java b/frontend/core/src/com/gameware/game/sprites/LoadingText.java index 965300d0d514898fcb8f3819a232e6b7db1b895f..bb70ce29a4dd5fb3c1b7829a07f069ad9662855e 100644 --- a/frontend/core/src/com/gameware/game/sprites/LoadingText.java +++ b/frontend/core/src/com/gameware/game/sprites/LoadingText.java @@ -7,8 +7,8 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch; public class LoadingText extends Sprite { private boolean isLoading = false; private boolean firstUpdateFinished = false; - private Texture loadingText = new Texture(Gdx.files.internal("LoadingText.png")); - private Texture dimmingBackgroundTexture = new Texture(Gdx.files.internal("DimmingTexture.png")); + private Texture loadingText = new Texture(Gdx.files.internal("state/LoadingText.png")); + private Texture dimmingBackgroundTexture = new Texture(Gdx.files.internal("state/DimmingTexture.png")); @Override public void reset() { diff --git a/frontend/core/src/com/gameware/game/sprites/PauseButton.java b/frontend/core/src/com/gameware/game/sprites/PauseButton.java index 15db5fd0c635f0f9c66f07112fc65f798c4f2f27..4105e7effcf306bfbbaa243011858e158afa2a49 100644 --- a/frontend/core/src/com/gameware/game/sprites/PauseButton.java +++ b/frontend/core/src/com/gameware/game/sprites/PauseButton.java @@ -29,8 +29,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("PauseButtonBlack.png")), - new Texture(Gdx.files.internal("PauseButtonWhite.png"))); + new Texture(Gdx.files.internal("pause/PauseButtonBlack.png")), + new Texture(Gdx.files.internal("pause/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 af08dfe99f99717d3224d5ff1bf8931cfd26cccd..5d449bf4a3c9293d4779a0761e583286744e40fa 100644 --- a/frontend/core/src/com/gameware/game/states/BubbleWrapState.java +++ b/frontend/core/src/com/gameware/game/states/BubbleWrapState.java @@ -29,13 +29,13 @@ public class BubbleWrapState extends PlayStateTemplate { super.setPauseButtonWhite(); super.setTotalGameTime(20f); super.setFontColorWhite(); - super.screenshot = new Texture(Gdx.files.internal("bubbleWrapPhotoEdit.png")); + super.screenshot = new Texture(Gdx.files.internal("gameTextures/BubbleWrap/bubbleWrapPhotoEdit.png")); - 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")); + background = new Texture(Gdx.files.internal("gameTextures/BubbleWrap/bubblewrap_background.jpg")); + unpopped = new Texture(Gdx.files.internal("gameTextures/BubbleWrap/bubble_unpopped_1.png")); + popped1 = new Texture(Gdx.files.internal("gameTextures/BubbleWrap/bubble_popped_1.png")); + popped2 = new Texture(Gdx.files.internal("gameTextures/BubbleWrap/bubble_popped_2.png")); + popped3 = new Texture(Gdx.files.internal("gameTextures/BubbleWrap/bubble_popped_3.png")); this.poppedBubbles = 0; diff --git a/frontend/core/src/com/gameware/game/states/ColorRushState.java b/frontend/core/src/com/gameware/game/states/ColorRushState.java index bb88cee957d7a2bb619e94f2c8cf5194bb4dad4f..ee8adc4964755c5a507f4b6274d203164981872c 100644 --- a/frontend/core/src/com/gameware/game/states/ColorRushState.java +++ b/frontend/core/src/com/gameware/game/states/ColorRushState.java @@ -25,20 +25,20 @@ public class ColorRushState extends PlayStateTemplate { public ColorRushState(GameStateManager gsm){ super(gsm); - super.screenshot = new Texture(Gdx.files.internal("colorRushPhotoEdit.png")); + super.screenshot = new Texture(Gdx.files.internal("gameTextures/ColorRush/colorRushPhotoEdit.png")); super.setTotalGameTime(30f); // Creates the background - this.background = new Texture(Gdx.files.internal("ColorRushBackground.jpg")); + this.background = new Texture(Gdx.files.internal("gameTextures/ColorRush/ColorRushBackground.jpg")); // Creates the color textures this.colorTextures = new ArrayList<Texture>(); - 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.colorTextures.add(new Texture(Gdx.files.internal("gameTextures/ColorRush/RedSquare.png"))); + this.colorTextures.add(new Texture(Gdx.files.internal("gameTextures/ColorRush/BlueSquare.png"))); + this.colorTextures.add(new Texture(Gdx.files.internal("gameTextures/ColorRush/GreenSquare.png"))); + this.colorTextures.add(new Texture(Gdx.files.internal("gameTextures/ColorRush/VioletSquare.png"))); - this.disabledColorTexture = new Texture(Gdx.files.internal("GreySquare.png")); + this.disabledColorTexture = new Texture(Gdx.files.internal("gameTextures/ColorRush/GreySquare.png")); // Randomizes the button arrangement Collections.shuffle(this.colorTextures); diff --git a/frontend/core/src/com/gameware/game/states/FruitSlicerState.java b/frontend/core/src/com/gameware/game/states/FruitSlicerState.java index 76ffcf7d22a583e4cd31944f4af8a990915e1bec..376eaee777dbc31466618890ff156cd2abcff370 100644 --- a/frontend/core/src/com/gameware/game/states/FruitSlicerState.java +++ b/frontend/core/src/com/gameware/game/states/FruitSlicerState.java @@ -19,8 +19,8 @@ public class FruitSlicerState extends PlayStateTemplate { private float timeSinceLastEmit = 0; private float lengthMoved = 0f; private float slicingSpeedThreshold = Gdx.graphics.getWidth()/20; - private Texture slicingCircleVFX = new Texture(Gdx.files.internal("SlicingVisualEffect.png")); - private Texture background = new Texture(Gdx.files.internal("FruitSlicerBackground.png")); + private Texture slicingCircleVFX = new Texture(Gdx.files.internal("gameTextures/FruitSlicer/SlicingVisualEffect.png")); + private Texture background = new Texture(Gdx.files.internal("gameTextures/FruitSlicer/FruitSlicerBackground.png")); private List<Texture> fruitTextures; private List<Fruit> emittedFruits; private Sound sliceWhooshSound; @@ -33,7 +33,7 @@ public class FruitSlicerState extends PlayStateTemplate { public FruitSlicerState(GameStateManager gsm) { super(gsm); super.setTotalGameTime(60f); - super.screenshot = new Texture(Gdx.files.internal("FruitSlicerPhotoEdit.png")); + super.screenshot = new Texture(Gdx.files.internal("gameTextures/FruitSlicer/FruitSlicerPhotoEdit.png")); this.sliceWhooshSound = Gdx.audio.newSound(Gdx.files.internal("sfx/FruitSlicerWhooshSound.mp3")); this.sliceSquishSound = Gdx.audio.newSound(Gdx.files.internal("sfx/FruitSlicerSquishSound.mp3")); @@ -42,7 +42,7 @@ public class FruitSlicerState extends PlayStateTemplate { this.emittedFruits = new ArrayList<>(); for(int textureNum = 1; textureNum <= 20; textureNum++){ - String filename = "FruitTexture" + String.valueOf(textureNum) + ".png"; + String filename = "gameTextures/FruitSlicer/FruitTexture" + String.valueOf(textureNum) + ".png"; this.fruitTextures.add(new Texture(Gdx.files.internal(filename))); } } diff --git a/frontend/core/src/com/gameware/game/states/MenuState.java b/frontend/core/src/com/gameware/game/states/MenuState.java index 219ffa962deb1ebc2cd487cd54448cc669c565ab..69541d1029e9b9a742bf10828fd61ff83b02374c 100644 --- a/frontend/core/src/com/gameware/game/states/MenuState.java +++ b/frontend/core/src/com/gameware/game/states/MenuState.java @@ -29,10 +29,10 @@ public class MenuState extends State{ private final String logOutBtnText = "Log out"; // Textures - private TextureRegionDrawable person = new TextureRegionDrawable(new TextureRegion(new Texture("person.png"))); - private TextureRegionDrawable trophy = new TextureRegionDrawable(new TextureRegion(new Texture("trophy.png"))); - private TextureRegionDrawable cog = new TextureRegionDrawable(new TextureRegion(new Texture("cog.png"))); - private TextureRegionDrawable logOut = new TextureRegionDrawable(new TextureRegion(new Texture("logOut.png"))); + private TextureRegionDrawable person = new TextureRegionDrawable(new TextureRegion(new Texture("menu/person.png"))); + private TextureRegionDrawable trophy = new TextureRegionDrawable(new TextureRegion(new Texture("menu/trophy.png"))); + private TextureRegionDrawable cog = new TextureRegionDrawable(new TextureRegion(new Texture("menu/cog.png"))); + private TextureRegionDrawable logOut = new TextureRegionDrawable(new TextureRegion(new Texture("menu/logOut.png"))); // Sizes private final float personWidth = Gdx.graphics.getWidth()/25; diff --git a/frontend/core/src/com/gameware/game/states/PauseState.java b/frontend/core/src/com/gameware/game/states/PauseState.java index d58771d02ae1aeaf0078ebeab7bb58db150eb563..a52ca77a171d790f8af38dae2eda25611cf9db84 100644 --- a/frontend/core/src/com/gameware/game/states/PauseState.java +++ b/frontend/core/src/com/gameware/game/states/PauseState.java @@ -36,14 +36,14 @@ public class PauseState extends State { public PauseState(GameStateManager gsm, PlayStateTemplate pausedGame) { super(gsm); - 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.background = new Texture(Gdx.files.internal("pause/PauseBackground.jpg")); + this.pauseText = new Texture(Gdx.files.internal("pause/PauseText.png")); + this.dimmingTexture = new Texture(Gdx.files.internal("pause/DimmingTexture.png")); this.countdownNumbers = new ArrayList<Texture>(); - this.countdownNumbers.add(new Texture(Gdx.files.internal("Number1.png"))); - this.countdownNumbers.add(new Texture(Gdx.files.internal("Number2.png"))); - this.countdownNumbers.add(new Texture(Gdx.files.internal("Number3.png"))); + this.countdownNumbers.add(new Texture(Gdx.files.internal("pause/Number1.png"))); + this.countdownNumbers.add(new Texture(Gdx.files.internal("pause/Number2.png"))); + this.countdownNumbers.add(new Texture(Gdx.files.internal("pause/Number3.png"))); this.countdownDurationLeft = 3f; this.countdownStarted = false; @@ -64,8 +64,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("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); + this.resumeButton = new PauseMenuButton(new Texture(Gdx.files.internal("pause/ResumeButton.png")), buttonWidth/3, Gdx.graphics.getHeight()/7, buttonWidth, buttonHeight); + this.exitButton = new PauseMenuButton(new Texture(Gdx.files.internal("pause/ExitButton.png")), buttonWidth + buttonWidth*2/3, Gdx.graphics.getHeight()/7, buttonWidth, buttonHeight); for(int i = 0; i<25; i++){ diff --git a/frontend/core/src/com/gameware/game/states/State.java b/frontend/core/src/com/gameware/game/states/State.java index ae7acdca2b79144610bc4bb680d7de3ceef3229e..a4fdc7d4ea042292c551dd1ed45b407de60a744c 100644 --- a/frontend/core/src/com/gameware/game/states/State.java +++ b/frontend/core/src/com/gameware/game/states/State.java @@ -50,12 +50,12 @@ public abstract class State { protected final float imageWidthAndHeigh = Gdx.graphics.getWidth()/4; // Textures - protected TextureRegionDrawable background = new TextureRegionDrawable(new TextureRegion(new Texture("bg1.jpg"))); - protected TextureRegionDrawable backgroundScore = new TextureRegionDrawable(new TextureRegion(new Texture("bg_score.jpg"))); - protected TextureRegionDrawable backgroundFinTourn = new TextureRegionDrawable(new TextureRegion(new Texture("bg1_finTourn.jpg"))); - protected TextureRegionDrawable backgroundTableBlueRounded = new TextureRegionDrawable(new TextureRegion(new Texture("tableBGRounded.png"))); + protected TextureRegionDrawable background = new TextureRegionDrawable(new TextureRegion(new Texture("state/bg1.jpg"))); + protected TextureRegionDrawable backgroundScore = new TextureRegionDrawable(new TextureRegion(new Texture("state/bg_score.jpg"))); + protected TextureRegionDrawable backgroundFinTourn = new TextureRegionDrawable(new TextureRegion(new Texture("state/bg1_finTourn.jpg"))); + protected TextureRegionDrawable backgroundTableBlueRounded = new TextureRegionDrawable(new TextureRegion(new Texture("state/tableBGRounded.png"))); - protected TextureRegionDrawable questionMark = new TextureRegionDrawable(new TextureRegion(new Texture("questionMarkIcon.png"))); + protected TextureRegionDrawable questionMark = new TextureRegionDrawable(new TextureRegion(new Texture("state/questionMarkIcon.png"))); // Sound Effects protected Sound buttonPressSound;