From 329d54c2308c4ed591454259d118e30e4bb9aadf Mon Sep 17 00:00:00 2001 From: Jeffrey Han Date: Mon, 16 Feb 2015 01:24:22 -0500 Subject: [PATCH] Minor changes. - Replaced duplicate GameImage.process_sub() calls from related images with calling a single method, for easier editing. - Suppress warnings from overwritten Slick2D classes. Signed-off-by: Jeffrey Han --- src/itdelatrisu/opsu/GameImage.java | 75 ++++++++++--------- .../opsu/audio/MusicController.java | 11 ++- src/itdelatrisu/opsu/states/Game.java | 2 +- src/org/newdawn/slick/Music.java | 1 + src/org/newdawn/slick/openal/SoundStore.java | 4 +- 5 files changed, 53 insertions(+), 40 deletions(-) diff --git a/src/itdelatrisu/opsu/GameImage.java b/src/itdelatrisu/opsu/GameImage.java index cdb4e999..2dfe20da 100644 --- a/src/itdelatrisu/opsu/GameImage.java +++ b/src/itdelatrisu/opsu/GameImage.java @@ -41,25 +41,25 @@ public enum GameImage { CURSOR_MIDDLE ("cursormiddle", "png") { @Override protected Image process_sub(Image img, int w, int h) { - return img.getScaledCopy(1 + ((h - 600) / 1000f)); + return CURSOR.process_sub(img, w, h); } }, CURSOR_TRAIL ("cursortrail", "png") { @Override protected Image process_sub(Image img, int w, int h) { - return img.getScaledCopy(1 + ((h - 600) / 1000f)); + return CURSOR.process_sub(img, w, h); } }, CURSOR_OLD ("cursor2", "png", false, false) { @Override protected Image process_sub(Image img, int w, int h) { - return img.getScaledCopy(1 + ((h - 600) / 1000f)); + return CURSOR.process_sub(img, w, h); } }, CURSOR_TRAIL_OLD ("cursortrail2", "png", false, false) { @Override protected Image process_sub(Image img, int w, int h) { - return img.getScaledCopy(1 + ((h - 600) / 1000f)); + return CURSOR.process_sub(img, w, h); } }, @@ -82,25 +82,25 @@ public enum GameImage { COUNTDOWN_3 ("count3", "png") { @Override protected Image process_sub(Image img, int w, int h) { - return img.getScaledCopy((h / 3f) / img.getHeight()); + return COUNTDOWN_READY.process_sub(img, w, h); } }, COUNTDOWN_2 ("count2", "png") { @Override protected Image process_sub(Image img, int w, int h) { - return img.getScaledCopy((h / 3f) / img.getHeight()); + return COUNTDOWN_READY.process_sub(img, w, h); } }, COUNTDOWN_1 ("count1", "png") { @Override protected Image process_sub(Image img, int w, int h) { - return img.getScaledCopy((h / 3f) / img.getHeight()); + return COUNTDOWN_READY.process_sub(img, w, h); } }, COUNTDOWN_GO ("go", "png") { @Override protected Image process_sub(Image img, int w, int h) { - return img.getScaledCopy((h / 3f) / img.getHeight()); + return COUNTDOWN_READY.process_sub(img, w, h); } }, HITCIRCLE_SELECT ("hitcircleselect", "png"), @@ -202,49 +202,49 @@ public enum GameImage { RANKING_SSH ("ranking-XH", "png") { @Override protected Image process_sub(Image img, int w, int h) { - return img.getScaledCopy((h / 2f) / img.getHeight()); + return RANKING_SS.process_sub(img, w, h); } }, RANKING_SSH_SMALL ("ranking-XH-small", "png"), RANKING_S ("ranking-S", "png") { @Override protected Image process_sub(Image img, int w, int h) { - return img.getScaledCopy((h / 2f) / img.getHeight()); + return RANKING_SS.process_sub(img, w, h); } }, RANKING_S_SMALL ("ranking-S-small", "png"), RANKING_SH ("ranking-SH", "png") { @Override protected Image process_sub(Image img, int w, int h) { - return img.getScaledCopy((h / 2f) / img.getHeight()); + return RANKING_SS.process_sub(img, w, h); } }, RANKING_SH_SMALL ("ranking-SH-small", "png"), RANKING_A ("ranking-A", "png") { @Override protected Image process_sub(Image img, int w, int h) { - return img.getScaledCopy((h / 2f) / img.getHeight()); + return RANKING_SS.process_sub(img, w, h); } }, RANKING_A_SMALL ("ranking-A-small", "png"), RANKING_B ("ranking-B", "png") { @Override protected Image process_sub(Image img, int w, int h) { - return img.getScaledCopy((h / 2f) / img.getHeight()); + return RANKING_SS.process_sub(img, w, h); } }, RANKING_B_SMALL ("ranking-B-small", "png"), RANKING_C ("ranking-C", "png") { @Override protected Image process_sub(Image img, int w, int h) { - return img.getScaledCopy((h / 2f) / img.getHeight()); + return RANKING_SS.process_sub(img, w, h); } }, RANKING_C_SMALL ("ranking-C-small", "png"), RANKING_D ("ranking-D", "png") { @Override protected Image process_sub(Image img, int w, int h) { - return img.getScaledCopy((h / 2f) / img.getHeight()); + return RANKING_SS.process_sub(img, w, h); } }, RANKING_D_SMALL ("ranking-D-small", "png"), @@ -315,59 +315,59 @@ public enum GameImage { MOD_NO_FAIL ("selection-mod-nofail", "png", false, false) { @Override protected Image process_sub(Image img, int w, int h) { - return img.getScaledCopy((h * 0.12f) / img.getHeight()); + return MOD_EASY.process_sub(img, w, h); } }, MOD_HARD_ROCK ("selection-mod-hardrock", "png", false, false) { @Override protected Image process_sub(Image img, int w, int h) { - return img.getScaledCopy((h * 0.12f) / img.getHeight()); + return MOD_EASY.process_sub(img, w, h); } }, MOD_SUDDEN_DEATH ("selection-mod-suddendeath", "png", false, false) { @Override protected Image process_sub(Image img, int w, int h) { - return img.getScaledCopy((h * 0.12f) / img.getHeight()); + return MOD_EASY.process_sub(img, w, h); } }, MOD_SPUN_OUT ("selection-mod-spunout", "png", false, false) { @Override protected Image process_sub(Image img, int w, int h) { - return img.getScaledCopy((h * 0.12f) / img.getHeight()); + return MOD_EASY.process_sub(img, w, h); } }, MOD_AUTO ("selection-mod-autoplay", "png", false, false) { @Override protected Image process_sub(Image img, int w, int h) { - return img.getScaledCopy((h * 0.12f) / img.getHeight()); + return MOD_EASY.process_sub(img, w, h); } }, MOD_HALF_TIME ("selection-mod-halftime", "png", false, false) { @Override protected Image process_sub(Image img, int w, int h) { - return img.getScaledCopy((h * 0.12f) / img.getHeight()); + return MOD_EASY.process_sub(img, w, h); } }, MOD_DOUBLE_TIME ("selection-mod-doubletime", "png", false, false) { @Override protected Image process_sub(Image img, int w, int h) { - return img.getScaledCopy((h * 0.12f) / img.getHeight()); + return MOD_EASY.process_sub(img, w, h); } }, MOD_HIDDEN ("selection-mod-hidden", "png", false, false) { @Override protected Image process_sub(Image img, int w, int h) { - return img.getScaledCopy((h * 0.12f) / img.getHeight()); + return MOD_EASY.process_sub(img, w, h); } }, MOD_FLASHLIGHT ("selection-mod-flashlight", "png", false, false) { @Override protected Image process_sub(Image img, int w, int h) { - return img.getScaledCopy((h * 0.12f) / img.getHeight()); + return MOD_EASY.process_sub(img, w, h); } }, - // Non-Game Components + // Selection Buttons SELECTION_MODS ("selection-mods", "png", false, false) { @Override protected Image process_sub(Image img, int w, int h) { @@ -377,45 +377,47 @@ public enum GameImage { SELECTION_MODS_OVERLAY ("selection-mods-over", "png", false, false) { @Override protected Image process_sub(Image img, int w, int h) { - return img.getScaledCopy((h * 0.115f) / img.getHeight()); + return SELECTION_MODS.process_sub(img, w, h); } }, SELECTION_RANDOM ("selection-random", "png", false, false) { @Override protected Image process_sub(Image img, int w, int h) { - return img.getScaledCopy((h * 0.115f) / img.getHeight()); + return SELECTION_MODS.process_sub(img, w, h); } }, SELECTION_RANDOM_OVERLAY ("selection-random-over", "png", false, false) { @Override protected Image process_sub(Image img, int w, int h) { - return img.getScaledCopy((h * 0.115f) / img.getHeight()); + return SELECTION_MODS.process_sub(img, w, h); } }, SELECTION_OPTIONS ("selection-options", "png", false, false) { @Override protected Image process_sub(Image img, int w, int h) { - return img.getScaledCopy((h * 0.115f) / img.getHeight()); + return SELECTION_MODS.process_sub(img, w, h); } }, SELECTION_OPTIONS_OVERLAY ("selection-options-over", "png", false, false) { @Override protected Image process_sub(Image img, int w, int h) { - return img.getScaledCopy((h * 0.115f) / img.getHeight()); + return SELECTION_MODS.process_sub(img, w, h); } }, SELECTION_OTHER_OPTIONS ("selection-selectoptions", "png", false, false) { @Override protected Image process_sub(Image img, int w, int h) { - return img.getScaledCopy((h * 0.115f) / img.getHeight()); + return SELECTION_MODS.process_sub(img, w, h); } }, SELECTION_OTHER_OPTIONS_OVERLAY ("selection-selectoptions-over", "png", false, false) { @Override protected Image process_sub(Image img, int w, int h) { - return img.getScaledCopy((h * 0.115f) / img.getHeight()); + return SELECTION_MODS.process_sub(img, w, h); } }, + + // Non-Game Components VOLUME ("volume-bg", "png", false, false) { @Override protected Image process_sub(Image img, int w, int h) { @@ -483,6 +485,8 @@ public enum GameImage { MENU_BUTTON_MID ("button-middle", "png", false, false), MENU_BUTTON_LEFT ("button-left", "png", false, false), MENU_BUTTON_RIGHT ("button-right", "png", false, false), + + // Music Player Buttons MUSIC_PLAY ("music-play", "png", false, false) { @Override protected Image process_sub(Image img, int w, int h) { @@ -492,21 +496,22 @@ public enum GameImage { MUSIC_PAUSE ("music-pause", "png", false, false) { @Override protected Image process_sub(Image img, int w, int h) { - return img.getScaledCopy((h / 18f) / img.getHeight()); + return MUSIC_PLAY.process_sub(img, w, h); } }, MUSIC_NEXT ("music-next", "png", false, false) { @Override protected Image process_sub(Image img, int w, int h) { - return img.getScaledCopy((h / 18f) / img.getHeight()); + return MUSIC_PLAY.process_sub(img, w, h); } }, MUSIC_PREVIOUS ("music-previous", "png", false, false) { @Override protected Image process_sub(Image img, int w, int h) { - return img.getScaledCopy((h / 18f) / img.getHeight()); + return MUSIC_PLAY.process_sub(img, w, h); } }, + RANKING_RETRY ("ranking-retry", "png", false, false) { @Override protected Image process_sub(Image img, int w, int h) { diff --git a/src/itdelatrisu/opsu/audio/MusicController.java b/src/itdelatrisu/opsu/audio/MusicController.java index 0cfe8bb8..2a540017 100644 --- a/src/itdelatrisu/opsu/audio/MusicController.java +++ b/src/itdelatrisu/opsu/audio/MusicController.java @@ -248,10 +248,15 @@ public class MusicController { /** * Plays the current track. + * @param loop whether or not to loop the track */ - public static void play() { - if (trackExists()) - player.play(); + public static void play(boolean loop) { + if (trackExists()) { + if (loop) + player.loop(); + else + player.play(); + } } /** diff --git a/src/itdelatrisu/opsu/states/Game.java b/src/itdelatrisu/opsu/states/Game.java index 1d5163b6..df4bbdd1 100644 --- a/src/itdelatrisu/opsu/states/Game.java +++ b/src/itdelatrisu/opsu/states/Game.java @@ -701,7 +701,7 @@ public class Game extends BasicGameState { resetGameData(); // needs to play before setting position to resume without lag later - MusicController.play(); + MusicController.play(false); MusicController.setPosition(0); MusicController.pause(); diff --git a/src/org/newdawn/slick/Music.java b/src/org/newdawn/slick/Music.java index 7bf70396..c3da9aeb 100644 --- a/src/org/newdawn/slick/Music.java +++ b/src/org/newdawn/slick/Music.java @@ -44,6 +44,7 @@ import org.newdawn.slick.util.Log; * @author kevin * @author Nathan Sweet */ +@SuppressWarnings({"rawtypes", "unchecked"}) public class Music { /** The music currently being played or null if none */ private static Music currentMusic; diff --git a/src/org/newdawn/slick/openal/SoundStore.java b/src/org/newdawn/slick/openal/SoundStore.java index 64fc2382..71c5319a 100644 --- a/src/org/newdawn/slick/openal/SoundStore.java +++ b/src/org/newdawn/slick/openal/SoundStore.java @@ -52,6 +52,7 @@ import org.newdawn.slick.util.ResourceLoader; * @author Kevin Glass * @author Rockstar setVolume cleanup */ +@SuppressWarnings({"rawtypes", "unchecked", "unused"}) public class SoundStore { /** The single instance of this class */ @@ -318,7 +319,8 @@ public class SoundStore { inited = true; AccessController.doPrivileged(new PrivilegedAction() { - public Object run() { + @Override + public Object run() { try { AL.create(); soundWorks = true;