Game-Decompilation/TR2X
1
0
Fork 0
mirror of https://github.com/LostArtefacts/TR2X.git synced 2025-01-09 06:50:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

port Matrix_PushUnit

Browse Source
This commit is contained in:
Marcin Kurczewski 2023-10-12 19:46:34 +02:00
parent 29e05be047
commit 5d11a157dd
No known key found for this signature in database
GPG Key ID: CC65E6FD28CAE42A
6 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
docs/progress.svg
View File

@ -69,10 +69,10 @@
</g>
<g transform="translate(0 116)">
<text x="0" y="7.50">Tomb2.exe progress according to the physical function order:</text>
<text class="todo" style="font-size: 12px; " x="747" y="9"><tspan text-anchor="end"><tspan class="decompiled">17.67% (212)</tspan> · <tspan class="known">79.92% (959)</tspan> · <tspan class="todo">0.67% (8)</tspan> · <tspan class="unused">1.75% (21)</tspan></tspan></text>
<text class="todo" style="font-size: 12px; " x="747" y="9"><tspan text-anchor="end"><tspan class="decompiled">17.75% (213)</tspan> · <tspan class="known">79.83% (958)</tspan> · <tspan class="todo">0.67% (8)</tspan> · <tspan class="unused">1.75% (21)</tspan></tspan></text>
<g transform="translate(0 20)">
<rect width="131.97" height="6" x="0" y="0" class="decompiled"/>
<rect width="596.98" height="6" x="131.97" y="0" class="known"/>
<rect width="132.59" height="6" x="0" y="0" class="decompiled"/>
<rect width="596.36" height="6" x="132.59" y="0" class="known"/>
<rect width="4.98" height="6" x="728.95" y="0" class="todo"/>
<rect width="13.07" height="6" x="733.93" y="0" class="unused"/>
</g>
@ -1266,7 +1266,7 @@
<rect width="12" height="12" x="540" y="345" class="known"><title>void __cdecl SE_PassMessageToImage(HWND hWnd, UINT uMsg, WPARAM wParam);</title></rect>
<rect width="12" height="12" x="555" y="345" class="known"><title>void __cdecl UT_MemBlt(BYTE *dstBuf, DWORD dstX, DWORD dstY, DWORD width, DWORD height, DWORD dstPitch, BYTE *srcBuf, DWORD srcX, DWORD srcY, DWORD srcPitch);</title></rect>
<rect width="12" height="12" x="570" y="345" class="decompiled"><title>void __cdecl Matrix_Push(void);</title></rect>
<rect width="12" height="12" x="585" y="345" class="known"><title>void __cdecl Matrix_PushUnit(void);</title></rect>
<rect width="12" height="12" x="585" y="345" class="decompiled"><title>void __cdecl Matrix_PushUnit(void);</title></rect>
<rect width="12" height="12" x="600" y="345" class="known"><title>void __fastcall flatA(int32_t y0, int32_t y1, BYTE colorIdx);</title></rect>
<rect width="12" height="12" x="615" y="345" class="known"><title>void __fastcall transA(int32_t y0, int32_t y1, BYTE depthQ);</title></rect>
<rect width="12" height="12" x="630" y="345" class="known"><title>void __fastcall gourA(int32_t y0, int32_t y1, BYTE colorIdx);</title></rect>
@ -1281,10 +1281,10 @@
</g>
<g transform="translate(0 531)">
<text x="0" y="7.50">Tomb2.exe progress according to the function sizes:</text>
<text class="todo" style="font-size: 12px; " x="747" y="9"><tspan text-anchor="end"><tspan class="decompiled">9.96%</tspan> · <tspan class="known">89.71%</tspan> · <tspan class="todo">0.02%</tspan> · <tspan class="unused">0.31%</tspan></tspan></text>
<text class="todo" style="font-size: 12px; " x="747" y="9"><tspan text-anchor="end"><tspan class="decompiled">9.97%</tspan> · <tspan class="known">89.70%</tspan> · <tspan class="todo">0.02%</tspan> · <tspan class="unused">0.31%</tspan></tspan></text>
<g transform="translate(0 20)">
<rect width="74.38" height="6" x="0" y="0" class="decompiled"/>
<rect width="670.16" height="6" x="74.38" y="0" class="known"/>
<rect width="74.49" height="6" x="0" y="0" class="decompiled"/>
<rect width="670.05" height="6" x="74.49" y="0" class="known"/>
<rect width="0.13" height="6" x="744.54" y="0" class="todo"/>
<rect width="2.33" height="6" x="744.67" y="0" class="unused"/>
</g>
@ -2233,7 +2233,7 @@
<rect width="3.32" height="3.50" x="687.55" y="281.75" class="known"><title>void __cdecl draw_shotgun_meshes(int32_t weapon_type);</title></rect>
<rect width="3.32" height="3.50" x="693.87" y="281.75" class="known"><title>int32_t __cdecl PickupTrigger(int16_t item_num);</title></rect>
<rect width="3.32" height="3.50" x="700.19" y="281.75" class="known"><title>void __cdecl DDrawRelease(void);</title></rect>
<rect width="3.32" height="3.50" x="706.51" y="281.75" class="known"><title>void __cdecl Matrix_PushUnit(void);</title></rect>
<rect width="3.32" height="3.50" x="706.51" y="281.75" class="decompiled"><title>void __cdecl Matrix_PushUnit(void);</title></rect>
<rect width="3.20" height="3.50" x="712.83" y="281.75" class="known"><title>int16_t *__cdecl Output_CalcBackgroundLight(const int16_t *obj_ptr);</title></rect>
<rect width="3.20" height="3.50" x="719.02" y="281.75" class="known"><title>void __cdecl RingActive(void);</title></rect>
<rect width="3.20" height="3.50" x="725.22" y="281.75" class="decompiled"><title>void __cdecl Lara_GetCollisionInfo(struct ITEM_INFO *item, struct COLL_INFO *coll);</title></rect>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 358 KiB

After

Width:  |  Height:  |  Size: 358 KiB

2
docs/progress.txt
View File

@ -2428,7 +2428,7 @@ typedef enum LARA_MESH {
004571E0 00000026 -R void __cdecl SE_PassMessageToImage(HWND hWnd, UINT uMsg, WPARAM wParam);
00457210 0000006E -R void __cdecl UT_MemBlt(BYTE *dstBuf, DWORD dstX, DWORD dstY, DWORD width, DWORD height, DWORD dstPitch, BYTE *srcBuf, DWORD srcX, DWORD srcY, DWORD srcPitch);
00457280 0000001E + void __cdecl Matrix_Push(void);
0045729E 00000033 * void __cdecl Matrix_PushUnit(void);
0045729E 00000033 + void __cdecl Matrix_PushUnit(void);
004572D4 00000061 -R void __fastcall flatA(int32_t y0, int32_t y1, BYTE colorIdx);
00457335 0000013A -R void __fastcall transA(int32_t y0, int32_t y1, BYTE depthQ);
0045746F 00000160 -R void __fastcall gourA(int32_t y0, int32_t y1, BYTE colorIdx);

17
src/game/matrix.c
View File

@ -15,6 +15,23 @@ void __cdecl Matrix_Push(void)
g_MatrixPtr[0] = g_MatrixPtr[-1];
}
void __cdecl Matrix_PushUnit(void)
{
struct MATRIX *mptr = ++g_MatrixPtr;
mptr->_00 = (1 << W2V_SHIFT);
mptr->_01 = 0;
mptr->_02 = 0;
mptr->_10 = 0;
mptr->_11 = (1 << W2V_SHIFT);
mptr->_12 = 0;
mptr->_20 = 0;
mptr->_21 = 0;
mptr->_22 = (1 << W2V_SHIFT);
// mptr->_03 = 0;
// mptr->_13 = 0;
// mptr->_23 = 0;
}
void __cdecl Matrix_Pop(void)
{
g_MatrixPtr--;

1
src/game/matrix.h
View File

@ -8,6 +8,7 @@
struct PHD_3DPOS;
void __cdecl Matrix_Push(void);
void __cdecl Matrix_PushUnit(void);
void __cdecl Matrix_Pop(void);
void __cdecl Matrix_GenerateW2V(struct PHD_3DPOS *viewpos);
void __cdecl Matrix_LookAt(

1
src/global/funcs.h
View File

@ -958,7 +958,6 @@
#define SE_SetupWindowProc ((LRESULT __stdcall (*)(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam))0x00456FA0)
#define SE_PassMessageToImage ((void __cdecl (*)(HWND hWnd, UINT uMsg, WPARAM wParam))0x004571E0)
#define UT_MemBlt ((void __cdecl (*)(BYTE *dstBuf, DWORD dstX, DWORD dstY, DWORD width, DWORD height, DWORD dstPitch, BYTE *srcBuf, DWORD srcX, DWORD srcY, DWORD srcPitch))0x00457210)
#define Matrix_PushUnit ((void __cdecl (*)(void))0x0045729E)
#define flatA ((void __fastcall (*)(int32_t y0, int32_t y1, BYTE colorIdx))0x004572D4)
#define transA ((void __fastcall (*)(int32_t y0, int32_t y1, BYTE depthQ))0x00457335)
#define gourA ((void __fastcall (*)(int32_t y0, int32_t y1, BYTE colorIdx))0x0045746F)

1
src/inject_exec.c
View File

@ -67,6 +67,7 @@ static void Inject_Matrix(void)
INJECT(1, 0x0041BA80, Matrix_Interpolate);
INJECT(1, 0x0041BC30, Matrix_InterpolateArm);
INJECT(1, 0x00457280, Matrix_Push);
INJECT(1, 0x0045729E, Matrix_PushUnit);
}
static void Inject_Math(void)