Add option to define custom game context

Author: bitbrain

Diff for: 2d/src/main/java/de/bitbrain/braingdx/graphics/VectorGameCamera.java

@@ -350,6 +350,11 @@ public void onEvent(int i, BaseTween<?> baseTween) {
       }
    }
 
+   @Override
+   public Vector2 getShake() {
+      return shake;
+   }
+
    @Override
    public void setStickToWorldBounds(boolean enabled) {
       this.worldBoundsStickiness = enabled;

Diff for: 2d/src/main/java/de/bitbrain/braingdx/screen/BrainGdxScreen2D.java

@@ -7,14 +7,18 @@
 import de.bitbrain.braingdx.screens.AbstractScreen;
 import de.bitbrain.braingdx.util.ArgumentFactory;
 
-public abstract class BrainGdxScreen2D<T extends BrainGdxGame> extends AbstractScreen<T, GameContext2D> {
+public abstract class BrainGdxScreen2D<T extends BrainGdxGame, C extends GameContext2D> extends AbstractScreen<T, C> {
 
    public BrainGdxScreen2D(final T game) {
-      super(game, new ArgumentFactory<AbstractScreen, GameContext2D>() {
+      super(game, new ArgumentFactory<AbstractScreen<T, C>, C>() {
          @Override
-         public GameContext2D create(AbstractScreen screen) {
-            return new GameContext2DImpl(screen.getViewportFactory(), new ShaderConfig(), game, screen);
+         public C create(AbstractScreen<T, C> screen) {
+            return (C) new GameContext2DImpl(screen.getViewportFactory(), new ShaderConfig(), game, screen);
          }
       });
    }
+
+   public BrainGdxScreen2D(final T game,ArgumentFactory<AbstractScreen<T, C>, C> argumentFactory) {
+      super(game, argumentFactory);
+   }
 }

Diff for: CHANGELOG.md

@@ -1,3 +1,8 @@
+# Version 0.6.31
+
+* expose screen shake value
+* add option to define custom game context
+
 # Version 0.6.30
 
 * add camera zoom tweening

Diff for: core/src/main/java/de/bitbrain/braingdx/graphics/GameCamera.java

@@ -1,6 +1,7 @@
 package de.bitbrain.braingdx.graphics;
 
 import com.badlogic.gdx.graphics.Camera;
+import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.math.Vector3;
 import de.bitbrain.braingdx.util.Resizeable;
 import de.bitbrain.braingdx.util.Updateable;
@@ -204,4 +205,6 @@ enum ZoomMode {
     * @param duration the length of the effect in seconds
     */
    void shake(float strength, float duration);
+
+   Vector2 getShake();
 }

Diff for: core/src/main/java/de/bitbrain/braingdx/screens/AbstractScreen.java

@@ -48,9 +48,9 @@ public Viewport create(int width, int height, Camera camera) {
    private boolean created = false;
    private T game;
    private C gameContext;
-   private ArgumentFactory<AbstractScreen, C> contextFactory;
+   private ArgumentFactory<AbstractScreen<T, C>, C> contextFactory;
 
-   public AbstractScreen(T game, ArgumentFactory<AbstractScreen, C> contextFactory) {
+   public AbstractScreen(T game, ArgumentFactory<AbstractScreen<T, C>, C> contextFactory) {
       this.game = game;
       this.contextFactory = contextFactory;
    }

Diff for: core/src/test/java/de/bitbrain/braingdx/screens/AbstractScreenTest.java

@@ -22,9 +22,9 @@ public void testRender() {
       final GameContext context = mock(GameContext.class);
       when(context.getBackgroundColor()).thenReturn(Color.BLACK);
       final AtomicBoolean onUpdateCalled = new AtomicBoolean();
-      ArgumentFactory<AbstractScreen, GameContext> contextArgumentFactory = new ArgumentFactory<AbstractScreen, GameContext>() {
+      ArgumentFactory<AbstractScreen<BrainGdxGame, GameContext>, GameContext> contextArgumentFactory = new ArgumentFactory<AbstractScreen<BrainGdxGame, GameContext>, GameContext>() {
          @Override
-         public GameContext create(AbstractScreen supplier) {
+         public GameContext create(AbstractScreen<BrainGdxGame, GameContext> supplier) {
             return context;
          }
       };