diff --git a/core/src/cz/nic/tablexia/screen/halloffame/HallOfFameScreen.java b/core/src/cz/nic/tablexia/screen/halloffame/HallOfFameScreen.java index fba81ae4a4041945448d34b913c2e333aeebba72..459f1d91d677a674a7e6f2bba65c0a907fc93856 100644 --- a/core/src/cz/nic/tablexia/screen/halloffame/HallOfFameScreen.java +++ b/core/src/cz/nic/tablexia/screen/halloffame/HallOfFameScreen.java @@ -9,8 +9,11 @@ import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane; import com.badlogic.gdx.scenes.scene2d.utils.ClickListener; import com.badlogic.gdx.scenes.scene2d.utils.SpriteDrawable; +import java.util.List; + import cz.nic.tablexia.screen.AbstractTablexiaScreen; import cz.nic.tablexia.screen.halloffame.assets.HallOfFameAssets; +import cz.nic.tablexia.util.Log; public class HallOfFameScreen extends AbstractTablexiaScreen<Void> { private static enum TrophyHeapAssets { @@ -50,7 +53,7 @@ public class HallOfFameScreen extends AbstractTablexiaScreen<Void> { return starCount; } - public static String getTrophyHeapImageForStarCount(int starCount) { + public static String getTrophyHeapAssetNameForStarCount(int starCount) { for (int i = TrophyHeapAssets.values().length - 1; i >= 0; i--) { TrophyHeapAssets trophyHeapAssets = TrophyHeapAssets.values()[i]; if (starCount >= trophyHeapAssets.getStarCount()) { @@ -65,7 +68,7 @@ public class HallOfFameScreen extends AbstractTablexiaScreen<Void> { @Override protected void screenLoaded() { prepareScrolPane(); - // prepareDoorButton(); + //prepareDoorButton(); } @@ -73,14 +76,15 @@ public class HallOfFameScreen extends AbstractTablexiaScreen<Void> { private void prepareScrolPane(){ HorizontalGroup group = new HorizontalGroup(); group.setHeight(getStage().getHeight()); + Log.info(getClass().getSimpleName(),"group fill: "+group.getFill()); - Texture textureDoor = new Texture(HallOfFameAssets.HALL_OF_FAME_DOOR); + Texture textureDoor = getTexture(HallOfFameAssets.HALL_OF_FAME_DOOR); Image imgDoor = new Image(textureDoor); imgDoor.setHeight(getStage().getHeight()); group.addActor(imgDoor); - Texture textureTile = new Texture(HallOfFameAssets.HALL_OF_FAME_BACKGROUND_TILE); + Texture textureTile = getTexture(HallOfFameAssets.HALL_OF_FAME_BACKGROUND_TILE); for (int i = 0; i < BACKGROUND_TILE_REPEAT_COUNT; i++) { @@ -99,18 +103,31 @@ public class HallOfFameScreen extends AbstractTablexiaScreen<Void> { private void prepareDoorButton(){ //TODO positioning - final Texture textureDoor = new Texture(HallOfFameAssets.HALL_OF_FAME_DOOR_BUTTON_PRESSED); + final Texture textureDoor = getTexture(HallOfFameAssets.HALL_OF_FAME_DOOR_BUTTON_PRESSED); final Image imgDoor = new Image(textureDoor); imgDoor.setHeight(getStage().getHeight()); - imgDoor.addListener(new ClickListener(){ + imgDoor.addListener(new ClickListener() { @Override public void clicked(InputEvent event, float x, float y) { - Texture textureDoor = new Texture(HallOfFameAssets.HALL_OF_FAME_DOOR_BUTTON_UNPRESSED); + Texture textureDoor = getTexture(HallOfFameAssets.HALL_OF_FAME_DOOR_BUTTON_UNPRESSED); imgDoor.setDrawable(new SpriteDrawable(new Sprite(textureDoor))); } }); getStage().addActor(imgDoor); } + @Override + protected void prepareScreenTextureAssetNames(List<String> texturesFileNames) { + //Door and background + texturesFileNames.add(HallOfFameAssets.HALL_OF_FAME_DOOR); + texturesFileNames.add(HallOfFameAssets.HALL_OF_FAME_BACKGROUND_TILE); + texturesFileNames.add(HallOfFameAssets.HALL_OF_FAME_DOOR_BUTTON_PRESSED); + texturesFileNames.add(HallOfFameAssets.HALL_OF_FAME_DOOR_BUTTON_UNPRESSED); + + //Trophy heaps + for(TrophyHeapAssets asset: TrophyHeapAssets.values()){ + texturesFileNames.add(asset.getTrophyHeapAssetName()); + } + } } \ No newline at end of file