diff --git a/2d/src/main/java/de/bitbrain/braingdx/screen/AbstractBrainGdxScreen2D.java b/2d/src/main/java/de/bitbrain/braingdx/screen/AbstractBrainGdxScreen2D.java new file mode 100644 index 000000000..592321878 --- /dev/null +++ b/2d/src/main/java/de/bitbrain/braingdx/screen/AbstractBrainGdxScreen2D.java @@ -0,0 +1,24 @@ +package de.bitbrain.braingdx.screen; + +import de.bitbrain.braingdx.BrainGdxGame; +import de.bitbrain.braingdx.context.GameContext2D; +import de.bitbrain.braingdx.context.GameContext2DImpl; +import de.bitbrain.braingdx.graphics.shader.ShaderConfig; +import de.bitbrain.braingdx.screens.AbstractScreen; +import de.bitbrain.braingdx.util.ArgumentFactory; + +public abstract class AbstractBrainGdxScreen2D extends AbstractScreen { + + public AbstractBrainGdxScreen2D(final T game) { + super(game, new ArgumentFactory, C>() { + @Override + public C create(AbstractScreen screen) { + return (C) new GameContext2DImpl(screen.getViewportFactory(), new ShaderConfig(), game, screen); + } + }); + } + + public AbstractBrainGdxScreen2D(final T game, ArgumentFactory, C> argumentFactory) { + super(game, argumentFactory); + } +} diff --git a/2d/src/main/java/de/bitbrain/braingdx/screen/BrainGdxScreen2D.java b/2d/src/main/java/de/bitbrain/braingdx/screen/BrainGdxScreen2D.java index 7b04682fa..24b598c0e 100644 --- a/2d/src/main/java/de/bitbrain/braingdx/screen/BrainGdxScreen2D.java +++ b/2d/src/main/java/de/bitbrain/braingdx/screen/BrainGdxScreen2D.java @@ -2,23 +2,10 @@ import de.bitbrain.braingdx.BrainGdxGame; import de.bitbrain.braingdx.context.GameContext2D; -import de.bitbrain.braingdx.context.GameContext2DImpl; -import de.bitbrain.braingdx.graphics.shader.ShaderConfig; -import de.bitbrain.braingdx.screens.AbstractScreen; -import de.bitbrain.braingdx.util.ArgumentFactory; -public abstract class BrainGdxScreen2D extends AbstractScreen { +public abstract class BrainGdxScreen2D extends AbstractBrainGdxScreen2D { - public BrainGdxScreen2D(final T game) { - super(game, new ArgumentFactory, C>() { - @Override - public C create(AbstractScreen screen) { - return (C) new GameContext2DImpl(screen.getViewportFactory(), new ShaderConfig(), game, screen); - } - }); - } - - public BrainGdxScreen2D(final T game,ArgumentFactory, C> argumentFactory) { - super(game, argumentFactory); + public BrainGdxScreen2D(BrainGdxGame game) { + super(game); } } diff --git a/CHANGELOG.md b/CHANGELOG.md index a92932401..8a1fe86dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# Version 0.6.32 + +* simplify screens by making generic arguments optional + # Version 0.6.31 * expose screen shake value