utils: pxmv: replaced bmp texture importer with imagelib

Author: APAmk2

utils/pxmv/CMakeLists.txt

@@ -17,6 +17,7 @@ list(APPEND DIR_SOURCES
 	"../common/file_system.cpp"
 	"../common/cmdlib.cpp"
 	"../common/zone.cpp"
+	"${CMAKE_SOURCE_DIR}/public/crclib.cpp"
 	"ControlPanel.cpp"
 	"FileAssociation.cpp"
     "GlWindow.cpp"
@@ -45,6 +46,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE
 	"../../common"
 	"../../public"
 	"../common"
+	"../common/imagelib"
 )
 
 target_compile_definitions(${PROJECT_NAME} PRIVATE 
@@ -85,6 +87,7 @@ endif()
 # link dependencies libraries
 target_link_libraries(${PROJECT_NAME} PRIVATE
 	mxtk
+	imagelib
 )
 
 find_package(RapidJSON CONFIG REQUIRED)

utils/pxmv/ControlPanel.cpp

@@ -773,29 +773,25 @@ ControlPanel::handleEvent (mxEvent *event)
 
 		case IDC_IMPORTTEXTURE:
 		{
-			char *ptr = (char *) mxGetOpenFileName (this, "", "Windows Bitmap (*.bmp)");
+			char *ptr = (char *) mxGetOpenFileName (this, "", "Any supported texture (*.bmp);;(*.tga);;(*.dds);;(*.png)");
 			if (!ptr)
 				break;
 
 			char filename[256];
-			char ext[16];
 
 			strcpy (filename, ptr);
-			strcpy (ext, mx_getextension (filename));
-			if (mx_strcasecmp (ext, ".bmp"))
-				strcat (filename, ".bmp");
 
-			mxImage *image = d_GlWindow->readBmpFromFile(filename);
+			mxImage *image = d_GlWindow->readTextureFromFile(filename);
 			if (!image)
 			{
-				mxMessageBox (this, "Error loading .BMP texture.", APP_TITLE_STR, MX_MB_OK | MX_MB_ERROR);
+				mxMessageBox (this, "Error loading texture.", APP_TITLE_STR, MX_MB_OK | MX_MB_ERROR);
 				return 1;
 			}
 
 			if (!image->palette)
 			{
 				d_GlWindow->imageFree(image);
-				mxMessageBox (this, "Error loading .BMP texture.  Must be 8-bit!", APP_TITLE_STR, MX_MB_OK | MX_MB_ERROR);
+				mxMessageBox (this, "Error loading texture. Must be 8-bit!", APP_TITLE_STR, MX_MB_OK | MX_MB_ERROR);
 				return 1;
 			}
 

utils/pxmv/GlWindow.cpp

@@ -37,6 +37,7 @@
 #include "muzzle1.h"
 #include "muzzle2.h"
 #include "muzzle3.h"
+#include "imagelib.h"
 
 extern bool g_bStopPlaying;
 extern bool bUseWeaponOrigin;
@@ -991,214 +992,82 @@ mxImage *GlWindow::readBmpFromBuffer(const byte * buffer, size_t size)
 	return image;
 }
 
-
-mxImage *GlWindow::readBmpFromFile(const char *filename)
+bool ImageLib_Alloc(mxImage *image, int w, int h, int pixelSize) 
 {
-	int i;
-	FILE *pfile = 0;
-	mxBitmapFileHeader bmfh;
-	mxBitmapInfoHeader bmih;
-	mxBitmapRGBQuad rgrgbPalette[256];
-	int cbBmpBits;
-	byte *pbBmpBits;
-	byte *pb, *pbHold;
-	int cbPalBytes;
-	int biTrueWidth;
-	mxImage *image = nullptr;
+	if (image->data)
+		Mem_Free(image->data);
 
-	// File exists?
-	if ((pfile = fopen (filename, "rb")) == 0)
-		return 0;
-	
-	// Read file header
-	if (fread(&bmfh, sizeof bmfh, 1/*count*/, pfile) != 1) {
-		if (pfile) {
-			fclose(pfile);
-		}
-		return nullptr;
-	}
+	if (image->palette)
+		Mem_Free(image->palette);
 
-	// Bogus file header check
-	if (!(bmfh.bfReserved1 == 0 && bmfh.bfReserved2 == 0)) {
-		if (pfile) {
-			fclose(pfile);
-		}
-		return nullptr;
-	}
+	image->data = Mem_Alloc(w * h * pixelSize / 8);
+	if (!image->data)
+		return false;
 
-	// Read info header
-	if (fread(&bmih, sizeof bmih, 1/*count*/, pfile) != 1) {
-		if (pfile) {
-			fclose(pfile);
+	// allocate a palette for 8-bit images
+	if (pixelSize == 8)
+	{
+		image->palette = Mem_Alloc(3 * 256);
+		if (!image->palette)
+		{
+			//delete[] data;
+			Mem_Free(image->data);
+			return false;
 		}
-		return nullptr;
 	}
-
-	// Bogus info header check
-	if (!(bmih.biSize == sizeof bmih && bmih.biPlanes == 1)) {
-		if (pfile) {
-			fclose(pfile);
-		}
-		return nullptr;
+	else {
+		image->palette = nullptr;
 	}
 
-	// Bogus bit depth?  Only 8-bit supported.
-	if (bmih.biBitCount != 8) {
-		if (pfile) {
-			fclose(pfile);
-		}
-		return nullptr;
-	}
+	image->width = w;
+	image->height = h;
+	image->bpp = pixelSize;
+	return true;
+};
 
-	// Bogus compression?  Only non-compressed supported.
-	if (bmih.biCompression != 0) { //BI_RGB) 
-		if (pfile) {
-			fclose(pfile);
-		}
-		return nullptr;
-	}
+mxImage *GlWindow::readTextureFromFile(const char *filename)
+{
+	mxImage *image = nullptr;
+	rgbdata_t *imageData = nullptr;
 
-	// Figure out how many entires are actually in the table
-	if (bmih.biClrUsed == 0)
+	imageData = COM_LoadImage(filename, true);
+	if (!imageData)
 	{
-		bmih.biClrUsed = 256;
-		cbPalBytes = (1 << bmih.biBitCount) * sizeof (mxBitmapRGBQuad);
-	}
-	else 
-	{
-		cbPalBytes = bmih.biClrUsed * sizeof (mxBitmapRGBQuad);
+		return nullptr; // File didn't exist, or can't be reached
 	}
 
-	// Read palette (bmih.biClrUsed entries)
-	if (fread(rgrgbPalette, cbPalBytes, 1/*count*/, pfile) != 1) {
-		if (pfile) {
-			fclose(pfile);
-		}
-		return nullptr;
+	imageData = Image_Quantize(imageData);
+	if (!(imageData->flags & IMAGE_QUANTIZED))
+	{
+		return nullptr; // Quantizer failed
 	}
 
 	image = (mxImage *)Mem_Alloc(sizeof(mxImage));
 	new (image) mxImage();
 
-	if (!image) 
+	if (!image)
 	{
-		if (pfile) {
-			fclose(pfile);
-		}
-		return nullptr;
+		return nullptr; // image can't be allocated for some reason
 	}
 
-	auto imageAlloc = [](mxImage *image, int w, int h, int pixelSize) {
-		if (image->data)
-			Mem_Free(image->data);
-
-		if (image->palette)
-			Mem_Free(image->palette);
-
-		image->data = Mem_Alloc(w * h * pixelSize / 8);
-		if (!image->data)
-			return false;
-
-		// allocate a palette for 8-bit images
-		if (pixelSize == 8)
-		{
-			image->palette = Mem_Alloc(3 * 256);
-			if (!image->palette)
-			{
-				//delete[] data;
-				Mem_Free(image->data);
-				return false;
-			}
-		}
-		else {
-			image->palette = nullptr;
-		}
-
-		image->width = w;
-		image->height = h;
-		image->bpp = pixelSize;
-		return true;
-	};
-
-	if (!imageAlloc(image, bmih.biWidth, bmih.biHeight, 8))
+	if (!ImageLib_Alloc(image, imageData->width, imageData->height, 8))
 	{
 		imageFree(image);
-		if (pfile) {
-			fclose(pfile);
-		}
 		return nullptr;
 	}
 
-	pb = (byte *) image->palette;
+	byte *paletteBuffer = (byte *) image->palette;
 
 	// Copy over used entries
-	for (i = 0; i < (int) bmih.biClrUsed; i++)
-	{
-		*pb++ = rgrgbPalette[i].rgbRed;
-		*pb++ = rgrgbPalette[i].rgbGreen;
-		*pb++ = rgrgbPalette[i].rgbBlue;
-	}
-
-	// Fill in unused entires will 0,0,0
-	for (i = bmih.biClrUsed; i < 256; i++) 
-	{
-		*pb++ = 0;
-		*pb++ = 0;
-		*pb++ = 0;
-	}
-
-	// Read bitmap bits (remainder of file)
-	cbBmpBits = bmfh.bfSize - ftell (pfile);
-
-	pbHold = pb = (byte *) Mem_Alloc(cbBmpBits * sizeof (byte));
-	if (pb == 0)
-	{
-		imageFree(image);
-		if (pfile) {
-			fclose(pfile);
-		}
-		return nullptr;
-	}
-
-	if (fread (pb, cbBmpBits, 1/*count*/, pfile) != 1)
+	for (int i = 0; i < 256; i++)
 	{
-		Mem_Free(pbHold);
-		imageFree(image);
-		if (pfile) {
-			fclose(pfile);
-		}
-		return nullptr;
+		*paletteBuffer++ = imageData->palette[i * 4 + 0];
+		*paletteBuffer++ = imageData->palette[i * 4 + 1];
+		*paletteBuffer++ = imageData->palette[i * 4 + 2];
 	}
-/*
-	pbBmpBits = malloc(cbBmpBits);
-	if (pbBmpBits == 0)
-	{
-		free (pb);
-		free (pbPal);
-		if (pfile) {
-			fclose(pfile);
-		}
-		return nullptr;
-	}
-*/
-	pbBmpBits = (byte *) image->data;
-
-	// data is actually stored with the width being rounded up to a multiple of 4
-	biTrueWidth = (bmih.biWidth + 3) & ~3;
-
-	// reverse the order of the data.
-	pb += (bmih.biHeight - 1) * biTrueWidth;
-	for(i = 0; i < bmih.biHeight; i++)
-	{
-		memmove (&pbBmpBits[bmih.biWidth * i], pb, bmih.biWidth);
-		pb -= biTrueWidth;
-	}
-
-	//pb += biTrueWidth;
-	Mem_Free(pbHold);
 
-	if (pfile) 
-		fclose (pfile);
+	memcpy(image->data, imageData->buffer, imageData->width * imageData->height);
+	Image_Free(imageData);
 
 	return image;
 }

utils/pxmv/GlWindow.h

@@ -87,7 +87,7 @@ class GlWindow : public mxGlWindow
 	void setControlPanel( ControlPanel *panel ) { d_cpl = panel; }
 
 	mxImage *readBmpFromBuffer(const byte *buffer, size_t size);
-	mxImage *readBmpFromFile(const char *filename);
+	mxImage *readTextureFromFile(const char *filename);
 	void imageFree(mxImage *image);
 
 	// ACCESSORS