diff --git a/core/assets/common/screen/debug/checker.png b/core/assets/common/screen/debug/checker.png new file mode 100644 index 0000000000000000000000000000000000000000..3b6cf9854d9be63a361d443eb0bbca60813714b2 Binary files /dev/null and b/core/assets/common/screen/debug/checker.png differ diff --git a/core/assets/common/screen/debug/point.png b/core/assets/common/screen/debug/point.png new file mode 100644 index 0000000000000000000000000000000000000000..e5328a7b3a237e8774cda4b5fd7132826a4c5a4f Binary files /dev/null and b/core/assets/common/screen/debug/point.png differ diff --git a/core/assets/common/screen/gamemenu/bankovniloupez_back.png b/core/assets/common/screen/gamemenu/gfx/bankovniloupez_back.png similarity index 100% rename from core/assets/common/screen/gamemenu/bankovniloupez_back.png rename to core/assets/common/screen/gamemenu/gfx/bankovniloupez_back.png diff --git a/core/assets/common/screen/gamemenu/bankovniloupez_fore.png b/core/assets/common/screen/gamemenu/gfx/bankovniloupez_fore.png similarity index 100% rename from core/assets/common/screen/gamemenu/bankovniloupez_fore.png rename to core/assets/common/screen/gamemenu/gfx/bankovniloupez_fore.png diff --git a/core/assets/common/screen/gamemenu/bankovniloupez_mid.png b/core/assets/common/screen/gamemenu/gfx/bankovniloupez_mid.png similarity index 100% rename from core/assets/common/screen/gamemenu/bankovniloupez_mid.png rename to core/assets/common/screen/gamemenu/gfx/bankovniloupez_mid.png diff --git a/core/assets/common/screen/gamemenu/clickablemap.png b/core/assets/common/screen/gamemenu/gfx/clickablemap.png similarity index 100% rename from core/assets/common/screen/gamemenu/clickablemap.png rename to core/assets/common/screen/gamemenu/gfx/clickablemap.png diff --git a/core/assets/common/screen/gamemenu/desk.png b/core/assets/common/screen/gamemenu/gfx/desk.png similarity index 100% rename from core/assets/common/screen/gamemenu/desk.png rename to core/assets/common/screen/gamemenu/gfx/desk.png diff --git a/core/assets/common/screen/gamemenu/difficultyseekbar_background.png b/core/assets/common/screen/gamemenu/gfx/difficultyseekbar_background.png similarity index 100% rename from core/assets/common/screen/gamemenu/difficultyseekbar_background.png rename to core/assets/common/screen/gamemenu/gfx/difficultyseekbar_background.png diff --git a/core/assets/common/screen/gamemenu/difficultyseekbar_thumb.png b/core/assets/common/screen/gamemenu/gfx/difficultyseekbar_thumb.png similarity index 100% rename from core/assets/common/screen/gamemenu/difficultyseekbar_thumb.png rename to core/assets/common/screen/gamemenu/gfx/difficultyseekbar_thumb.png diff --git a/core/assets/common/screen/gamemenu/difficultyseekbar_thumb_easy.png b/core/assets/common/screen/gamemenu/gfx/difficultyseekbar_thumb_easy.png similarity index 100% rename from core/assets/common/screen/gamemenu/difficultyseekbar_thumb_easy.png rename to core/assets/common/screen/gamemenu/gfx/difficultyseekbar_thumb_easy.png diff --git a/core/assets/common/screen/gamemenu/difficultyseekbar_thumb_hard.png b/core/assets/common/screen/gamemenu/gfx/difficultyseekbar_thumb_hard.png similarity index 100% rename from core/assets/common/screen/gamemenu/difficultyseekbar_thumb_hard.png rename to core/assets/common/screen/gamemenu/gfx/difficultyseekbar_thumb_hard.png diff --git a/core/assets/common/screen/gamemenu/difficultyseekbar_thumb_medium.png b/core/assets/common/screen/gamemenu/gfx/difficultyseekbar_thumb_medium.png similarity index 100% rename from core/assets/common/screen/gamemenu/difficultyseekbar_thumb_medium.png rename to core/assets/common/screen/gamemenu/gfx/difficultyseekbar_thumb_medium.png diff --git a/core/assets/common/screen/gamemenu/encyclopedia_pressed.png b/core/assets/common/screen/gamemenu/gfx/encyclopedia_pressed.png similarity index 100% rename from core/assets/common/screen/gamemenu/encyclopedia_pressed.png rename to core/assets/common/screen/gamemenu/gfx/encyclopedia_pressed.png diff --git a/core/assets/common/screen/gamemenu/halloffame_pressed.png b/core/assets/common/screen/gamemenu/gfx/halloffame_pressed.png similarity index 100% rename from core/assets/common/screen/gamemenu/halloffame_pressed.png rename to core/assets/common/screen/gamemenu/gfx/halloffame_pressed.png diff --git a/core/assets/common/screen/gamemenu/helpbutton_pressed.png b/core/assets/common/screen/gamemenu/gfx/helpbutton_pressed.png similarity index 100% rename from core/assets/common/screen/gamemenu/helpbutton_pressed.png rename to core/assets/common/screen/gamemenu/gfx/helpbutton_pressed.png diff --git a/core/assets/common/screen/gamemenu/helpbutton_unpressed.png b/core/assets/common/screen/gamemenu/gfx/helpbutton_unpressed.png similarity index 100% rename from core/assets/common/screen/gamemenu/helpbutton_unpressed.png rename to core/assets/common/screen/gamemenu/gfx/helpbutton_unpressed.png diff --git a/core/assets/common/screen/gamemenu/helplayer_clickablemap.png b/core/assets/common/screen/gamemenu/gfx/helplayer_clickablemap.png similarity index 100% rename from core/assets/common/screen/gamemenu/helplayer_clickablemap.png rename to core/assets/common/screen/gamemenu/gfx/helplayer_clickablemap.png diff --git a/core/assets/common/screen/gamemenu/nocnisledovani_back.png b/core/assets/common/screen/gamemenu/gfx/nocnisledovani_back.png similarity index 100% rename from core/assets/common/screen/gamemenu/nocnisledovani_back.png rename to core/assets/common/screen/gamemenu/gfx/nocnisledovani_back.png diff --git a/core/assets/common/screen/gamemenu/nocnisledovani_fore.png b/core/assets/common/screen/gamemenu/gfx/nocnisledovani_fore.png similarity index 100% rename from core/assets/common/screen/gamemenu/nocnisledovani_fore.png rename to core/assets/common/screen/gamemenu/gfx/nocnisledovani_fore.png diff --git a/core/assets/common/screen/gamemenu/nocnisledovani_mid.png b/core/assets/common/screen/gamemenu/gfx/nocnisledovani_mid.png similarity index 100% rename from core/assets/common/screen/gamemenu/nocnisledovani_mid.png rename to core/assets/common/screen/gamemenu/gfx/nocnisledovani_mid.png diff --git a/core/assets/common/screen/gamemenu/overlay.png b/core/assets/common/screen/gamemenu/gfx/overlay.png similarity index 100% rename from core/assets/common/screen/gamemenu/overlay.png rename to core/assets/common/screen/gamemenu/gfx/overlay.png diff --git a/core/assets/common/screen/gamemenu/potme_back.png b/core/assets/common/screen/gamemenu/gfx/potme_back.png similarity index 100% rename from core/assets/common/screen/gamemenu/potme_back.png rename to core/assets/common/screen/gamemenu/gfx/potme_back.png diff --git a/core/assets/common/screen/gamemenu/potme_fore.png b/core/assets/common/screen/gamemenu/gfx/potme_fore.png similarity index 100% rename from core/assets/common/screen/gamemenu/potme_fore.png rename to core/assets/common/screen/gamemenu/gfx/potme_fore.png diff --git a/core/assets/common/screen/gamemenu/potme_mid.png b/core/assets/common/screen/gamemenu/gfx/potme_mid.png similarity index 100% rename from core/assets/common/screen/gamemenu/potme_mid.png rename to core/assets/common/screen/gamemenu/gfx/potme_mid.png diff --git a/core/assets/common/screen/gamemenu/profile_pressed.png b/core/assets/common/screen/gamemenu/gfx/profile_pressed.png similarity index 100% rename from core/assets/common/screen/gamemenu/profile_pressed.png rename to core/assets/common/screen/gamemenu/gfx/profile_pressed.png diff --git a/core/assets/common/screen/gamemenu/pronasledovani_back.png b/core/assets/common/screen/gamemenu/gfx/pronasledovani_back.png similarity index 100% rename from core/assets/common/screen/gamemenu/pronasledovani_back.png rename to core/assets/common/screen/gamemenu/gfx/pronasledovani_back.png diff --git a/core/assets/common/screen/gamemenu/pronasledovani_fore.png b/core/assets/common/screen/gamemenu/gfx/pronasledovani_fore.png similarity index 100% rename from core/assets/common/screen/gamemenu/pronasledovani_fore.png rename to core/assets/common/screen/gamemenu/gfx/pronasledovani_fore.png diff --git a/core/assets/common/screen/gamemenu/pronasledovani_mid.png b/core/assets/common/screen/gamemenu/gfx/pronasledovani_mid.png similarity index 100% rename from core/assets/common/screen/gamemenu/pronasledovani_mid.png rename to core/assets/common/screen/gamemenu/gfx/pronasledovani_mid.png diff --git a/core/assets/common/screen/gamemenu/statistics_pressed.png b/core/assets/common/screen/gamemenu/gfx/statistics_pressed.png similarity index 100% rename from core/assets/common/screen/gamemenu/statistics_pressed.png rename to core/assets/common/screen/gamemenu/gfx/statistics_pressed.png diff --git a/core/assets/common/screen/gamemenu/streetdoor_pressed.png b/core/assets/common/screen/gamemenu/gfx/streetdoor_pressed.png similarity index 100% rename from core/assets/common/screen/gamemenu/streetdoor_pressed.png rename to core/assets/common/screen/gamemenu/gfx/streetdoor_pressed.png diff --git a/core/assets/common/screen/gamemenu/strelnice_back.png b/core/assets/common/screen/gamemenu/gfx/strelnice_back.png similarity index 100% rename from core/assets/common/screen/gamemenu/strelnice_back.png rename to core/assets/common/screen/gamemenu/gfx/strelnice_back.png diff --git a/core/assets/common/screen/gamemenu/strelnice_fore.png b/core/assets/common/screen/gamemenu/gfx/strelnice_fore.png similarity index 100% rename from core/assets/common/screen/gamemenu/strelnice_fore.png rename to core/assets/common/screen/gamemenu/gfx/strelnice_fore.png diff --git a/core/assets/common/screen/gamemenu/strelnice_mid.png b/core/assets/common/screen/gamemenu/gfx/strelnice_mid.png similarity index 100% rename from core/assets/common/screen/gamemenu/strelnice_mid.png rename to core/assets/common/screen/gamemenu/gfx/strelnice_mid.png diff --git a/core/assets/common/screen/gamemenu/unos_back.png b/core/assets/common/screen/gamemenu/gfx/unos_back.png similarity index 100% rename from core/assets/common/screen/gamemenu/unos_back.png rename to core/assets/common/screen/gamemenu/gfx/unos_back.png diff --git a/core/assets/common/screen/gamemenu/unos_fore.png b/core/assets/common/screen/gamemenu/gfx/unos_fore.png similarity index 100% rename from core/assets/common/screen/gamemenu/unos_fore.png rename to core/assets/common/screen/gamemenu/gfx/unos_fore.png diff --git a/core/assets/common/screen/gamemenu/unos_mid.png b/core/assets/common/screen/gamemenu/gfx/unos_mid.png similarity index 100% rename from core/assets/common/screen/gamemenu/unos_mid.png rename to core/assets/common/screen/gamemenu/gfx/unos_mid.png diff --git a/core/assets/common/screen/gamemenu/vignetting.png b/core/assets/common/screen/gamemenu/gfx/vignetting.png similarity index 100% rename from core/assets/common/screen/gamemenu/vignetting.png rename to core/assets/common/screen/gamemenu/gfx/vignetting.png diff --git a/core/assets/cs/screen/gamemenu/bankovniloupez_startbutton.png b/core/assets/cs/screen/gamemenu/gfx/bankovniloupez_startbutton.png similarity index 100% rename from core/assets/cs/screen/gamemenu/bankovniloupez_startbutton.png rename to core/assets/cs/screen/gamemenu/gfx/bankovniloupez_startbutton.png diff --git a/core/assets/cs/screen/gamemenu/bankovniloupez_startbutton_pressed.png b/core/assets/cs/screen/gamemenu/gfx/bankovniloupez_startbutton_pressed.png similarity index 100% rename from core/assets/cs/screen/gamemenu/bankovniloupez_startbutton_pressed.png rename to core/assets/cs/screen/gamemenu/gfx/bankovniloupez_startbutton_pressed.png diff --git a/core/assets/cs/screen/gamemenu/bankovniloupez_title.png b/core/assets/cs/screen/gamemenu/gfx/bankovniloupez_title.png similarity index 100% rename from core/assets/cs/screen/gamemenu/bankovniloupez_title.png rename to core/assets/cs/screen/gamemenu/gfx/bankovniloupez_title.png diff --git a/core/assets/cs/screen/gamemenu/helplayer.png b/core/assets/cs/screen/gamemenu/gfx/helplayer.png similarity index 100% rename from core/assets/cs/screen/gamemenu/helplayer.png rename to core/assets/cs/screen/gamemenu/gfx/helplayer.png diff --git a/core/assets/cs/screen/gamemenu/nocnisledovani_startbutton.png b/core/assets/cs/screen/gamemenu/gfx/nocnisledovani_startbutton.png similarity index 100% rename from core/assets/cs/screen/gamemenu/nocnisledovani_startbutton.png rename to core/assets/cs/screen/gamemenu/gfx/nocnisledovani_startbutton.png diff --git a/core/assets/cs/screen/gamemenu/nocnisledovani_startbutton_pressed.png b/core/assets/cs/screen/gamemenu/gfx/nocnisledovani_startbutton_pressed.png similarity index 100% rename from core/assets/cs/screen/gamemenu/nocnisledovani_startbutton_pressed.png rename to core/assets/cs/screen/gamemenu/gfx/nocnisledovani_startbutton_pressed.png diff --git a/core/assets/cs/screen/gamemenu/nocnisledovani_title.png b/core/assets/cs/screen/gamemenu/gfx/nocnisledovani_title.png similarity index 100% rename from core/assets/cs/screen/gamemenu/nocnisledovani_title.png rename to core/assets/cs/screen/gamemenu/gfx/nocnisledovani_title.png diff --git a/core/assets/cs/screen/gamemenu/office.jpg b/core/assets/cs/screen/gamemenu/gfx/office.jpg similarity index 100% rename from core/assets/cs/screen/gamemenu/office.jpg rename to core/assets/cs/screen/gamemenu/gfx/office.jpg diff --git a/core/assets/cs/screen/gamemenu/potme_startbutton.png b/core/assets/cs/screen/gamemenu/gfx/potme_startbutton.png similarity index 100% rename from core/assets/cs/screen/gamemenu/potme_startbutton.png rename to core/assets/cs/screen/gamemenu/gfx/potme_startbutton.png diff --git a/core/assets/cs/screen/gamemenu/potme_startbutton_pressed.png b/core/assets/cs/screen/gamemenu/gfx/potme_startbutton_pressed.png similarity index 100% rename from core/assets/cs/screen/gamemenu/potme_startbutton_pressed.png rename to core/assets/cs/screen/gamemenu/gfx/potme_startbutton_pressed.png diff --git a/core/assets/cs/screen/gamemenu/potme_title.png b/core/assets/cs/screen/gamemenu/gfx/potme_title.png similarity index 100% rename from core/assets/cs/screen/gamemenu/potme_title.png rename to core/assets/cs/screen/gamemenu/gfx/potme_title.png diff --git a/core/assets/cs/screen/gamemenu/pronasledovani_startbutton.png b/core/assets/cs/screen/gamemenu/gfx/pronasledovani_startbutton.png similarity index 100% rename from core/assets/cs/screen/gamemenu/pronasledovani_startbutton.png rename to core/assets/cs/screen/gamemenu/gfx/pronasledovani_startbutton.png diff --git a/core/assets/cs/screen/gamemenu/pronasledovani_startbutton_pressed.png b/core/assets/cs/screen/gamemenu/gfx/pronasledovani_startbutton_pressed.png similarity index 100% rename from core/assets/cs/screen/gamemenu/pronasledovani_startbutton_pressed.png rename to core/assets/cs/screen/gamemenu/gfx/pronasledovani_startbutton_pressed.png diff --git a/core/assets/cs/screen/gamemenu/pronasledovani_title.png b/core/assets/cs/screen/gamemenu/gfx/pronasledovani_title.png similarity index 100% rename from core/assets/cs/screen/gamemenu/pronasledovani_title.png rename to core/assets/cs/screen/gamemenu/gfx/pronasledovani_title.png diff --git a/core/assets/cs/screen/gamemenu/strelnice_startbutton.png b/core/assets/cs/screen/gamemenu/gfx/strelnice_startbutton.png similarity index 100% rename from core/assets/cs/screen/gamemenu/strelnice_startbutton.png rename to core/assets/cs/screen/gamemenu/gfx/strelnice_startbutton.png diff --git a/core/assets/cs/screen/gamemenu/strelnice_startbutton_pressed.png b/core/assets/cs/screen/gamemenu/gfx/strelnice_startbutton_pressed.png similarity index 100% rename from core/assets/cs/screen/gamemenu/strelnice_startbutton_pressed.png rename to core/assets/cs/screen/gamemenu/gfx/strelnice_startbutton_pressed.png diff --git a/core/assets/cs/screen/gamemenu/strelnice_title.png b/core/assets/cs/screen/gamemenu/gfx/strelnice_title.png similarity index 100% rename from core/assets/cs/screen/gamemenu/strelnice_title.png rename to core/assets/cs/screen/gamemenu/gfx/strelnice_title.png diff --git a/core/assets/cs/screen/gamemenu/unos_startbutton.png b/core/assets/cs/screen/gamemenu/gfx/unos_startbutton.png similarity index 100% rename from core/assets/cs/screen/gamemenu/unos_startbutton.png rename to core/assets/cs/screen/gamemenu/gfx/unos_startbutton.png diff --git a/core/assets/cs/screen/gamemenu/unos_startbutton_pressed.png b/core/assets/cs/screen/gamemenu/gfx/unos_startbutton_pressed.png similarity index 100% rename from core/assets/cs/screen/gamemenu/unos_startbutton_pressed.png rename to core/assets/cs/screen/gamemenu/gfx/unos_startbutton_pressed.png diff --git a/core/assets/cs/screen/gamemenu/unos_title.png b/core/assets/cs/screen/gamemenu/gfx/unos_title.png similarity index 100% rename from core/assets/cs/screen/gamemenu/unos_title.png rename to core/assets/cs/screen/gamemenu/gfx/unos_title.png diff --git a/core/assets/sk/screen/gamemenu/screen_gamemenu_startmenu_background.jpg b/core/assets/sk/screen/gamemenu/gfx/screen_gamemenu_startmenu_background.jpg similarity index 100% rename from core/assets/sk/screen/gamemenu/screen_gamemenu_startmenu_background.jpg rename to core/assets/sk/screen/gamemenu/gfx/screen_gamemenu_startmenu_background.jpg diff --git a/core/src/cz/nic/tablexia/TablexiaSettings.java b/core/src/cz/nic/tablexia/TablexiaSettings.java index ca685d3b416c06282b338632061641650561e4b3..8eca7f111c0f72fbf31cbfa199cc2d1cc3ec442a 100644 --- a/core/src/cz/nic/tablexia/TablexiaSettings.java +++ b/core/src/cz/nic/tablexia/TablexiaSettings.java @@ -13,7 +13,7 @@ import cz.nic.tablexia.game.GameDefinition; import cz.nic.tablexia.game.difficulty.GameDifficulty; import cz.nic.tablexia.loader.application.ApplicationTextManager; import cz.nic.tablexia.screen.AbstractTablexiaScreen; -import cz.nic.tablexia.screen.gamemenu.GameMenuScreen; +import cz.nic.tablexia.screen.viewport.ViewportDebugScreen; import cz.nic.tablexia.util.Log; import cz.nic.tablexia.util.Utility; @@ -24,7 +24,7 @@ public class TablexiaSettings { private static final int MIN_SCREEN_HEIGHT = (int) (DEFAULT_SCREEN_WIDTH * MAXIMUM_RATIO); private static final boolean DEBUG_SHOW_BOUNDING_BOXES = true; - public static final Class<? extends AbstractTablexiaScreen<?>> INITIAL_SCREEN = GameMenuScreen.class; + public static final Class<? extends AbstractTablexiaScreen<?>> INITIAL_SCREEN = ViewportDebugScreen.class; private static final String PREFERENCES_KEY = "cz.nic.tablexia."; public static final String LOCALE_KEY = "locale"; diff --git a/core/src/cz/nic/tablexia/screen/AbstractTablexiaScreen.java b/core/src/cz/nic/tablexia/screen/AbstractTablexiaScreen.java index 63c1bae590cee0c1670163b1b2421726810961f6..153ec41a05eb6478bd41994cfa4d1a428226df8f 100644 --- a/core/src/cz/nic/tablexia/screen/AbstractTablexiaScreen.java +++ b/core/src/cz/nic/tablexia/screen/AbstractTablexiaScreen.java @@ -158,7 +158,7 @@ public abstract class AbstractTablexiaScreen<T> extends ScreenAdapter { //////////////////////////// STAGE private Stage prepareStage() { - return new Stage(new XFillViewport()); + return new Stage(new XFillViewport()); } public Stage getStage() { diff --git a/core/src/cz/nic/tablexia/screen/gamemenu/GameMenuAssets.java b/core/src/cz/nic/tablexia/screen/gamemenu/GameMenuAssets.java index b86aed5b550d6f2d11691d0e92fecf2919608033..724ad0a8489dc7f1c80136e927eb04537932c8af 100644 --- a/core/src/cz/nic/tablexia/screen/gamemenu/GameMenuAssets.java +++ b/core/src/cz/nic/tablexia/screen/gamemenu/GameMenuAssets.java @@ -18,7 +18,7 @@ public final class GameMenuAssets { FORE, MID, BACK, TITLE, STARTBUTTON, STARTBUTTON_PRESSED; } - private static final String GAMEMENU_PATH = "screen/gamemenu/"; + private static final String GAMEMENU_PATH = "screen/gamemenu/gfx/"; public static final String OFFICE = GAMEMENU_PATH + "office.jpg"; public static final String OFFICE_CLICKMAP = GAMEMENU_PATH + "clickablemap.png"; diff --git a/core/src/cz/nic/tablexia/screen/gamemenu/GameMenuScreen.java b/core/src/cz/nic/tablexia/screen/gamemenu/GameMenuScreen.java index 9fc0efbecdf452775909c568aac8124bc80b94d1..23b61c2779a0db606233aa71976c2f8a0051ef5b 100644 --- a/core/src/cz/nic/tablexia/screen/gamemenu/GameMenuScreen.java +++ b/core/src/cz/nic/tablexia/screen/gamemenu/GameMenuScreen.java @@ -27,6 +27,7 @@ public class GameMenuScreen extends AbstractTablexiaScreen<Void> { @Override protected void screenLoaded() { + getStage().setDebugAll(true); vp = new ViewPager(); vp.addPage(new OfficeMenuPage(this)); diff --git a/core/src/cz/nic/tablexia/screen/viewport/FullscreenImageDebugScreen.java b/core/src/cz/nic/tablexia/screen/viewport/FullscreenImageDebugScreen.java new file mode 100644 index 0000000000000000000000000000000000000000..62d64ab7a0eeaa9b14075ec63589e971306a25d8 --- /dev/null +++ b/core/src/cz/nic/tablexia/screen/viewport/FullscreenImageDebugScreen.java @@ -0,0 +1,57 @@ +package cz.nic.tablexia.screen.viewport; + +import com.badlogic.gdx.graphics.Texture; +import com.badlogic.gdx.scenes.scene2d.actions.Actions; +import com.badlogic.gdx.scenes.scene2d.ui.Image; + +import java.util.List; + +import cz.nic.tablexia.loader.TablexiaAssetManager; +import cz.nic.tablexia.screen.AbstractTablexiaScreen; + +public class FullscreenImageDebugScreen extends AbstractTablexiaScreen<Void> { + + private static final String LOADER_BACKGROUND = "gfx/screen_loader_background.jpg"; + private static final String LOADER_SMALL_HAND = "gfx/screen_loader_smallhand.png"; + private static final String LOADER_BIG_HAND = "gfx/screen_loader_bighand.png"; + + public FullscreenImageDebugScreen() { + super(false, false, TablexiaAssetManager.StorageType.INTERNAL); + } + + @Override + protected void prepareScreenTextureAssetNames(List<String> textureFileNames) { + textureFileNames.add(LOADER_BACKGROUND); + textureFileNames.add(LOADER_SMALL_HAND); + textureFileNames.add(LOADER_BIG_HAND); + } + + @Override + protected void screenLoaded() { + Image background = new Image(getTexture(LOADER_BACKGROUND)); + background.setPosition(0, 0); + background.setSize(getStage().getWidth(), getStage().getHeight()); + getStage().addActor(background); + + Image smallhand = new Image(getTexture(LOADER_SMALL_HAND)); + smallhand.setPosition(getStage().getWidth() * 0.22f, getStage().getHeight() * 0.64f); + smallhand.setSize(getStage().getWidth() * 0.01f, getStage().getHeight() * 0.06f); + getStage().addActor(smallhand); + smallhand.setOrigin(smallhand.getWidth() / 2, 0); + smallhand.addAction(Actions.forever(Actions.rotateBy(-360, 6))); + + Image bighand = new Image(getTexture(LOADER_BIG_HAND)); + bighand.setPosition(getStage().getWidth() * 0.22f, getStage().getHeight() * 0.64f); + bighand.setSize(getStage().getWidth() * 0.01f, getStage().getHeight() * 0.06f); + getStage().addActor(bighand); + bighand.setOrigin(bighand.getWidth() / 2, 0); + bighand.addAction(Actions.forever(Actions.rotateBy(-360, 0.5f))); + } + + @Override + public Texture getTexture(String textureName) { + Texture t = super.getTexture(textureName); + t.setFilter(Texture.TextureFilter.Linear, Texture.TextureFilter.Linear); + return t; + } +} diff --git a/core/src/cz/nic/tablexia/screen/viewport/ViewportDebugScreen.java b/core/src/cz/nic/tablexia/screen/viewport/ViewportDebugScreen.java index 55d5cb12784e5b3e9cd862d3e9b4375398775ad6..ab27da94d0352bebe2fc8f214cd809a7e933b88b 100644 --- a/core/src/cz/nic/tablexia/screen/viewport/ViewportDebugScreen.java +++ b/core/src/cz/nic/tablexia/screen/viewport/ViewportDebugScreen.java @@ -1,12 +1,15 @@ package cz.nic.tablexia.screen.viewport; import com.badlogic.gdx.graphics.Texture; +import com.badlogic.gdx.scenes.scene2d.InputEvent; +import com.badlogic.gdx.scenes.scene2d.InputListener; import com.badlogic.gdx.scenes.scene2d.ui.Image; import java.util.List; import cz.nic.tablexia.TablexiaSettings; import cz.nic.tablexia.screen.AbstractTablexiaScreen; +import cz.nic.tablexia.util.Log; /** * Created by lhoracek on 4/13/15. @@ -22,6 +25,8 @@ public class ViewportDebugScreen extends AbstractTablexiaScreen<Void> { textureFileNames.add(BASE + "yellow.png"); textureFileNames.add(BASE + "pink.png"); textureFileNames.add(BASE + "black.png"); + textureFileNames.add(BASE + "checker.png"); + textureFileNames.add(BASE + "point.png"); } @Override @@ -29,23 +34,58 @@ public class ViewportDebugScreen extends AbstractTablexiaScreen<Void> { getStage().setDebugAll(true); Image large = new Image(getTexture("yellow.png")); - large.setSize(TablexiaSettings.getDefaultScreenWidth(), TablexiaSettings.getMinScreenHeight()*2); - large.setPosition(0,TablexiaSettings.getMinScreenHeight()/-2.0f); + large.setSize(TablexiaSettings.getDefaultScreenWidth(), TablexiaSettings.getMinScreenHeight() * 2); + large.setPosition(0, TablexiaSettings.getMinScreenHeight() / -2.0f); getStage().addActor(large); - Image widescreen = new Image(getTexture("red.png")); - widescreen.setSize(TablexiaSettings.getDefaultScreenWidth(), TablexiaSettings.getMinScreenHeight()); - widescreen.setPosition(0,0); + widescreen.setSize(1000, TablexiaSettings.getMinScreenHeight()); getStage().addActor(widescreen); + int size = 10; + for (int i = 0; i < size; i++) { + for (int j = 0; j < size; j++) { + Texture checker = getTexture("checker.png"); + Image check = new Image(checker); + check.setPosition(500 - (check.getWidth() * size / 2) + (i * check.getWidth()), TablexiaSettings.getMinScreenHeight() / 2 - (check.getWidth() * size / 2) + (j * check.getWidth())); + getStage().addActor(check); + } + } + + getStage().addListener(new InputListener() { + Image point; + + @Override + public boolean touchDown(InputEvent event, float x, float y, int pointer, int button) { + Log.debug(getClass(), "Touchdown"); + point = new Image(getTexture("point.png")); + getStage().addActor(point); + point.setPosition(x - point.getWidth() / 2, y - point.getHeight() / 2); + return true; + } + + @Override + public void touchDragged(InputEvent event, float x, float y, int pointer) { + point.setPosition(x - point.getWidth() / 2, y - point.getHeight() / 2); + } + + @Override + public void touchUp(InputEvent event, float x, float y, int pointer, int button) { + Log.debug(getClass(), "Liftoff"); + point.remove(); + point = null; + } + }); // TODO } @Override public Texture getTexture(String textureName) { - return super.getTexture(BASE + textureName); + Texture texture = super.getTexture(BASE + textureName); + texture.setFilter(Texture.TextureFilter.Linear, Texture.TextureFilter.Linear); + return texture; } + } diff --git a/core/src/cz/nic/tablexia/util/ui/ViewPager.java b/core/src/cz/nic/tablexia/util/ui/ViewPager.java index 63c279437d71f12586b139866d752714ad05d645..4f63c9811ca3868e22ee7be33bb2f69c07617c3c 100644 --- a/core/src/cz/nic/tablexia/util/ui/ViewPager.java +++ b/core/src/cz/nic/tablexia/util/ui/ViewPager.java @@ -40,6 +40,7 @@ public class ViewPager extends ScrollPane { private void setup() { content = new Table(); super.setWidget(content); + content.setSize(100,100); content.defaults().space(0); //setClamp(false); //setScrollingDisabled(false, true); diff --git a/core/src/cz/nic/tablexia/util/ui/XFillViewport.java b/core/src/cz/nic/tablexia/util/ui/XFillViewport.java index 9d4f515ea544552c84ef3a562035123ecbb93ab9..831a9ac5c06b710f0c2051dc35b4e88a2812a4db 100644 --- a/core/src/cz/nic/tablexia/util/ui/XFillViewport.java +++ b/core/src/cz/nic/tablexia/util/ui/XFillViewport.java @@ -42,11 +42,12 @@ public class XFillViewport extends Viewport { this.screenY = 0; this.screenWidth = (newWorldHeight < TablexiaSettings.getMinScreenHeight()) ? ((int) (screenHeight / TablexiaSettings.getMaximumRatio())) : screenWidth; this.screenHeight = screenHeight; - + setScreenBounds(screenX,screenY,this.screenWidth,this.screenHeight); // SET NEW WORLD HEIGHT this.setWorldHeight(newWorldHeight < TablexiaSettings.getMinScreenHeight() ? TablexiaSettings.getMinScreenHeight() : newWorldHeight); // World width dooes not change cameraYOffset = (getWorldHeight() - TablexiaSettings.getMinScreenHeight()) / 2; - Log.info(getClass().getName(), "New viewport size: update: " + screenWidth + "x" + screenHeight + " - position: " + screenX + "x" + screenY + " - bounds: " + this.screenWidth + "x" + this.screenHeight + " - world: " + getWorldWidth() + "x" + getWorldHeight() + " - y offset: " + cameraYOffset); + + Log.info(getClass().getName(), "New viewport size (min: " + TablexiaSettings.getMinScreenHeight() + ") update: " + screenWidth + "x" + screenHeight + " - position: " + screenX + "x" + screenY + " - bounds: " + this.screenWidth + "x" + this.screenHeight + " - world: " + getWorldWidth() + "x" + getWorldHeight() + " - y offset: " + cameraYOffset); apply(centerCamera); }