X-Git-Url: https://sfsrealm.hopto.org/projects/gitweb.cgi?a=blobdiff_plain;f=drawgrp%2Fdrawgrp.cpp;h=8a4898033047357e6e4f36af4978ff482493fa5e;hb=8e36282a2286480dbda718cc5437dc878b87ccfc;hp=9b5e286f6e4556791e0120ac936517e2fc9dcac3;hpb=c483a082ba5c516a59a3ae91e3efee095f0f59a3;p=grpapi.git

diff --git a/drawgrp/drawgrp.cpp b/drawgrp/drawgrp.cpp
index 9b5e286..8a48980 100644
--- a/drawgrp/drawgrp.cpp
+++ b/drawgrp/drawgrp.cpp
@@ -3,6 +3,7 @@
 
 #define _CRT_RAND_S
 #include <stdlib.h>
+#include <stdio.h>
 #include "stdafx.h"
 
 
@@ -39,7 +40,10 @@ void WINAPI WritePixelToBuffer(BufferInfo *pBI, int X, int Y, COLORREF clrColor)
 	if (pBI->nFrame == 0xFFFF)
 		pBI->pBuffer[(Y * pBI->nWidth) + X] = (signed short)clrColor;
 	else
-		pBI->pBuffer[(pBI->nFrame * pBI->nWidth * pBI->nHeight) + (Y * pBI->nWidth) + X] = (signed short)clrColor;
+		//if (clrColor < 1 || clrColor > 13)
+		//	pBI->pBuffer[(pBI->nFrame * pBI->nWidth * pBI->nHeight) + (Y * pBI->nWidth) + X] = (signed short)((BYTE)-clrColor);
+		//else
+			pBI->pBuffer[(pBI->nFrame * pBI->nWidth * pBI->nHeight) + (Y * pBI->nWidth) + X] = (signed short)clrColor;
 }
 
 int main(int argc, char* argv[])
@@ -59,7 +63,7 @@ int main(int argc, char* argv[])
 		SFileOpenArchive(buffer,3000,0,&hMPQ3);
 	}
 	BufferInfo BI;
-	LoadPalette("tileset\\Jungle.wpe",dwPalette);
+	LoadPalette("tileset\\Platform.wpe",dwPalette);
 	HANDLE hGrp, hGrp2;
 	if (argc>1)
 		hGrp = LoadGrp(argv[1]);
@@ -70,6 +74,8 @@ int main(int argc, char* argv[])
 	if (GetGrpInfo(hGrp,&GrpInfo)==0) {GrpInfo.nFrames=0;GrpInfo.wMaxWidth=0;GrpInfo.wMaxHeight=0;}
 	BI.nWidth = GrpInfo.wMaxWidth;
 	BI.nHeight = GrpInfo.wMaxHeight;
+	//BI.nWidth = 255;
+	//BI.nHeight = 255;
 	BI.pBuffer = (signed short *)malloc(GrpInfo.nFrames * BI.nWidth * BI.nHeight * sizeof(short));
 	WORD i,x,y;
 	DWORD j, nGrpSize;
@@ -88,39 +94,54 @@ int main(int argc, char* argv[])
 			rand_s(&v);
 			u = u % 800;
 			v = v % 600;
-			//DrawGrp(hGrp,hDC,u,v,i,dwPalette,ALPHA_BLEND,0x404040);
+			DrawGrp(hGrp,hDC,u,v,i,dwPalette,ALPHA_BLEND,0x404040);
 		}
 	}
 	SetFunctionGetPixel((GETPIXELPROC)ReadPixelFromBuffer);
 	SetFunctionSetPixel((SETPIXELPROC)WritePixelToBuffer);
 	for (i=0;i<GrpInfo.nFrames;i++) {
 		BI.nFrame = i;
-		DrawGrp(hGrp,(HDC)&BI,0,0,i,0,USE_INDEX,0);
+		u = (BI.nWidth - GrpInfo.wMaxWidth) / 2;
+		v = (BI.nHeight - GrpInfo.wMaxHeight) / 2;
+		for (y = 0; y < BI.nHeight; y++) {
+			for (x = 0; x < BI.nWidth; x++) {
+				WritePixelToBuffer(&BI, x, y, 0);
+			}
+		}
+		DrawGrp(hGrp,(HDC)&BI,u,v,i,0,USE_INDEX,0);
 	}
 	hGrp2 = hGrp;
-	hGrp = CreateGrp(BI.pBuffer, GrpInfo.nFrames, GrpInfo.wMaxWidth, GrpInfo.wMaxHeight, &nGrpSize);
+	hGrp = CreateGrp(BI.pBuffer, GrpInfo.nFrames, BI.nWidth, BI.nHeight, FALSE, &nGrpSize);
+	/*HANDLE hFile;
+	hFile = CreateFile("generated zergling.grp", GENERIC_WRITE, 0, 0, CREATE_ALWAYS, 0, 0);
+	if (hFile != INVALID_HANDLE_VALUE) {
+		WriteFile(hFile, hGrp, nGrpSize, &j, 0);
+		CloseHandle(hFile);
+	}*/
 	BI.nFrame = 0xFFFF;
-	for (i=13;i<14;i+=17) {
-		rect.left = rect.top = i;
+	j=0;
+	
+	for (i=0;i<GrpInfo.nFrames;i+=1) {
+		rect.left = rect.top = 0;
 		rect.right = rect.left + BI.nWidth;
 		rect.bottom = rect.top + BI.nHeight;
 		for (x = 0; x < BI.nWidth * BI.nHeight; x++)
 			BI.pBuffer[x] = -1;
-		for (j=0;j<(32 * 25);j++) {
+		//for (j=0;j<(1 * 1);j++) {
 //			DrawGrp(hGrp,(HDC)&BI,i,0,i % (17*8),dwPalette,ALPHA_BLEND,0x401020);
-			DrawGrp(hGrp2,(HDC)&BI,0,0,i % (17*8),0,USE_INDEX,0x401020);
-			u = memcmp(BI.pBuffer, &BI.pBuffer[(i % (17*8)) * BI.nWidth * BI.nHeight], BI.nWidth * BI.nHeight * sizeof(short));
-			DrawGrp(hGrp,(HDC)&BI,0,0,i % (17*8),0,USE_INDEX,0x401020);
-			u = memcmp(BI.pBuffer, &BI.pBuffer[(i % (17*8)) * BI.nWidth * BI.nHeight], BI.nWidth * BI.nHeight * sizeof(short));
+			//DrawGrp(hGrp2,(HDC)&BI,0,0,i,0,USE_INDEX,0x401020);
+			//u = memcmp(BI.pBuffer, &BI.pBuffer[i * BI.nWidth * BI.nHeight], BI.nWidth * BI.nHeight * sizeof(short));
+			DrawGrp(hGrp,(HDC)&BI,0,0,i,0,USE_INDEX,0x401020);
+			u = memcmp(BI.pBuffer, &BI.pBuffer[i * BI.nWidth * BI.nHeight], BI.nWidth * BI.nHeight * sizeof(short));
 			for (x = 0; x < BI.nWidth; x++)
 				for (y = 0; y < BI.nHeight; y++) {
 					clrPixel = BI.pBuffer[(y * BI.nWidth) + x];
-					if (clrPixel != -1) SetPixelV(hDC, i + x, i + y, dwPalette[clrPixel]);
+					if (clrPixel != -1) SetPixelV(hDC, x, y, dwPalette[clrPixel]);
 				}
-		}
+		//}
 		if (u) {
-			MessageBox(0, "Output of re-encoded graphic does not match original!", 0, 0);
-			break;
+			printf("Output of re-encoded graphic for frame %d does not match original!  Total %d\n", i, ++j);
+			//break;
 		}
 		FillRect(hDC, &rect, (HBRUSH) (COLOR_WINDOW+1));
 	}
@@ -147,6 +168,7 @@ int main(int argc, char* argv[])
 			if (clrPixel != -1) SetPixelV(hDC, 400 + i, 300 + j, dwPalette[clrPixel]);
 		}
 	//}
+	
 	ReleaseDC(0,hDC);
 	free(BI.pBuffer);
     DestroyGrp(hGrp);