switching states using fade transitions

src/yugecin/opsudance/core/Container.java

@@ -30,6 +30,7 @@ public class Container extends AppGameContainer {
 	@Inject
 	public Container(Demux demux) throws SlickException {
 		super(demux);
+		setShowFPS(false);
 	}
 
 	@Override

src/yugecin/opsudance/core/ContainerWrapper.java

@@ -1,23 +0,0 @@
-/*
- * opsu!dance - fork of opsu! with cursordance auto
- * Copyright (C) 2017 yugecin
- *
- * opsu!dance is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * opsu!dance is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with opsu!dance.  If not, see <http://www.gnu.org/licenses/>.
- */
-package yugecin.opsudance.core;
-
-public class ContainerWrapper {
-
-
-}

src/yugecin/opsudance/core/Demux.java

@@ -18,19 +18,22 @@
 package yugecin.opsudance.core;
 
 import com.google.inject.Inject;
-import org.newdawn.slick.Game;
-import org.newdawn.slick.GameContainer;
-import org.newdawn.slick.Graphics;
-import org.newdawn.slick.SlickException;
+import org.newdawn.slick.*;
 import yugecin.opsudance.kernel.InstanceContainer;
 import yugecin.opsudance.states.EmptyState;
 import yugecin.opsudance.states.GameState;
+import yugecin.opsudance.states.transitions.FadeInTransitionState;
+import yugecin.opsudance.states.transitions.FadeOutTransitionState;
+import yugecin.opsudance.states.transitions.TransitionState;
 
 public class Demux implements Game {
 
 	private final InstanceContainer instanceContainer;
 
-	private GameState currentState;
+	private TransitionState fadeOutTransitionState;
+	private TransitionState fadeInTransitionState;
+
+	private GameState state;
 
 	@Inject
 	public Demux(InstanceContainer instanceContainer) {
@@ -39,22 +42,26 @@ public class Demux implements Game {
 
 	@Override
 	public void init(GameContainer container) throws SlickException {
-		currentState = instanceContainer.provide(EmptyState.class);
+		fadeOutTransitionState = instanceContainer.provide(FadeOutTransitionState.class);
+		fadeInTransitionState = instanceContainer.provide(FadeInTransitionState.class);
+		state = instanceContainer.provide(EmptyState.class);
+		state.enter();
 	}
 
 	@Override
 	public void update(GameContainer container, int delta) throws SlickException {
-		currentState.update(delta);
+		state.update(delta);
 	}
 
 	@Override
 	public void render(GameContainer container, Graphics g) throws SlickException {
-		currentState.render(g);
+		state.render(g);
 	}
 
 	@Override
 	public boolean closeRequested() {
-		return false;
+		// TODO for what is this used
+		return !isTransitioning();
 	}
 
 	@Override
@@ -62,4 +69,25 @@ public class Demux implements Game {
 		return "opsu!dance";
 	}
 
+	public boolean isTransitioning() {
+		return state == fadeInTransitionState || state == fadeOutTransitionState;
+	}
+
+	public void switchState(GameState newState) {
+		if (isTransitioning()) {
+			return;
+		}
+		fadeOutTransitionState.setApplicableState(state);
+		fadeInTransitionState.setApplicableState(newState);
+		state = fadeOutTransitionState;
+		state.enter();
+	}
+
+	public void switchStateNow(GameState newState) {
+		if (!isTransitioning()) {
+			return;
+		}
+		state = newState;
+	}
+
 }