Sunpy/opsu-dance
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

convert songmenu

Browse Source
This commit is contained in:
yugecin
2017-01-18 17:31:29 +01:00
parent 4541b507f2
commit 7004c9ef4d
5 changed files with 200 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/yugecin/opsudance/core/DisplayContainer.java
View File

@@ -30,7 +30,6 @@ import org.newdawn.slick.Graphics;
import org.newdawn.slick.Input;
import org.newdawn.slick.KeyListener;
import org.newdawn.slick.MouseListener;
import org.newdawn.slick.openal.SoundStore;
import org.newdawn.slick.opengl.InternalTextureLoader;
import org.newdawn.slick.opengl.renderer.Renderer;
import org.newdawn.slick.opengl.renderer.SGL;
@@ -76,7 +75,7 @@ public class DisplayContainer implements ErrorDumpable, KeyListener, MouseListen
public final DisplayMode nativeDisplayMode;
private Graphics graphics;
private Input input;
public Input input;
public int width;
public int height;
@@ -300,6 +299,10 @@ public class DisplayContainer implements ErrorDumpable, KeyListener, MouseListen
state.writeErrorDump(dump);
}
public boolean isInState(Class<? extends OpsuState> state) {
return state.isInstance(state);
}
public boolean isTransitioning() {
return state instanceof TransitionState;
}

2
src/yugecin/opsudance/core/inject/OpsuDanceInjector.java
View File

@@ -18,6 +18,7 @@
package yugecin.opsudance.core.inject;
import itdelatrisu.opsu.states.MainMenu;
import itdelatrisu.opsu.states.SongMenu;
import itdelatrisu.opsu.states.Splash;
import yugecin.opsudance.PreStartupInitializer;
import yugecin.opsudance.core.DisplayContainer;
@@ -55,6 +56,7 @@ public class OpsuDanceInjector extends Injector {
bind(Splash.class).asEagerSingleton();
bind(MainMenu.class).asEagerSingleton();
bind(SongMenu.class).asEagerSingleton();
}
}