Implement remove duplicate tiles in TexturePacker

- Write unit tests for packTilesets in NewTexturePacker

Author: jobe-m

korge-gradle-plugin/src/main/kotlin/korlibs/korge/gradle/texpacker/NewTexturePacker.kt

@@ -76,9 +76,7 @@ object NewTexturePacker {
 //            println("Tileset: ${file}, images: $images")
         }
 
-        packImages(images, enableRotation = false, enableTrimming = false, padding = padding, trimFileName = true, removeDuplicates = true)
-
-        return listOf()
+        return packImages(images, enableRotation = false, enableTrimming = false, padding = padding, trimFileName = true, removeDuplicates = true)
     }
 
     /**
@@ -133,7 +131,8 @@ object NewTexturePacker {
         val mappedImages = if (removeDuplicates) {   // mappedImages will contain only unique images if removeDuplicates is true
             // Remove duplicate images
             val uniqueMap = linkedMapOf<Int, Pair<File, SimpleBitmap>>()
-            for ((file, image) in images) {
+            for ((fileName, image) in images) {
+                val file = if (trimFileName) File(fileName.nameWithoutExtension) else fileName
                 val hash = image.hashCode()
                 val existing = uniqueMap[hash]
                 if (existing == null) {
@@ -144,7 +143,8 @@ object NewTexturePacker {
             uniqueMap.values.toList()
         } else {
             // No duplicate removal, use all images
-            for ((file, _) in images) {
+            for ((fileName, _) in images) {
+                val file = if (trimFileName) File(fileName.nameWithoutExtension) else fileName
                 tileMapping[file] = file
             }
             images
@@ -164,7 +164,7 @@ object NewTexturePacker {
             ))
         })
 
-        // Building info which includes mapping  duplicates
+        // Building info which includes mapping duplicates
         val outAtlases = arrayListOf<AtlasInfo>()
         // TODO for loop needs to go over tileMapping to map possible duplicate files to the same image area in the atlas
         for (bin in packer.bins) {
@@ -173,31 +173,37 @@ object NewTexturePacker {
 
             for (rect in bin.rects) {
                 val info = rect.raw as Info
-                val fileName = info.file.name
-                //println("$rect :: info=$info")
+//                val fileName = info.file.name
+                // Check if this rect (image) is used by any duplicate files
+                val files = tileMapping.filterValues { it == info.file }.keys
+                for (file in files) {
 
-                val chunk = if (rect.rot) info.trimmedImage.flipY().rotate90() else info.trimmedImage
-                out.put(rect.x - padding, rect.y - padding, chunk.extrude(padding))
-                //out.put(rect.x, rect.y, chunk)
+                    val fileName = file.name
 
-                val obj = LinkedHashMap<String, Any?>()
+                    val chunk = if (rect.rot) info.trimmedImage.flipY().rotate90() else info.trimmedImage
+                    out.put(rect.x - padding, rect.y - padding, chunk.extrude(padding))
+                    //out.put(rect.x, rect.y, chunk)
 
-                fun Dimension.toObj(rot: Boolean): Map<String, Any?> {
-                    val w = if (!rot) width else height
-                    val h = if (!rot) height else width
-                    return mapOf("w" to w, "h" to h)
-                }
-                fun Rectangle.toObj(rot: Boolean): Map<String, Any?> {
-                    return mapOf("x" to x, "y" to y) + this.size.toObj(rot)
-                }
+                    val obj = LinkedHashMap<String, Any?>()
 
-                obj["frame"] = Rectangle(rect.x, rect.y, rect.width, rect.height).toObj(rect.rot)
-                obj["rotated"] = rect.rot
-                obj["trimmed"] = info.trimArea != info.fullArea
-                obj["spriteSourceSize"] = info.trimArea.toObj(false)
-                obj["sourceSize"] = info.fullArea.size.toObj(false)
+                    fun Dimension.toObj(rot: Boolean): Map<String, Any?> {
+                        val w = if (!rot) width else height
+                        val h = if (!rot) height else width
+                        return mapOf("w" to w, "h" to h)
+                    }
 
-                frames[fileName] = obj
+                    fun Rectangle.toObj(rot: Boolean): Map<String, Any?> {
+                        return mapOf("x" to x, "y" to y) + this.size.toObj(rot)
+                    }
+
+                    obj["frame"] = Rectangle(rect.x, rect.y, rect.width, rect.height).toObj(rect.rot)
+                    obj["rotated"] = rect.rot
+                    obj["trimmed"] = info.trimArea != info.fullArea
+                    obj["spriteSourceSize"] = info.trimArea.toObj(false)
+                    obj["sourceSize"] = info.fullArea.size.toObj(false)
+
+                    frames[fileName] = obj
+                }
             }
 
 

korge-gradle-plugin/src/test/kotlin/korlibs/korge/gradle/texpacker/NewTexturePackerTest.kt

@@ -0,0 +1,51 @@
+package korlibs.korge.gradle.texpacker
+
+import korlibs.korge.gradle.typedresources.getResourceURL
+import org.junit.Assert
+import org.junit.Test
+import java.io.File
+
+
+class NewTexturePackerTest {
+    @Test
+    fun testPackTilesets() {
+        val atlasInfos = NewTexturePacker.packTilesets(File(getResourceURL("tilesets").file))
+
+        // Check if duplicate tiles were detected and merged into one tile rect area in the tileset atlas
+        val atlasInfo = atlasInfos.first()
+        val frames = atlasInfo.info["frames"] as Map<String, Any>
+
+        val tile_1 = frames["test_tileset_1"] as Map<String, Any>
+        val tile_2 = frames["test_tileset_4"] as Map<String, Any>
+        val tile_3 = frames["test_tileset_2_0"] as Map<String, Any>  // This tile is in the second tileset but is a duplicate of test_tileset_1
+
+        // Check that all three tiles point to the same frame data (i.e., they are duplicates)
+        val tileFrame_1 = tile_1["frame"] as Map<String, Int>
+        val tileFrame_2 = tile_2["frame"] as Map<String, Int>
+        val tileFrame_3 = tile_3["frame"] as Map<String, Int>
+        Assert.assertEquals(tileFrame_1["x"], tileFrame_2["x"])
+        Assert.assertEquals(tileFrame_1["y"], tileFrame_2["y"])
+        Assert.assertEquals(tileFrame_1["w"], tileFrame_2["w"])
+        Assert.assertEquals(tileFrame_1["h"], tileFrame_2["h"])
+        Assert.assertEquals(tileFrame_1["x"], tileFrame_3["x"])
+        Assert.assertEquals(tileFrame_1["y"], tileFrame_3["y"])
+        Assert.assertEquals(tileFrame_1["w"], tileFrame_3["w"])
+        Assert.assertEquals(tileFrame_1["h"], tileFrame_3["h"])
+
+        // Check that tiles are not rotated or trimmed
+        val rotated_1 = tile_1["rotated"] as Boolean
+        val rotated_2 = tile_2["rotated"] as Boolean
+        val rotated_3 = tile_3["rotated"] as Boolean
+        Assert.assertFalse(rotated_1)
+        Assert.assertFalse(rotated_2)
+        Assert.assertFalse(rotated_3)
+        val trimmed_1 = tile_1["trimmed"] as Boolean
+        val trimmed_2 = tile_2["trimmed"] as Boolean
+        val trimmed_3 = tile_3["trimmed"] as Boolean
+        Assert.assertFalse(trimmed_1)
+        Assert.assertFalse(trimmed_2)
+        Assert.assertFalse(trimmed_3)
+
+        //println("Atlas Info: $atlasInfos")
+    }
+}

…e/gradle/typedresources/AseSpriteTest.kt …korlibs/korge/gradle/util/AseInfoTest.ktkorge-gradle-plugin/src/test/kotlin/korlibs/korge/gradle/typedresources/AseSpriteTest.kt renamed to korge-gradle-plugin/src/test/kotlin/korlibs/korge/gradle/util/AseInfoTest.kt korge-gradle-plugin/src/test/kotlin/korlibs/korge/gradle/typedresources/AseSpriteTest.kt renamed to korge-gradle-plugin/src/test/kotlin/korlibs/korge/gradle/util/AseInfoTest.kt

@@ -1,10 +1,10 @@
-package korlibs.korge.gradle.typedresources
+package korlibs.korge.gradle.util
 
-import korlibs.korge.gradle.util.*
+import korlibs.korge.gradle.typedresources.getResourceBytes
 import org.junit.Assert
 import org.junit.Test
 
-class AseSpriteTest {
+class AseInfoTest {
     @Test
     fun test() {
         val info = ASEInfo.Companion.getAseInfo(getResourceBytes("sprites.ase"))