From d51f5cb11eb46cdfc045ee7f20178b79c45e3225 Mon Sep 17 00:00:00 2001 From: Michael Carleton Date: Thu, 26 Dec 2024 21:00:53 +0000 Subject: [PATCH] settings menu backgrounds --- src/main/java/project_16x16/Audio.java | 3 ++- src/main/java/project_16x16/SideScroller.java | 2 +- .../project_16x16/scene/AudioSettings.java | 23 +++++++++++++------ .../project_16x16/scene/ControlsSettings.java | 11 ++++++++- .../project_16x16/scene/GraphicsSettings.java | 21 ++++++++--------- .../java/project_16x16/scene/MainMenu.java | 2 +- .../java/project_16x16/scene/Settings.java | 2 +- 7 files changed, 41 insertions(+), 23 deletions(-) diff --git a/src/main/java/project_16x16/Audio.java b/src/main/java/project_16x16/Audio.java index dc3c8b7b..f86a9a54 100644 --- a/src/main/java/project_16x16/Audio.java +++ b/src/main/java/project_16x16/Audio.java @@ -28,7 +28,8 @@ public final class Audio { public enum BGM { TEST0("first_theme.mp3"), // TODO TEST1("cyberSynthwave.mp3"), // TODO - TEST2("First_level_take_1.mp3"), TEST3("Intro_Title_Pause_Screen_Take1_Loopable.mp3"); + TEST2("First_level_take_1.mp3"), + TEST3("Intro_Title_Pause_Screen_Take1_Loopable.mp3"); private String filename; diff --git a/src/main/java/project_16x16/SideScroller.java b/src/main/java/project_16x16/SideScroller.java index 6c747b0c..7466b14e 100644 --- a/src/main/java/project_16x16/SideScroller.java +++ b/src/main/java/project_16x16/SideScroller.java @@ -331,7 +331,7 @@ public void keyPressed(processing.event.KeyEvent event) { * keyReleased decides if the key pressed is valid and if it is then removes it * from the keys ArrayList and keyReleaseEvent flag is set. * - * FOR GLOBAL KEYS ONLY + * FOR GLOBAL KEYS ONLY (dev tools mostly for now...) */ @Override public void keyReleased(processing.event.KeyEvent event) { diff --git a/src/main/java/project_16x16/scene/AudioSettings.java b/src/main/java/project_16x16/scene/AudioSettings.java index f7836bc7..c2fd717d 100644 --- a/src/main/java/project_16x16/scene/AudioSettings.java +++ b/src/main/java/project_16x16/scene/AudioSettings.java @@ -51,7 +51,7 @@ public AudioSettings(SideScroller a) { volumeSFX = new Slider(game, 0.75f); volumeSFX.setText("SFX"); volumeSFX.setPosition(a.width / 2, 350); - + } @Override @@ -59,19 +59,28 @@ public void switchTo() { originalVolumeBGM = Options.gainBGM; originalVolumeSFX = Options.gainSFX; // TODO properly align audio value and slider position - //volumeBGM.setValue(PApplet.map(originalVolumeBGM, -60, 0, 0, 1)); - //volumeSFX.setValue(PApplet.map(originalVolumeSFX, -60, 0, 0, 1)); + // volumeBGM.setValue(PApplet.map(originalVolumeBGM, -60, 0, 0, 1)); + // volumeSFX.setValue(PApplet.map(originalVolumeSFX, -60, 0, 0, 1)); super.switchTo(); } @Override public void drawUI() { - game.background(Constants.Colors.MENU_GREY); + displayWindow(); apply.display(); quit.display(); volumeBGM.display(); volumeSFX.display(); - + + } + + private void displayWindow() { + background(19, 23, 35); + applet.fill(29, 33, 45); + applet.stroke(47, 54, 73); + applet.strokeWeight(8); + applet.rect(applet.gameResolution.x / 2, applet.gameResolution.y / 2, applet.gameResolution.x * 0.66f - 8, + applet.gameResolution.y - 8); } @Override @@ -112,10 +121,10 @@ void mouseReleased(MouseEvent e) { @Override void keyReleased(KeyEvent e) { switch (e.getKeyCode()) { - case PConstants.ESC : // Pause + case PConstants.ESC: // Pause game.returnScene(); break; - default : + default: break; } } diff --git a/src/main/java/project_16x16/scene/ControlsSettings.java b/src/main/java/project_16x16/scene/ControlsSettings.java index 35e5f54f..4ac91452 100644 --- a/src/main/java/project_16x16/scene/ControlsSettings.java +++ b/src/main/java/project_16x16/scene/ControlsSettings.java @@ -84,7 +84,7 @@ public void switchTo() { @Override public void drawUI() { - game.background(Constants.Colors.MENU_GREY); + displayWindow(); apply.display(); quit.display(); @@ -99,6 +99,15 @@ public void drawUI() { game.text("Press a key to change the control!", game.width / 2, 100); } } + + private void displayWindow() { + background(19, 23, 35); + applet.fill(29, 33, 45); + applet.stroke(47, 54, 73); + applet.strokeWeight(8); + applet.rect(applet.gameResolution.x / 2, applet.gameResolution.y / 2, applet.gameResolution.x * 0.66f - 8, + applet.gameResolution.y - 8); + } @Override void mouseReleased(MouseEvent e) { diff --git a/src/main/java/project_16x16/scene/GraphicsSettings.java b/src/main/java/project_16x16/scene/GraphicsSettings.java index dc91a607..9b7f4174 100644 --- a/src/main/java/project_16x16/scene/GraphicsSettings.java +++ b/src/main/java/project_16x16/scene/GraphicsSettings.java @@ -1,17 +1,11 @@ package project_16x16.scene; -import processing.core.PApplet; import processing.core.PConstants; import processing.event.KeyEvent; import processing.event.MouseEvent; -import project_16x16.Audio; -import project_16x16.Constants; -import project_16x16.Options; -import project_16x16.Options.Option; import project_16x16.SideScroller; import project_16x16.ui.Button; import project_16x16.ui.Notifications; -import project_16x16.ui.Slider; public final class GraphicsSettings extends PScene { @@ -37,18 +31,23 @@ public GraphicsSettings(SideScroller a) { @Override public void switchTo() { - // TODO properly align audio value and slider position - //volumeBGM.setValue(PApplet.map(originalVolumeBGM, -60, 0, 0, 1)); - //volumeSFX.setValue(PApplet.map(originalVolumeSFX, -60, 0, 0, 1)); super.switchTo(); } @Override public void drawUI() { - game.background(Constants.Colors.MENU_GREY); + displayWindow(); apply.display(); quit.display(); - + } + + private void displayWindow() { + background(19, 23, 35); + applet.fill(29, 33, 45); + applet.stroke(47, 54, 73); + applet.strokeWeight(8); + applet.rect(applet.gameResolution.x / 2, applet.gameResolution.y / 2, applet.gameResolution.x * 0.66f - 8, + applet.gameResolution.y - 8); } @Override diff --git a/src/main/java/project_16x16/scene/MainMenu.java b/src/main/java/project_16x16/scene/MainMenu.java index 4282d3b6..bb6a41da 100644 --- a/src/main/java/project_16x16/scene/MainMenu.java +++ b/src/main/java/project_16x16/scene/MainMenu.java @@ -27,7 +27,7 @@ public final class MainMenu extends PScene { public Button pressStart; public Button pressQuit; - public Button pressSettings; // TODO add settings menu + public Button pressSettings; public Button pressMultiplayer; private SideScroller game; diff --git a/src/main/java/project_16x16/scene/Settings.java b/src/main/java/project_16x16/scene/Settings.java index a11999c5..cf7eb7bb 100644 --- a/src/main/java/project_16x16/scene/Settings.java +++ b/src/main/java/project_16x16/scene/Settings.java @@ -74,7 +74,7 @@ public void drawUI() { applet.fill(255); applet.textSize(60); applet.textAlign(CENTER, TOP); - applet.text("Options", applet.gameResolution.x / 2, 20); + applet.text("Settings", applet.gameResolution.x / 2, 20); quit.display(); apply.display();