From 5b264a52776d969928dc71e7be65ec3a3bd33117 Mon Sep 17 00:00:00 2001 From: yugecin Date: Fri, 30 Sep 2016 23:11:43 +0200 Subject: [PATCH] Option to hide all objects --- src/itdelatrisu/opsu/Options.java | 14 ++++++++++++++ src/itdelatrisu/opsu/states/Game.java | 18 +++++++++++------- src/itdelatrisu/opsu/states/OptionsMenu.java | 3 +++ src/yugecin/opsudance/Dancer.java | 1 + 4 files changed, 29 insertions(+), 7 deletions(-) diff --git a/src/itdelatrisu/opsu/Options.java b/src/itdelatrisu/opsu/Options.java index 79466a3b..ea509ffe 100644 --- a/src/itdelatrisu/opsu/Options.java +++ b/src/itdelatrisu/opsu/Options.java @@ -784,6 +784,20 @@ public class Options { } }, + DANCE_HIDE_OBJECTS ("Don't draw objects", "HideObj", "If you only want to see cursors :)", Dancer.hideobjects) { + @Override + public void click(GameContainer container) { + bool = !bool; + Dancer.hideobjects = bool; + } + + @Override + public void read(String s) { + super.read(s); + Dancer.hideobjects = bool; + } + }, + DANCE_REMOVE_BG ("Never draw background", "RemoveBG", "Hello darkness my old friend", Dancer.removebg) { @Override public void click(GameContainer container) { diff --git a/src/itdelatrisu/opsu/states/Game.java b/src/itdelatrisu/opsu/states/Game.java index 24d189ed..cdd6f79d 100644 --- a/src/itdelatrisu/opsu/states/Game.java +++ b/src/itdelatrisu/opsu/states/Game.java @@ -1422,12 +1422,14 @@ public class Game extends BasicGameState { // normal case if (!loseState) { - gameObj.draw(g, trackPosition, false); - if (Dancer.mirror && GameMod.AUTO.isActive()) { - g.pushTransform(); - g.rotate(Options.width / 2f, Options.height / 2f, 180f); - gameObj.draw(g, trackPosition, true); - g.popTransform(); + if (!Dancer.hideobjects) { + gameObj.draw(g, trackPosition, false); + if (Dancer.mirror && GameMod.AUTO.isActive()) { + g.pushTransform(); + g.rotate(Options.width / 2f, Options.height / 2f, 180f); + gameObj.draw(g, trackPosition, true); + g.popTransform(); + } } } // death: make objects "fall" off the screen @@ -1462,7 +1464,9 @@ public class Game extends BasicGameState { } // draw result objects - data.drawHitResults(trackPosition); + if (!Dancer.hideobjects) { + data.drawHitResults(trackPosition); + } } /** diff --git a/src/itdelatrisu/opsu/states/OptionsMenu.java b/src/itdelatrisu/opsu/states/OptionsMenu.java index 064580fe..bd135b75 100644 --- a/src/itdelatrisu/opsu/states/OptionsMenu.java +++ b/src/itdelatrisu/opsu/states/OptionsMenu.java @@ -113,12 +113,15 @@ public class OptionsMenu extends BasicGameState { GameOption.DANCE_CIRCLE_STREAMS, GameOption.DANCE_ONLY_CIRCLE_STACKS, GameOption.DANCE_MIRROR, + }), + DANCEDISP ("Dance display", new GameOption[] { GameOption.DANCE_DRAW_APPROACH, GameOption.DANCE_OBJECT_COLOR_OVERRIDE, GameOption.DANCE_OBJECT_COLOR_OVERRIDE_MIRRORED, GameOption.DANCE_RGB_INC, GameOption.DANCE_CURSOR_USE_OBJECT_COLOR, GameOption.DANCE_REMOVE_BG, + GameOption.DANCE_HIDE_OBJECTS, GameOption.DANCE_HIDE_UI, }), PIPPI ("Pippi", new GameOption[] { diff --git a/src/yugecin/opsudance/Dancer.java b/src/yugecin/opsudance/Dancer.java index 05329df4..95d41bb4 100644 --- a/src/yugecin/opsudance/Dancer.java +++ b/src/yugecin/opsudance/Dancer.java @@ -57,6 +57,7 @@ public class Dancer { public static int rgbhueinc = 70; // this should really get its own place somewhere... public static boolean cursoruselastobjectcolor = false; public static MoverDirection moverDirection = MoverDirection.RANDOM; + public static boolean hideobjects = false; private int dir; private GameObject p;