Merge branch 'feature-preloader' into 'devel'

Feature preloader



See merge request !302

core/src/cz/nic/tablexia/TablexiaApplication.java

@@ -91,7 +91,7 @@ public abstract class TablexiaApplication implements ApplicationListener {
     private static final int    SCREEN_LOADER_MOUSE_FRAMES    =  9;
 
     //Adding a little offset to the mouse, because it doesnt feel centered because of a space around the tail
-    private static final float  SCREEN_LOADER_MOUSE_WIDTH     =  0.28f;
+    private static final float  SCREEN_LOADER_MOUSE_WIDTH     =  0.20f;
     private static final float  SCREEN_LOADER_MOUSE_OFFSET_X  = -0.13f;
     private static final float  SCREEN_LOADER_MOUSE_DELAY     =  1.0f;
     private static final float  SCREEN_LOADER_MOUSE_FADEIN    =  0.5f;
@@ -352,7 +352,7 @@ public abstract class TablexiaApplication implements ApplicationListener {
 
         screenLoaderMouse.setPosition(
                 TablexiaSettings.getViewportWidth(getStage()) / 2f - screenLoaderMouse.getWidth() / 2f + (screenLoaderMouse.getWidth() * SCREEN_LOADER_MOUSE_OFFSET_X),
-                TablexiaSettings.getViewportHeight(getStage()) / 2f - screenLoaderMouse.getHeight() / 2f
+				TablexiaSettings.getActorSceneVerticalCenter(getStage(), screenLoaderMouse)
         );
 
         screenLoaderMouse.addAction(Actions.alpha(0));

core/src/cz/nic/tablexia/TablexiaSettings.java

@@ -3,6 +3,7 @@ package cz.nic.tablexia;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.Preferences;
 import com.badlogic.gdx.graphics.Color;
+import com.badlogic.gdx.scenes.scene2d.Actor;
 import com.badlogic.gdx.scenes.scene2d.InputEvent;
 import com.badlogic.gdx.scenes.scene2d.Stage;
 import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
@@ -516,4 +517,8 @@ public class TablexiaSettings {
     public static float getViewportHeight(Stage stage) {
         return getViewportTopY(stage) - getViewportBottomY(stage);
     }
+
+	public static float getActorSceneVerticalCenter(Stage stage, Actor actor) {
+		return getViewportHeight(stage) / 2f - actor.getHeight() / 2f + getViewportBottomY(stage);
+	}
 }
\ No newline at end of file