Add nTileClusterPasses, nColourClusterPasses

Author: Aikku93

Qualetize.c

@@ -36,6 +36,8 @@ struct BGRAf_t Qualetize(
 	int   MaxTilePals,
 	int   MaxPalSize,
 	int   PalUnused,
+	int   nTileClusterPasses,
+	int   nColourClusterPasses,
 	const struct BGRA8_t *BitRange,
 	int   DitherType,
 	float DitherLevel,
@@ -44,7 +46,15 @@ struct BGRAf_t Qualetize(
 	int i;
 
 	//! Do processing
-	TilesData_QuantizePalettes(TilesData, Palette, MaxTilePals, MaxPalSize, PalUnused);
+	TilesData_QuantizePalettes(
+		TilesData,
+		Palette,
+		MaxTilePals,
+		MaxPalSize,
+		PalUnused,
+		nTileClusterPasses,
+		nColourClusterPasses
+	);
 
 	//! Reduce palette range
 	for(i=0;i<MaxTilePals*MaxPalSize;i++) {

Qualetize.h

@@ -29,6 +29,8 @@ struct BGRAf_t Qualetize(
 	int   MaxTilePals,
 	int   MaxPalSize,
 	int   PalUnused,
+	int   nTileClusterPasses,
+	int   nColourClusterPasses,
 	const struct BGRA8_t *BitRange,
 	int   DitherType,
 	float DitherLevel,

Tiles.c

@@ -10,8 +10,8 @@
 //! NOTE: Something is probably broken about how clustering is
 //! implemented. Sometimes results converge, and other times
 //! they /diverge/. This probably needs to be investigated.
-#define MAX_PALETTE_INDICES_PASSES      8
-#define MAX_PALETTE_QUANTIZATION_PASSES 8
+#define DEFAULT_TILECLUSTER_PASSES   8
+#define DEFAULT_COLOURCLUSTER_PASSES 8
 
 /**************************************/
 #define ALIGN2N(x,N) (((x) + (N)-1) &~ ((N)-1))
@@ -125,11 +125,23 @@ struct TilesData_t *TilesData_FromBitmap(const struct BmpCtx_t *Ctx, int TileW,
 /**************************************/
 
 //! Create quantized palette
-int TilesData_QuantizePalettes(struct TilesData_t *TilesData, struct BGRAf_t *Palette, int MaxTilePals, int MaxPalSize, int PalUnusedEntries) {
+int TilesData_QuantizePalettes(
+	struct TilesData_t *TilesData,
+	struct BGRAf_t *Palette,
+	int MaxTilePals,
+	int MaxPalSize,
+	int PalUnusedEntries,
+	int nTileClusterPasses,
+	int nColourClusterPasses
+) {
 	int i, j, k;
 	int nPxTile = TilesData->TileW  * TilesData->TileH;
 	int nTiles  = TilesData->TilesX * TilesData->TilesY;
 
+	//! Set default passes as needed
+	if(nTileClusterPasses   == 0) nTileClusterPasses   = DEFAULT_TILECLUSTER_PASSES;
+	if(nColourClusterPasses == 0) nColourClusterPasses = DEFAULT_COLOURCLUSTER_PASSES;
+
 	//! Unused entries should not count towards
 	//! the maximum palette size
 	MaxPalSize -= PalUnusedEntries;
@@ -143,7 +155,7 @@ int TilesData_QuantizePalettes(struct TilesData_t *TilesData, struct BGRAf_t *Pa
 	}
 
 	//! Categorize tiles by palette
-	QuantCluster_Quantize(Clusters, MaxTilePals, TilesData->TileValue, nTiles, TilesData->TilePalIdx, MAX_PALETTE_INDICES_PASSES);
+	QuantCluster_Quantize(Clusters, MaxTilePals, TilesData->TileValue, nTiles, TilesData->TilePalIdx, nTileClusterPasses);
 
 	//! Quantize tile palettes
 	for(i=0;i<MaxTilePals;i++) {
@@ -161,7 +173,7 @@ int TilesData_QuantizePalettes(struct TilesData_t *TilesData, struct BGRAf_t *Pa
 		if(!PxCnt) continue;
 
 		//! Perform quantization
-		QuantCluster_Quantize(Clusters, MaxPalSize, PxTemp, PxCnt, TilesData->PxTempIdx, MAX_PALETTE_QUANTIZATION_PASSES);
+		QuantCluster_Quantize(Clusters, MaxPalSize, PxTemp, PxCnt, TilesData->PxTempIdx, nColourClusterPasses);
 
 		//! Extract palette from cluster centroids
 		for(j=0;j<PalUnusedEntries;j++) *Palette++ = (struct BGRAf_t){0,0,0,0};

Tiles.h

@@ -34,7 +34,15 @@ struct TilesData_t *TilesData_FromBitmap(const struct BmpCtx_t *Ctx, int TileW,
 //! NOTE: PalUnusedEntries is used for 'padding', such as on
 //! the GBA/NDS where index 0 of every palette is transparent
 //! NOTE: Palette is generated in YUVA mode
-int TilesData_QuantizePalettes(struct TilesData_t *TilesData, struct BGRAf_t *Palette, int MaxTilePals, int MaxPalSize, int PalUnusedEntries);
+int TilesData_QuantizePalettes(
+	struct TilesData_t *TilesData,
+	struct BGRAf_t *Palette,
+	int MaxTilePals,
+	int MaxPalSize,
+	int PalUnusedEntries,
+	int nTileClusterPasses,
+	int nColourClusterPasses
+);
 
 /**************************************/
 //! EOF

tilequant.c

@@ -38,6 +38,8 @@ int main(int argc, const char *argv[]) {
 			" -th:8             - Set tile height\n"
 			" -bgra:5551        - Set BGRA bit depth\n"
 			" -dither:floyd,1.0 - Set dither mode, level\n"
+			" -tilepasses:0     - Set tile cluster passes (0 = default)\n"
+			" -colourpasses:0   - Set colour cluster passes (0 = default)\n"
 			"Dither modes available (and default level):\n"
 			" -dither:none       - No dithering\n"
 			" -dither:floyd,1.0  - Floyd-Steinberg\n"
@@ -55,6 +57,8 @@ int main(int argc, const char *argv[]) {
 	int     nPalettes = 16;
 	int     nColoursPerPalette = 16;
 	int     nUnusedColoursPerPalette = 1;
+	int     nTileClusterPasses   = 0;
+	int     nColourClusterPasses = 0;
 	int     TileW = 8;
 	int     TileH = 8;
 	struct BGRA8_t BitRange = {.b = 0x1F, .g = 0x1F, .r = 0x1F, .a = 0x01};
@@ -113,8 +117,19 @@ int main(int argc, const char *argv[]) {
 				if(!ArgOk) printf("Unrecognized dither mode: %s\n", ArgStr);
 				ArgOk = 1;
 			}
-#undef ARGMATCH
 
+			//! nTileClusterPasses
+			ARGMATCH(argv[argi], "-tilepasses:") {
+				ArgOk = 1;
+				nTileClusterPasses = atoi(ArgStr);
+			}
+
+			//! nColourClusterPasses
+			ARGMATCH(argv[argi], "-colourpasses:") {
+				ArgOk = 1;
+				nColourClusterPasses = atoi(ArgStr);
+			}
+#undef ARGMATCH
 			//! Unrecognized?
 			if(!ArgOk) printf("Unrecognized argument: %s\n", ArgStr);
 		}
@@ -146,7 +161,19 @@ int main(int argc, const char *argv[]) {
 		return -1;
 	}
 	struct BGRAf_t RMSE = Qualetize(
-		&Image, TilesData, PxData, Palette, nPalettes, nColoursPerPalette, nUnusedColoursPerPalette, &BitRange, DitherMode, DitherLevel, 1
+		&Image,
+		TilesData,
+		PxData,
+		Palette,
+		nPalettes,
+		nColoursPerPalette,
+		nUnusedColoursPerPalette,
+		nTileClusterPasses,
+		nColourClusterPasses,
+		&BitRange,
+		DitherMode,
+		DitherLevel,
+		1
 	);
 	free(TilesData);
 

tilequantDLL.c

@@ -43,6 +43,8 @@ DECLSPEC int QualetizeFromRawImage(
 	int      TileW,
 	int      TileH,
 	int32_t *TilePalIdx,
+	int      nTileClusterPasses,
+	int      nColourClusterPasses,
 	const uint8_t BitRange[4],
 	int           DitherMode,
 	float         DitherLevel
@@ -68,6 +70,8 @@ DECLSPEC int QualetizeFromRawImage(
 		nPalettes,
 		nColoursPerPalette,
 		nUnusedColoursPerPalette,
+		nTileClusterPasses,
+		nColourClusterPasses,
 		(const struct BGRA8_t*)BitRange,
 		DitherMode,
 		DitherLevel,