utils: pxmv: moved screenshots to imagelib

Also makes possible to do screenshots with alpha-channel

Author: APAmk2

utils/pxmv/GlWindow.cpp

@@ -792,21 +792,40 @@ void GlWindow :: dumpViewport( const char *filename )
 	int w = w2();
 	int h = h2();
 
-	mxImage *image = (mxImage *)Mem_Alloc(sizeof(mxImage));
-	new (image) mxImage();
+	rgbdata_t *image = Image_Alloc( w, h, false );
 
-	if (image && image->create( w, h, 24 ))
-	{
-		glReadBuffer( GL_FRONT );
-		glReadPixels( 0, 0, w, h, GL_RGB, GL_UNSIGNED_BYTE, image->data );
+	if (!image)
+		return;
 
-		image->flip_vertical();
+	byte *glPixelData = (byte*)Mem_Alloc(w * h * 4);
+	if (!glPixelData)
+	{
+		Image_Free(image);
+		return;
+	}
 
-		if (!mxBmpWrite( filename, image ))
-			mxMessageBox( this, "Error writing screenshot.", APP_TITLE_STR, MX_MB_OK|MX_MB_ERROR );
+	image->flags |= IMAGE_HAS_8BIT_ALPHA;
+	glReadBuffer( GL_FRONT );
+	glReadPixels( 0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, glPixelData);
 
-		Mem_Free(image);
+	byte *imagePixel = image->buffer;
+	for (int y = h - 1; y > 0; y--)
+	{
+		byte *in = glPixelData + (y * w * 4);
+		byte *rowend = in + (w * 4);
+		for (; in < rowend; in+=4)
+		{
+			*imagePixel++ = in[0];
+			*imagePixel++ = in[1];
+			*imagePixel++ = in[2];
+			*imagePixel++ = in[3];
+		}
 	}
+
+	if (!COM_SaveImage(filename, image))
+		mxMessageBox( this, "Error writing screenshot.", APP_TITLE_STR, MX_MB_OK|MX_MB_ERROR );
+
+	Image_Free(image);
 }
 
 mxImage *GlWindow::readBmpFromBuffer(const byte * buffer, size_t size)

utils/pxmv/mdlviewer.cpp

@@ -589,11 +589,9 @@ MDLViewer::handleEvent (mxEvent *event)
 
 		case IDC_OPTIONS_MAKESCREENSHOT:
 		{
-			char *ptr = (char *)mxGetSaveFileName( this, "", "Windows Bitmap (*.bmp)" );
+			char *ptr = (char *)mxGetSaveFileName( this, "", "Any supported format (*.bmp; *.tga; *.dds; *.png)", "test.png", "png");
 			if( ptr )
 			{
-				if( !strstr( ptr, ".bmp" ))
-					strcat( ptr, ".bmp" );
 				d_GlWindow->dumpViewport( ptr );
 			}
 		}