X-Git-Url: https://sfsrealm.hopto.org/projects/gitweb.cgi?a=blobdiff_plain;f=drawgrp%2Fdrawgrp.cpp;h=6ddab08a7d12bc188357c2b2f3aef4c7e9248caf;hb=20bc40c88eee9f6da2ba739ecd3f681334862491;hp=8d617368347469bfb7ba4c143c131dcb36879600;hpb=d1874f14b0ef294d396244b8d2e8da5a9079c365;p=grpapi.git

diff --git a/drawgrp/drawgrp.cpp b/drawgrp/drawgrp.cpp
index 8d61736..6ddab08 100644
--- a/drawgrp/drawgrp.cpp
+++ b/drawgrp/drawgrp.cpp
@@ -40,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[])
@@ -60,17 +63,19 @@ 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]);
 	else
-		hGrp = LoadGrp("unit\\zerg\\ultra.grp");
+		hGrp = LoadGrp("unit\\zerg\\zergling.grp");
 	HDC hDC = GetDC(0);
 	GRPHEADER GrpInfo;
 	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;
@@ -83,36 +88,39 @@ int main(int argc, char* argv[])
 	signed short clrPixel;
 	RECT rect;
 	for (i=0;i<GrpInfo.nFrames;i++) {
-		for (j=0;j<8;j++)
+		for (j=0;j<16;j++)
 		{
 			rand_s(&u);
 			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;
+		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, 8);
+				WritePixelToBuffer(&BI, x, y, -1);
 			}
 		}
-		DrawGrp(hGrp,(HDC)&BI,0,0,i,0,USE_INDEX,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 ultralisk.grp", GENERIC_WRITE, 0, 0, CREATE_ALWAYS, 0, 0);
+	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;
 	j=0;
+	
 	for (i=0;i<GrpInfo.nFrames;i+=1) {
 		rect.left = rect.top = 0;
 		rect.right = rect.left + BI.nWidth;
@@ -160,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);