diff --git a/android/assets/Atlases.json b/android/assets/Atlases.json index bb27e1f64d..582fb674b5 100644 --- a/android/assets/Atlases.json +++ b/android/assets/Atlases.json @@ -1 +1 @@ -[AbsoluteUnits,Construction,EasterEggs,Flags,NationIcons,PolicyIcons,ReligionIcons,Skin,Tech,Tilesets,UnitPromotionIcons] \ No newline at end of file +[AbsoluteUnits,Construction,EasterEggs,Flags,NationIcons,PolicyIcons,ReligionIcons,Skin,Tech,Tilesets,UnitPromotionIcons,game] \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/AndroidImagePacker.kt b/buildSrc/src/main/kotlin/AndroidImagePacker.kt index 8a4f0b9d39..6058e6b678 100644 --- a/buildSrc/src/main/kotlin/AndroidImagePacker.kt +++ b/buildSrc/src/main/kotlin/AndroidImagePacker.kt @@ -4,6 +4,7 @@ package com.unciv.build import com.badlogic.gdx.graphics.Texture import com.badlogic.gdx.tools.texturepacker.TexturePacker import com.badlogic.gdx.utils.Json +import com.unciv.build.AndroidImagePacker.packImages import java.io.File import java.nio.file.Files import java.nio.file.attribute.BasicFileAttributes @@ -84,7 +85,6 @@ object AndroidImagePacker { atlasList += packFileName packImagesIfOutdated(defaultSettings, file, output, packFileName) } - atlasList.remove("game") val listFile = File("$output${File.separator}Atlases.json") if (atlasList.isEmpty()) listFile.delete() else listFile.writeText(atlasList.sorted().joinToString(",","[","]")) diff --git a/core/src/com/unciv/ui/images/ImageGetter.kt b/core/src/com/unciv/ui/images/ImageGetter.kt index aea7615faf..d6c500081b 100644 --- a/core/src/com/unciv/ui/images/ImageGetter.kt +++ b/core/src/com/unciv/ui/images/ImageGetter.kt @@ -58,8 +58,6 @@ object ImageGetter { fun resetAtlases() { atlases.values.forEach { it.dispose() } atlases.clear() - atlas = TextureAtlas("game.atlas") - atlases["game"] = atlas } fun reloadImages() = setNewRuleset(ruleset) @@ -68,11 +66,6 @@ object ImageGetter { fun setNewRuleset(ruleset: Ruleset) { ImageGetter.ruleset = ruleset textureRegionDrawables.clear() - // These are the drawables from the base game - for (region in atlas.regions) { - val drawable = TextureRegionDrawable(region) - textureRegionDrawables[region.name] = drawable - } // Load base (except game.atlas which is already loaded) loadModAtlases("", Gdx.files.internal("")) diff --git a/desktop/src/com/unciv/app/desktop/ImagePacker.kt b/desktop/src/com/unciv/app/desktop/ImagePacker.kt index db4b4a2430..a09c65aaea 100644 --- a/desktop/src/com/unciv/app/desktop/ImagePacker.kt +++ b/desktop/src/com/unciv/app/desktop/ImagePacker.kt @@ -90,9 +90,11 @@ internal object ImagePacker { val atlasList = mutableListOf() for ((file, packFileName) in imageFolders(input)) { atlasList += packFileName + defaultSettings.filterMag = if (file.endsWith("Icons")) + Texture.TextureFilter.Linear + else Texture.TextureFilter.MipMapLinearLinear packImagesIfOutdated(defaultSettings, file, output, packFileName) } - atlasList.remove("game") val listFile = File("$output${File.separator}Atlases.json") if (atlasList.isEmpty()) listFile.delete() else listFile.writeText(atlasList.sorted().joinToString(",","[","]"))