move demux into displaycontainer
This commit is contained in:
parent
09dfc68f16
commit
3ba50ebe60
|
@ -61,7 +61,7 @@ public class OpsuDance {
|
||||||
initUpdater(args);
|
initUpdater(args);
|
||||||
sout("database & updater initialized");
|
sout("database & updater initialized");
|
||||||
|
|
||||||
container.demux.init(EmptyState.class);
|
container.init(EmptyState.class);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
errorAndExit("startup failure", e);
|
errorAndExit("startup failure", e);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,190 +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;
|
|
||||||
|
|
||||||
import org.newdawn.slick.Graphics;
|
|
||||||
import org.newdawn.slick.Input;
|
|
||||||
import org.newdawn.slick.KeyListener;
|
|
||||||
import org.newdawn.slick.MouseListener;
|
|
||||||
import yugecin.opsudance.core.state.specialstates.FpsRenderState;
|
|
||||||
import yugecin.opsudance.core.state.transitions.*;
|
|
||||||
import yugecin.opsudance.core.errorhandling.ErrorDumpable;
|
|
||||||
import yugecin.opsudance.core.inject.InstanceContainer;
|
|
||||||
import yugecin.opsudance.core.state.OpsuState;
|
|
||||||
|
|
||||||
import java.io.StringWriter;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* state demultiplexer, sends events to current state
|
|
||||||
*/
|
|
||||||
public class Demux implements ErrorDumpable, KeyListener, MouseListener {
|
|
||||||
|
|
||||||
private final InstanceContainer instanceContainer;
|
|
||||||
|
|
||||||
private FpsRenderState fpsState;
|
|
||||||
|
|
||||||
private TransitionState outTransitionState;
|
|
||||||
private TransitionState inTransitionState;
|
|
||||||
|
|
||||||
private final TransitionFinishedListener outTransitionListener;
|
|
||||||
private final TransitionFinishedListener inTransitionListener;
|
|
||||||
|
|
||||||
private OpsuState state;
|
|
||||||
|
|
||||||
public Demux(final InstanceContainer instanceContainer) {
|
|
||||||
this.instanceContainer = instanceContainer;
|
|
||||||
|
|
||||||
outTransitionListener = new TransitionFinishedListener() {
|
|
||||||
@Override
|
|
||||||
public void onFinish() {
|
|
||||||
state.leave();
|
|
||||||
outTransitionState.getApplicableState().leave();
|
|
||||||
state = inTransitionState;
|
|
||||||
state.enter();
|
|
||||||
inTransitionState.getApplicableState().enter();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
inTransitionListener = new TransitionFinishedListener() {
|
|
||||||
@Override
|
|
||||||
public void onFinish() {
|
|
||||||
state.leave();
|
|
||||||
state = inTransitionState.getApplicableState();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
public void init(Class<? extends OpsuState> startingState) {
|
|
||||||
state = instanceContainer.provide(startingState);
|
|
||||||
state.enter();
|
|
||||||
|
|
||||||
fpsState = instanceContainer.provide(FpsRenderState.class);
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isTransitioning() {
|
|
||||||
return state instanceof TransitionState;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void switchState(Class<? extends OpsuState> newState) {
|
|
||||||
switchState(newState, FadeOutTransitionState.class, 200, FadeInTransitionState.class, 300);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void switchStateNow(Class<? extends OpsuState> newState) {
|
|
||||||
switchState(newState, EmptyTransitionState.class, 0, EmptyTransitionState.class, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void switchState(Class<? extends OpsuState> newState, Class<? extends TransitionState> outTransition, int outTime, Class<? extends TransitionState> inTransition, int inTime) {
|
|
||||||
if (isTransitioning()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
outTransitionState = instanceContainer.provide(outTransition).set(state, outTime, outTransitionListener);
|
|
||||||
inTransitionState = instanceContainer.provide(inTransition).set(instanceContainer.provide(newState), inTime, inTransitionListener);
|
|
||||||
state = outTransitionState;
|
|
||||||
state.enter();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void writeErrorDump(StringWriter dump) {
|
|
||||||
dump.append("> Demux dump\n");
|
|
||||||
if (isTransitioning()) {
|
|
||||||
dump.append("doing a transition\n");
|
|
||||||
dump.append("using out transition ").append(outTransitionState.getClass().getSimpleName()).append('\n');
|
|
||||||
dump.append("using in transition ").append(inTransitionState.getClass().getSimpleName()).append('\n');
|
|
||||||
if (state == inTransitionState) {
|
|
||||||
dump.append("currently doing the in transition\n");
|
|
||||||
} else {
|
|
||||||
dump.append("currently doing the out transition\n");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
state.writeErrorDump(dump);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* demux stuff below
|
|
||||||
*/
|
|
||||||
|
|
||||||
public void update(int delta) {
|
|
||||||
state.update(delta);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void preRenderUpdate(int delta) {
|
|
||||||
state.preRenderUpdate(delta);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void render(Graphics g) {
|
|
||||||
state.render(g);
|
|
||||||
fpsState.render(g);
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean onCloseRequest() {
|
|
||||||
return state.onCloseRequest();
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* input events below, see org.newdawn.slick.KeyListener & org.newdawn.slick.MouseListener
|
|
||||||
*/
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void keyPressed(int key, char c) {
|
|
||||||
state.keyPressed(key, c);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void keyReleased(int key, char c) {
|
|
||||||
state.keyReleased(key, c);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void mouseWheelMoved(int change) {
|
|
||||||
state.mouseWheelMoved(change);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void mouseClicked(int button, int x, int y, int clickCount) { }
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void mousePressed(int button, int x, int y) {
|
|
||||||
state.mousePressed(button, x, y);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void mouseReleased(int button, int x, int y) {
|
|
||||||
state.mouseReleased(button, x, y);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void mouseMoved(int oldx, int oldy, int newx, int newy) { }
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void mouseDragged(int oldx, int oldy, int newx, int newy) { }
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setInput(Input input) { }
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isAcceptingInput() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void inputEnded() { }
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void inputStarted() { }
|
|
||||||
|
|
||||||
}
|
|
|
@ -27,12 +27,18 @@ import org.lwjgl.opengl.DisplayMode;
|
||||||
import org.lwjgl.opengl.GL11;
|
import org.lwjgl.opengl.GL11;
|
||||||
import org.newdawn.slick.Graphics;
|
import org.newdawn.slick.Graphics;
|
||||||
import org.newdawn.slick.Input;
|
import org.newdawn.slick.Input;
|
||||||
|
import org.newdawn.slick.KeyListener;
|
||||||
|
import org.newdawn.slick.MouseListener;
|
||||||
import org.newdawn.slick.opengl.InternalTextureLoader;
|
import org.newdawn.slick.opengl.InternalTextureLoader;
|
||||||
import org.newdawn.slick.opengl.renderer.Renderer;
|
import org.newdawn.slick.opengl.renderer.Renderer;
|
||||||
import org.newdawn.slick.opengl.renderer.SGL;
|
import org.newdawn.slick.opengl.renderer.SGL;
|
||||||
import org.newdawn.slick.util.Log;
|
import org.newdawn.slick.util.Log;
|
||||||
import yugecin.opsudance.core.events.EventBus;
|
import yugecin.opsudance.core.events.EventBus;
|
||||||
import yugecin.opsudance.core.errorhandling.ErrorDumpable;
|
import yugecin.opsudance.core.errorhandling.ErrorDumpable;
|
||||||
|
import yugecin.opsudance.core.inject.InstanceContainer;
|
||||||
|
import yugecin.opsudance.core.state.OpsuState;
|
||||||
|
import yugecin.opsudance.core.state.specialstates.FpsRenderState;
|
||||||
|
import yugecin.opsudance.core.state.transitions.*;
|
||||||
import yugecin.opsudance.events.ResolutionChangedEvent;
|
import yugecin.opsudance.events.ResolutionChangedEvent;
|
||||||
import yugecin.opsudance.utils.GLHelper;
|
import yugecin.opsudance.utils.GLHelper;
|
||||||
|
|
||||||
|
@ -43,12 +49,22 @@ import static yugecin.opsudance.core.Entrypoint.sout;
|
||||||
/**
|
/**
|
||||||
* based on org.newdawn.slick.AppGameContainer
|
* based on org.newdawn.slick.AppGameContainer
|
||||||
*/
|
*/
|
||||||
public class DisplayContainer implements ErrorDumpable {
|
public class DisplayContainer implements ErrorDumpable, KeyListener, MouseListener {
|
||||||
|
|
||||||
private static SGL GL = Renderer.get();
|
private static SGL GL = Renderer.get();
|
||||||
|
|
||||||
public final EventBus eventBus;
|
public final EventBus eventBus;
|
||||||
public final Demux demux;
|
private final InstanceContainer instanceContainer;
|
||||||
|
|
||||||
|
private FpsRenderState fpsState;
|
||||||
|
|
||||||
|
private TransitionState outTransitionState;
|
||||||
|
private TransitionState inTransitionState;
|
||||||
|
|
||||||
|
private final TransitionFinishedListener outTransitionListener;
|
||||||
|
private final TransitionFinishedListener inTransitionListener;
|
||||||
|
|
||||||
|
private OpsuState state;
|
||||||
|
|
||||||
private final DisplayMode nativeDisplayMode;
|
private final DisplayMode nativeDisplayMode;
|
||||||
|
|
||||||
|
@ -71,9 +87,29 @@ public class DisplayContainer implements ErrorDumpable {
|
||||||
private String glVersion;
|
private String glVersion;
|
||||||
private String glVendor;
|
private String glVendor;
|
||||||
|
|
||||||
public DisplayContainer(Demux demux, EventBus eventBus) {
|
public DisplayContainer(InstanceContainer instanceContainer, EventBus eventBus) {
|
||||||
this.demux = demux;
|
this.instanceContainer = instanceContainer;
|
||||||
this.eventBus = eventBus;
|
this.eventBus = eventBus;
|
||||||
|
|
||||||
|
outTransitionListener = new TransitionFinishedListener() {
|
||||||
|
@Override
|
||||||
|
public void onFinish() {
|
||||||
|
state.leave();
|
||||||
|
outTransitionState.getApplicableState().leave();
|
||||||
|
state = inTransitionState;
|
||||||
|
state.enter();
|
||||||
|
inTransitionState.getApplicableState().enter();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
inTransitionListener = new TransitionFinishedListener() {
|
||||||
|
@Override
|
||||||
|
public void onFinish() {
|
||||||
|
state.leave();
|
||||||
|
state = inTransitionState.getApplicableState();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
this.nativeDisplayMode = Display.getDisplayMode();
|
this.nativeDisplayMode = Display.getDisplayMode();
|
||||||
targetRenderInterval = 16; // ~60 fps
|
targetRenderInterval = 16; // ~60 fps
|
||||||
targetBackgroundRenderInterval = 41; // ~24 fps
|
targetBackgroundRenderInterval = 41; // ~24 fps
|
||||||
|
@ -82,14 +118,22 @@ public class DisplayContainer implements ErrorDumpable {
|
||||||
realRenderInterval = 1;
|
realRenderInterval = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void init(Class<? extends OpsuState> startingState) {
|
||||||
|
state = instanceContainer.provide(startingState);
|
||||||
|
state.enter();
|
||||||
|
|
||||||
|
fpsState = instanceContainer.provide(FpsRenderState.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public void run() throws LWJGLException {
|
public void run() throws LWJGLException {
|
||||||
while(!(Display.isCloseRequested() && demux.onCloseRequest())) {
|
while(!(Display.isCloseRequested() && state.onCloseRequest())) {
|
||||||
delta = getDelta();
|
delta = getDelta();
|
||||||
|
|
||||||
timeSinceLastRender += delta;
|
timeSinceLastRender += delta;
|
||||||
|
|
||||||
input.poll(width, height);
|
input.poll(width, height);
|
||||||
demux.update(delta);
|
state.update(delta);
|
||||||
|
|
||||||
int maxRenderInterval;
|
int maxRenderInterval;
|
||||||
if (Display.isVisible() && Display.isActive()) {
|
if (Display.isVisible() && Display.isActive()) {
|
||||||
|
@ -108,8 +152,9 @@ public class DisplayContainer implements ErrorDumpable {
|
||||||
graphics.resetTransform();
|
graphics.resetTransform();
|
||||||
*/
|
*/
|
||||||
|
|
||||||
demux.preRenderUpdate(timeSinceLastRender);
|
state.preRenderUpdate(timeSinceLastRender);
|
||||||
demux.render(graphics);
|
state.render(graphics);
|
||||||
|
fpsState.render(graphics);
|
||||||
|
|
||||||
realRenderInterval = timeSinceLastRender;
|
realRenderInterval = timeSinceLastRender;
|
||||||
timeSinceLastRender = 0;
|
timeSinceLastRender = 0;
|
||||||
|
@ -184,8 +229,8 @@ public class DisplayContainer implements ErrorDumpable {
|
||||||
graphics.setAntiAlias(false);
|
graphics.setAntiAlias(false);
|
||||||
|
|
||||||
input = new Input(height);
|
input = new Input(height);
|
||||||
input.addKeyListener(demux);
|
input.addKeyListener(this);
|
||||||
input.addMouseListener(demux);
|
input.addMouseListener(this);
|
||||||
|
|
||||||
GameImage.init(width, height);
|
GameImage.init(width, height);
|
||||||
Fonts.init();
|
Fonts.init();
|
||||||
|
@ -206,7 +251,91 @@ public class DisplayContainer implements ErrorDumpable {
|
||||||
public void writeErrorDump(StringWriter dump) {
|
public void writeErrorDump(StringWriter dump) {
|
||||||
dump.append("> DisplayContainer dump\n");
|
dump.append("> DisplayContainer dump\n");
|
||||||
dump.append("OpenGL version: ").append(glVersion).append( "(").append(glVendor).append(")\n");
|
dump.append("OpenGL version: ").append(glVersion).append( "(").append(glVendor).append(")\n");
|
||||||
demux.writeErrorDump(dump);
|
if (isTransitioning()) {
|
||||||
|
dump.append("doing a transition\n");
|
||||||
|
dump.append("using out transition ").append(outTransitionState.getClass().getSimpleName()).append('\n');
|
||||||
|
dump.append("using in transition ").append(inTransitionState.getClass().getSimpleName()).append('\n');
|
||||||
|
if (state == inTransitionState) {
|
||||||
|
dump.append("currently doing the in transition\n");
|
||||||
|
} else {
|
||||||
|
dump.append("currently doing the out transition\n");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
state.writeErrorDump(dump);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean isTransitioning() {
|
||||||
|
return state instanceof TransitionState;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void switchState(Class<? extends OpsuState> newState) {
|
||||||
|
switchState(newState, FadeOutTransitionState.class, 200, FadeInTransitionState.class, 300);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void switchStateNow(Class<? extends OpsuState> newState) {
|
||||||
|
switchState(newState, EmptyTransitionState.class, 0, EmptyTransitionState.class, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void switchState(Class<? extends OpsuState> newState, Class<? extends TransitionState> outTransition, int outTime, Class<? extends TransitionState> inTransition, int inTime) {
|
||||||
|
if (isTransitioning()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
outTransitionState = instanceContainer.provide(outTransition).set(state, outTime, outTransitionListener);
|
||||||
|
inTransitionState = instanceContainer.provide(inTransition).set(instanceContainer.provide(newState), inTime, inTransitionListener);
|
||||||
|
state = outTransitionState;
|
||||||
|
state.enter();
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* input events below, see org.newdawn.slick.KeyListener & org.newdawn.slick.MouseListener
|
||||||
|
*/
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void keyPressed(int key, char c) {
|
||||||
|
state.keyPressed(key, c);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void keyReleased(int key, char c) {
|
||||||
|
state.keyReleased(key, c);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void mouseWheelMoved(int change) {
|
||||||
|
state.mouseWheelMoved(change);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void mouseClicked(int button, int x, int y, int clickCount) { }
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void mousePressed(int button, int x, int y) {
|
||||||
|
state.mousePressed(button, x, y);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void mouseReleased(int button, int x, int y) {
|
||||||
|
state.mouseReleased(button, x, y);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void mouseMoved(int oldx, int oldy, int newx, int newy) { }
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void mouseDragged(int oldx, int oldy, int newx, int newy) { }
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setInput(Input input) { }
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isAcceptingInput() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void inputEnded() { }
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void inputStarted() { }
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,7 +18,6 @@
|
||||||
package yugecin.opsudance.core.inject;
|
package yugecin.opsudance.core.inject;
|
||||||
|
|
||||||
import yugecin.opsudance.PreStartupInitializer;
|
import yugecin.opsudance.PreStartupInitializer;
|
||||||
import yugecin.opsudance.core.Demux;
|
|
||||||
import yugecin.opsudance.core.DisplayContainer;
|
import yugecin.opsudance.core.DisplayContainer;
|
||||||
import yugecin.opsudance.core.events.EventBus;
|
import yugecin.opsudance.core.events.EventBus;
|
||||||
import yugecin.opsudance.core.state.specialstates.FpsRenderState;
|
import yugecin.opsudance.core.state.specialstates.FpsRenderState;
|
||||||
|
@ -35,7 +34,6 @@ public class OpsuDanceInjector extends Injector {
|
||||||
bind(EventBus.class).asEagerSingleton();
|
bind(EventBus.class).asEagerSingleton();
|
||||||
|
|
||||||
bind(PreStartupInitializer.class).asEagerSingleton();
|
bind(PreStartupInitializer.class).asEagerSingleton();
|
||||||
bind(Demux.class).asEagerSingleton();
|
|
||||||
bind(DisplayContainer.class).asEagerSingleton();
|
bind(DisplayContainer.class).asEagerSingleton();
|
||||||
|
|
||||||
bind(ErrorHandler.class).asEagerSingleton();
|
bind(ErrorHandler.class).asEagerSingleton();
|
||||||
|
|
|
@ -41,7 +41,7 @@ public class EmptyRedState implements OpsuState {
|
||||||
if (counter < 0) {
|
if (counter < 0) {
|
||||||
counter = 10000; // to prevent more calls to switch, as this will keep rendering until state transitioned
|
counter = 10000; // to prevent more calls to switch, as this will keep rendering until state transitioned
|
||||||
System.out.println(System.currentTimeMillis() - start);
|
System.out.println(System.currentTimeMillis() - start);
|
||||||
displayContainer.demux.switchState(EmptyState.class);
|
displayContainer.switchState(EmptyState.class);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -39,7 +39,7 @@ public class EmptyState implements OpsuState {
|
||||||
counter -= delta;
|
counter -= delta;
|
||||||
if (counter < 0) {
|
if (counter < 0) {
|
||||||
counter = 10000; // to prevent more calls to switch, as this will keep rending until state transitioned
|
counter = 10000; // to prevent more calls to switch, as this will keep rending until state transitioned
|
||||||
displayContainer.demux.switchState(EmptyRedState.class);
|
displayContainer.switchState(EmptyRedState.class);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user