Allow creating a floor from "raw" (images in the same orientation/size/etc) images

Author: MrPowerGamerBR

floormaker-cli/src/main/kotlin/net/sneakysims/floormaker/cli/FloorMakerCLI.kt

@@ -12,6 +12,7 @@ import net.perfectdreams.slippyimage.PaletteCreator
 import net.perfectdreams.slippyimage.SlippyImage
 import net.perfectdreams.slippyimage.convertToSlippyImage
 import net.sneakysims.floormaker.FloorMaker
+import net.sneakysims.floormaker.FloorMaker.convertToSPR2Sprite
 import net.sneakysims.floormaker.FloorSound
 import java.io.File
 import javax.imageio.ImageIO
@@ -21,7 +22,10 @@ class FloorMakerCLI : CliktCommand() {
         return "The Sims 1 Floor Maker made by MrPowerGamerBR (https://sneakysims.net)"
     }
 
-    val inputImage by option("--input", help = "The image that will be converted to a floor").required()
+    val inputImage by option("--input", help = "The image that will be converted to a floor")
+    val inputRawFarZoomImage by option("--input-raw-far-zoom", help = "The image that will be converted to a floor (far zoom), raw in this context means the image in the same position/rotation as a floor")
+    val inputRawMediumZoomImage by option("--input-raw-medium-zoom", help = "The image that will be converted to a floor (medium zoom), raw in this context means the image in the same position/rotation as a floor")
+    val inputRawNearZoomImage by option("--input-raw-near-zoom", help = "The image that will be converted to a floor (near zoom), raw in this context means the image in the same position/rotation as a floor")
     val name by option("--name", help = "The name of the item in game")
     val description by option("--description", help = "The description of the item in game")
     val price by option("--price", help = "The price of the item in game").int()
@@ -31,24 +35,48 @@ class FloorMakerCLI : CliktCommand() {
     val output by argument("output", help = "The output flr file")
 
     override fun run() {
-        val inputImage = ImageIO.read(File(inputImage))
-        val slippyImage = SlippyImage.convertToSlippyImage(inputImage)
-        val floorSprite = FloorMaker.createFloorSprite(slippyImage)
-        val stepSound = stepSound ?: FloorSound.HARD_FLOOR
-
-        val colors = PaletteCreator.extractColors(floorSprite)
-        val palette = PaletteCreator.kMeansQuantization(colors, 256)
-
-        val iff = FloorMaker.createFloorIFF(
-            name ?: "",
-            price ?: 1,
-            description ?: "",
-            stepSound,
-            floorSprite,
-            palette
-        )
-
-        File(output).writeBytes(iff.write())
+        if (inputImage != null) {
+            val inputImage = ImageIO.read(File(inputImage))
+            val slippyImage = SlippyImage.convertToSlippyImage(inputImage)
+            val floorSprite = FloorMaker.createFloorSprite(slippyImage)
+            val stepSound = stepSound ?: FloorSound.HARD_FLOOR
+
+            val colors = PaletteCreator.extractColors(floorSprite)
+            val palette = PaletteCreator.kMeansQuantization(colors, 256)
+
+            val iff = FloorMaker.createFloorIFF(
+                name ?: "",
+                price ?: 1,
+                description ?: "",
+                stepSound,
+                floorSprite,
+                palette
+            )
+
+            File(output).writeBytes(iff.write())
+        } else if (inputRawFarZoomImage != null && inputRawMediumZoomImage != null && inputRawNearZoomImage != null) {
+            val farZoomImage = SlippyImage.convertToSlippyImage(ImageIO.read(File(inputRawFarZoomImage)))
+            val mediumZoomImage = SlippyImage.convertToSlippyImage(ImageIO.read(File(inputRawMediumZoomImage)))
+            val nearZoomImage = SlippyImage.convertToSlippyImage(ImageIO.read(File(inputRawNearZoomImage)))
+
+            val stepSound = stepSound ?: FloorSound.HARD_FLOOR
+
+            val colors = PaletteCreator.extractColors(farZoomImage) + PaletteCreator.extractColors(mediumZoomImage) + PaletteCreator.extractColors(nearZoomImage)
+            val palette = PaletteCreator.kMeansQuantization(colors, 256)
+
+            val iff = FloorMaker.createFloorIFF(
+                name ?: "",
+                price ?: 1,
+                description ?: "",
+                stepSound,
+                convertToSPR2Sprite(farZoomImage, 31, 16, palette),
+                convertToSPR2Sprite(mediumZoomImage, 63, 32, palette),
+                convertToSPR2Sprite(nearZoomImage, 127, 64, palette),
+                palette
+            )
+
+            File(output).writeBytes(iff.write())
+        } else error("Missing image input parameter!")
     }
 }
 

floormaker-common/src/commonMain/kotlin/net/sneakysims/floormaker/FloorMaker.kt

@@ -11,6 +11,28 @@ object FloorMaker {
         stepSound: FloorSound,
         sprite: SlippyImage,
         palette: List<Color>
+    ): IFF {
+        return createFloorIFF(
+            name,
+            price,
+            description,
+            stepSound,
+            convertToSPR2Sprite(sprite, 31, 16, palette),
+            convertToSPR2Sprite(sprite, 63, 32, palette),
+            convertToSPR2Sprite(sprite, 127, 64, palette),
+            palette
+        )
+    }
+
+    fun createFloorIFF(
+        name: String,
+        price: Int,
+        description: String,
+        stepSound: FloorSound,
+        spriteFar: SPR2ChunkData.SPRSprite,
+        spriteMedium: SPR2ChunkData.SPRSprite,
+        spriteNear: SPR2ChunkData.SPRSprite,
+        palette: List<Color>
     ): IFF {
         val iff = IFF.empty()
 
@@ -65,9 +87,7 @@ object FloorMaker {
             SPR2ChunkData(
                 1000,
                 1537,
-                mutableListOf(
-                    convertToSPR2Sprite(sprite, 31, 16, palette)
-                )
+                mutableListOf(spriteFar)
             )
         )
 
@@ -79,9 +99,7 @@ object FloorMaker {
             SPR2ChunkData(
                 1000,
                 1537,
-                mutableListOf(
-                    convertToSPR2Sprite(sprite, 63, 32, palette)
-                )
+                mutableListOf(spriteMedium)
             )
         )
 
@@ -93,9 +111,7 @@ object FloorMaker {
             SPR2ChunkData(
                 1000,
                 1537,
-                mutableListOf(
-                    convertToSPR2Sprite(sprite, 127, 64, palette)
-                )
+                mutableListOf(spriteNear)
             )
         )