From: ShadowFlare <blakflare@hotmail.com>
Date: Wed, 29 Mar 2006 22:30:34 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: https://sfsrealm.hopto.org/projects/gitweb.cgi?a=commitdiff_plain;h=7f7b4247b021a783cbba059c344ddcdc1a80e58f;p=grpapi.git

---

diff --git a/drawgrp/drawgrp.cpp b/drawgrp/drawgrp.cpp
index 9adc351..4de2c4c 100644
--- a/drawgrp/drawgrp.cpp
+++ b/drawgrp/drawgrp.cpp
@@ -17,11 +17,29 @@ int main(int argc, char* argv[])
 	return RetVal;
 }*/
 
+struct BufferInfo {
+	WORD nWidth;
+	WORD nHeight;
+	LPDWORD pBuffer;
+};
+
+COLORREF WINAPI ReadPixelFromBuffer(BufferInfo *pBI, int X, int Y)
+{
+	return pBI->pBuffer[(Y * pBI->nWidth) + X];
+}
+
+void WINAPI WritePixelToBuffer(BufferInfo *pBI, int X, int Y, COLORREF clrColor)
+{
+	pBI->pBuffer[(Y * pBI->nWidth) + X] = clrColor;
+}
+
 int main(int argc, char* argv[])
 {
 	HANDLE hMPQ=0,hMPQ2=0,hMPQ3=0;
 	DWORD *dwPalette = (DWORD *)_alloca(1024);
 	memset(dwPalette,0,1024);
+	LoadStorm("SFMpq.dll");
+	SetMpqDll("SFMpq.dll");
 	if (SFileOpenArchive!=0) {
 		char *buffer = (char *)_alloca(13);
 		memcpy(buffer,"StarDat.mpq",12);
@@ -31,6 +49,9 @@ int main(int argc, char* argv[])
 		memcpy(buffer,"Patch_rt.mpq",13);
 		SFileOpenArchive(buffer,3000,0,&hMPQ3);
 	}
+	SetFunctionGetPixel((GETPIXELPROC)ReadPixelFromBuffer);
+	SetFunctionSetPixel((SETPIXELPROC)WritePixelToBuffer);
+	BufferInfo BI;
 	LoadPalette("tileset\\Jungle.wpe",dwPalette);
 	HANDLE hGrp;
 	if (argc>1)
@@ -40,20 +61,61 @@ int main(int argc, char* argv[])
 	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.pBuffer = (DWORD *)malloc(BI.nWidth * BI.nHeight * sizeof(DWORD));
+	WORD i,x,y;
+	DWORD j;
+	for (i = 0; i < BI.nWidth * BI.nHeight; i++)
+		BI.pBuffer[i] = 0xFFFFFFFF;
 	//for (DWORD j=0;j<16;j++){
 	/*for (WORD i=0;i<GrpInfo.nFrames;i++) {
 		DrawGrp(hGrp,hDC,0,0,i,dwPalette,ALPHA_BLEND,0x401020);
 	}*/
-	for (WORD i=8;i<400;i+=17) {
-		for (DWORD j=0;j<8;j++)
-		DrawGrp(hGrp,hDC,i,0,i % (17*8),dwPalette,ALPHA_BLEND,0x401020);
+	COLORREF clrPixel;
+	RECT rect;
+	for (i=13;i<400;i+=17) {
+		rect.left = rect.top = i;
+		rect.right = rect.left + BI.nWidth;
+		rect.bottom = rect.top + BI.nHeight;
+		for (x = 0; x < BI.nWidth * BI.nHeight; x++)
+			BI.pBuffer[x] = 0xFFFFFFFF;
+		for (j=0;j<32;j++) {
+//			DrawGrp(hGrp,(HDC)&BI,i,0,i % (17*8),dwPalette,ALPHA_BLEND,0x401020);
+			DrawGrp(hGrp,(HDC)&BI,0,0,i % (17*8),dwPalette,0,0x401020);
+			for (x = 0; x < BI.nWidth; x++)
+				for (y = 0; y < BI.nHeight; y++) {
+					clrPixel = BI.pBuffer[(y * BI.nWidth) + x];
+					if (clrPixel != 0xFFFFFFFF) SetPixelV(hDC, i + x, i + y, clrPixel);
+				}
+		}
+		FillRect(hDC, &rect, (HBRUSH) (COLOR_WINDOW+1));
 	}
-	for (i=8;i<400;i+=17) {
-		for (DWORD j=0;j<8;j++)
-		DrawGrp(hGrp,hDC,400-i,0,i % (17*8),dwPalette,HORIZONTAL_FLIP|ALPHA_BLEND,0x401020);
+	for (i=4;i<400;i+=17) {
+		rect.left = rect.top = 400-i;
+		rect.right = rect.left + BI.nWidth;
+		rect.bottom = rect.top + BI.nHeight;
+		for (x = 0; x < BI.nWidth * BI.nHeight; x++)
+			BI.pBuffer[x] = 0xFFFFFFFF;
+		for (j=0;j<32;j++) {
+//			DrawGrp(hGrp,(HDC)&BI,400-i,0,i % (17*8),dwPalette,HORIZONTAL_FLIP|ALPHA_BLEND,0x401020);
+			DrawGrp(hGrp,(HDC)&BI,0,0,i % (17*8),dwPalette,HORIZONTAL_FLIP,0x401020);
+			for (x = 0; x < BI.nWidth; x++)
+				for (y = 0; y < BI.nHeight; y++) {
+					clrPixel = BI.pBuffer[(y * BI.nWidth) + x];
+					if (clrPixel != 0xFFFFFFFF) SetPixelV(hDC, 400-i + x, 400-i + y, clrPixel);
+				}
+		}
+		FillRect(hDC, &rect, (HBRUSH) (COLOR_WINDOW+1));
 	}
+	for (i = 0; i < BI.nWidth; i++)
+		for (j = 0; j < BI.nHeight; j++) {
+			clrPixel = BI.pBuffer[(j * BI.nWidth) + i];
+			if (clrPixel != 0xFFFFFFFF) SetPixelV(hDC, 400 + i, 300 + j, clrPixel);
+		}
 	//}
 	ReleaseDC(0,hDC);
+	free(BI.pBuffer);
     DestroyGrp(hGrp);
 	if (SFileCloseArchive!=0) {
 		if (hMPQ3!=0) SFileCloseArchive(hMPQ3);
diff --git a/grpapi/grpapi_no-lib.cpp b/grpapi/grpapi_no-lib.cpp
index a183155..909d1c5 100644
--- a/grpapi/grpapi_no-lib.cpp
+++ b/grpapi/grpapi_no-lib.cpp
@@ -12,6 +12,9 @@ funcLoadGrp LoadGrp = 0;
 funcDestroyGrp DestroyGrp = 0;
 funcDrawGrp DrawGrp = 0;
 funcGetGrpInfo GetGrpInfo = 0;
+funcSetFunctionGetPixel SetFunctionGetPixel = 0;
+funcSetFunctionSetPixel SetFunctionSetPixel = 0;
+funcSetMpqDll SetMpqDll = 0;
 funcLoadGrpApi LoadGrpApi = 0;
 funcFreeGrpApi FreeGrpApi = 0;
 
@@ -26,6 +29,9 @@ GRPAPIMODULE::GRPAPIMODULE()
 		DestroyGrp = (funcDestroyGrp)GetProcAddress(hGrpApi,"DestroyGrp");
 		DrawGrp = (funcDrawGrp)GetProcAddress(hGrpApi,"DrawGrp");
 		GetGrpInfo = (funcGetGrpInfo)GetProcAddress(hGrpApi,"GetGrpInfo");
+		SetFunctionGetPixel = (funcSetFunctionGetPixel)GetProcAddress(hGrpApi,"SetFunctionGetPixel");
+		SetFunctionSetPixel = (funcSetFunctionSetPixel)GetProcAddress(hGrpApi,"SetFunctionSetPixel");
+		SetMpqDll = (funcSetMpqDll)GetProcAddress(hGrpApi,"SetMpqDll");
 		LoadGrpApi = (funcLoadGrpApi)GetProcAddress(hGrpApi,"LoadGrpApi");
 		FreeGrpApi = (funcFreeGrpApi)GetProcAddress(hGrpApi,"FreeGrpApi");
 	}
@@ -38,6 +44,9 @@ GRPAPIMODULE::~GRPAPIMODULE()
 	DestroyGrp = 0;
 	DrawGrp = 0;
 	GetGrpInfo = 0;
+	SetFunctionGetPixel = 0;
+	SetFunctionSetPixel = 0;
+	SetMpqDll = 0;
 	LoadGrpApi = 0;
 	FreeGrpApi = 0;
 
@@ -53,4 +62,3 @@ void LoadGrpApiLib()
 void FreeGrpApiLib()
 {
 }
-
diff --git a/grpapi/grpapi_no-lib.h b/grpapi/grpapi_no-lib.h
index a252519..8698fd1 100644
--- a/grpapi/grpapi_no-lib.h
+++ b/grpapi/grpapi_no-lib.h
@@ -58,6 +58,33 @@ extern funcDestroyGrp DestroyGrp;
 extern funcDrawGrp DrawGrp;
 extern funcGetGrpInfo GetGrpInfo;
 
+typedef COLORREF (WINAPI* GETPIXELPROC)(
+  HDC hDC, // same value as hdcDest from DrawGrp,
+	       // does not need to be used as an HDC,
+	       // can be used for any other type of pointer
+  int X,   // x-coordinate of pixel
+  int Y    // y-coordinate of pixel
+);
+typedef void (WINAPI* SETPIXELPROC)(
+	HDC hDC,          // same value as hdcDest from DrawGrp,
+	                  // does not need to be used as an HDC,
+	                  // can be used for any other type of pointer
+	int X,            // x-coordinate of pixel
+	int Y,            // y-coordinate of pixel
+	COLORREF clrColor // new pixel color
+);
+
+// Call these to have DrawGrp use custom functions for reading and drawing pixels
+// so that you can have it read from and write to a buffer, for example.
+typedef void (WINAPI* funcSetFunctionGetPixel)(GETPIXELPROC lpGetPixelProc);
+typedef void (WINAPI* funcSetFunctionSetPixel)(SETPIXELPROC lpSetPixelProc);
+extern funcSetFunctionGetPixel SetFunctionGetPixel;
+extern funcSetFunctionSetPixel SetFunctionSetPixel;
+
+// Call this to make a different Storm.dll-compatible MPQ library be used (like SFMPQ).
+typedef BOOL (WINAPI* funcSetMpqDll)(LPCSTR lpDllFileName);
+extern funcSetMpqDll SetMpqDll;
+
 // These no longer need to be called
 typedef BOOL   (WINAPI* funcLoadGrpApi)();
 typedef void   (WINAPI* funcFreeGrpApi)();