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

getting rid of the slick (App)GameContainer

Browse Source
This commit is contained in:
yugecin
2017-01-09 22:42:59 +01:00
parent d5796e5a1e
commit e8cac712fc
10 changed files with 315 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/yugecin/opsudance/states/transitions/FadeInTransitionState.java
View File

@@ -18,15 +18,15 @@
package yugecin.opsudance.states.transitions;
import com.google.inject.Inject;
import yugecin.opsudance.core.Container;
import yugecin.opsudance.core.Demux;
import yugecin.opsudance.core.DisplayContainer;
public class FadeInTransitionState extends FadeTransitionState {
private final Demux demux;
@Inject
public FadeInTransitionState(Container container, Demux demux) {
public FadeInTransitionState(DisplayContainer container, Demux demux) {
super(container, 300);
this.demux = demux;
}

4
src/yugecin/opsudance/states/transitions/FadeOutTransitionState.java
View File

@@ -18,8 +18,8 @@
package yugecin.opsudance.states.transitions;
import com.google.inject.Inject;
import yugecin.opsudance.core.Container;
import yugecin.opsudance.core.Demux;
import yugecin.opsudance.core.DisplayContainer;
public class FadeOutTransitionState extends FadeTransitionState {
@@ -27,7 +27,7 @@ public class FadeOutTransitionState extends FadeTransitionState {
private final FadeInTransitionState fadeInTransitionState;
@Inject
public FadeOutTransitionState(Container container, Demux demux, FadeInTransitionState fadeInTransitionState) {
public FadeOutTransitionState(DisplayContainer container, Demux demux, FadeInTransitionState fadeInTransitionState) {
super(container, 200);
this.demux = demux;
this.fadeInTransitionState = fadeInTransitionState;

8
src/yugecin/opsudance/states/transitions/FadeTransitionState.java
View File

@@ -19,21 +19,21 @@ package yugecin.opsudance.states.transitions;
import org.newdawn.slick.Color;
import org.newdawn.slick.Graphics;
import yugecin.opsudance.core.Container;
import yugecin.opsudance.core.DisplayContainer;
import yugecin.opsudance.states.GameState;
public abstract class FadeTransitionState extends TransitionState {
protected GameState applicableState;
private final Container container;
private final DisplayContainer container;
protected final int fadeTargetTime;
protected int fadeTime;
private final Color black;
public FadeTransitionState(Container container, int fadeTargetTime) {
public FadeTransitionState(DisplayContainer container, int fadeTargetTime) {
super(fadeTargetTime);
this.container = container;
this.fadeTargetTime = fadeTargetTime;
@@ -58,7 +58,7 @@ public abstract class FadeTransitionState extends TransitionState {
applicableState.render(g);
black.a = getMaskAlphaLevel((float) fadeTime / fadeTargetTime);
g.setColor(black);
g.fillRect(0, 0, container.getWidth(), container.getHeight());
g.fillRect(0, 0, container.width, container.height);
}
@Override