getting rid of static instance
This commit is contained in:
parent
be23541ac3
commit
a65428fe5f
|
@ -371,13 +371,13 @@ public class Slider extends GameObject {
|
||||||
float followCircleScale = 1f + (tickExpandTime / (float) TICK_EXPAND_TIME) * 0.1f;
|
float followCircleScale = 1f + (tickExpandTime / (float) TICK_EXPAND_TIME) * 0.1f;
|
||||||
float followAlpha = 1f;
|
float followAlpha = 1f;
|
||||||
if (followCircleActive && followExpandTime < FOLLOW_EXPAND_TIME) {
|
if (followCircleActive && followExpandTime < FOLLOW_EXPAND_TIME) {
|
||||||
followExpandTime += DisplayContainer.instance.renderDelta;
|
followExpandTime += displayContainer.renderDelta;
|
||||||
followCircleScale *= 0.5f;
|
followCircleScale *= 0.5f;
|
||||||
float progress = AnimationEquation.OUT_QUAD.calc((float) followExpandTime / FOLLOW_EXPAND_TIME);
|
float progress = AnimationEquation.OUT_QUAD.calc((float) followExpandTime / FOLLOW_EXPAND_TIME);
|
||||||
followCircleScale = followCircleScale + followCircleScale * progress;
|
followCircleScale = followCircleScale + followCircleScale * progress;
|
||||||
followAlpha = progress;
|
followAlpha = progress;
|
||||||
} else if (!followCircleActive) {
|
} else if (!followCircleActive) {
|
||||||
followExpandTime -= DisplayContainer.instance.renderDelta;
|
followExpandTime -= displayContainer.renderDelta;
|
||||||
if (followExpandTime > FOLLOW_SHRINK_TIME) {
|
if (followExpandTime > FOLLOW_SHRINK_TIME) {
|
||||||
followExpandTime = FOLLOW_SHRINK_TIME;
|
followExpandTime = FOLLOW_SHRINK_TIME;
|
||||||
}
|
}
|
||||||
|
|
|
@ -65,9 +65,6 @@ import static yugecin.opsudance.options.Options.*;
|
||||||
*/
|
*/
|
||||||
public class DisplayContainer implements ErrorDumpable, KeyListener, MouseListener {
|
public class DisplayContainer implements ErrorDumpable, KeyListener, MouseListener {
|
||||||
|
|
||||||
@Deprecated
|
|
||||||
public static DisplayContainer instance; // TODO d remove this
|
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
private SkinService skinService;
|
private SkinService skinService;
|
||||||
|
|
||||||
|
@ -131,7 +128,6 @@ public class DisplayContainer implements ErrorDumpable, KeyListener, MouseListen
|
||||||
this.instanceContainer = instanceContainer;
|
this.instanceContainer = instanceContainer;
|
||||||
this.cursor = new Cursor();
|
this.cursor = new Cursor();
|
||||||
drawCursor = true;
|
drawCursor = true;
|
||||||
instance = this;
|
|
||||||
|
|
||||||
outTransitionListener = new TransitionFinishedListener() {
|
outTransitionListener = new TransitionFinishedListener() {
|
||||||
@Override
|
@Override
|
||||||
|
|
Loading…
Reference in New Issue
Block a user