mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-24 00:44:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement MxDisplaySurface::VTable0x24 (#1261)

Browse Source 
* MxDisplaySurface::VTable0x24

* Fix stride/length check in vtable24 and vtable28
This commit is contained in:
MS
2024-12-22 22:21:07 -05:00
committed by GitHub
parent cbc3d7227e
commit 1f582eb610
2 changed files with 153 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
LEGO1/omni/include/mxdisplaysurface.h
View File

@@ -27,14 +27,14 @@ public:
virtual void Destroy(); // vtable+0x1c virtual void Destroy(); // vtable+0x1c
virtual void SetPalette(MxPalette* p_palette); // vtable+0x20 virtual void SetPalette(MxPalette* p_palette); // vtable+0x20
virtual void VTable0x24( virtual void VTable0x24(
LPDDSURFACEDESC, LPDDSURFACEDESC p_desc,
MxBitmap*, MxBitmap* p_bitmap,
undefined4, MxS32 p_left,
undefined4, MxS32 p_top,
undefined4, MxS32 p_right,
undefined4, MxS32 p_bottom,
undefined4, MxS32 p_width,
undefined4 MxS32 p_height
); // vtable+0x24 ); // vtable+0x24
virtual void VTable0x28( virtual void VTable0x28(
MxBitmap* p_bitmap, MxBitmap* p_bitmap,

155
LEGO1/omni/src/video/mxdisplaysurface.cpp
View File

@@ -398,7 +398,7 @@ void MxDisplaySurface::VTable0x28(
MxU16* p16bitPal = m_16bitPal; MxU16* p16bitPal = m_16bitPal;
MxS32 i; MxS32 i;
if (stride || length) { if (!stride && !length) {
while (height--) { while (height--) {
MxU8* surfaceBefore = surface; MxU8* surfaceBefore = surface;
@@ -1063,18 +1063,153 @@ done:
return NULL; return NULL;
} }
// STUB: LEGO1 0x100bc200 // FUNCTION: LEGO1 0x100bc200
void MxDisplaySurface::VTable0x24( void MxDisplaySurface::VTable0x24(
LPDDSURFACEDESC, LPDDSURFACEDESC p_desc,
MxBitmap*, MxBitmap* p_bitmap,
undefined4, MxS32 p_left,
undefined4, MxS32 p_top,
undefined4, MxS32 p_right,
undefined4, MxS32 p_bottom,
undefined4, MxS32 p_width,
undefined4 MxS32 p_height
) )
{ {
// DECOMP: Almost an exact copy of VTable0x28, except that it uses the argument DDSURFACEDESC
// instead of getting one from GetDisplayMode.
if (!GetRectIntersection(
p_bitmap->GetBmiWidth(),
p_bitmap->GetBmiHeightAbs(),
m_videoParam.GetRect().GetWidth(),
m_videoParam.GetRect().GetHeight(),
&p_left,
&p_top,
&p_right,
&p_bottom,
&p_width,
&p_height
)) {
return;
}
MxU8* data = p_bitmap->GetStart(p_left, p_top);
if (m_videoParam.Flags().GetF1bit3()) {
p_bottom *= 2;
p_right *= 2;
switch (m_surfaceDesc.ddpfPixelFormat.dwRGBBitCount) {
case 8: {
MxU8* surface = (MxU8*) p_desc->lpSurface + p_right + (p_bottom * p_desc->lPitch);
MxLong stride = -p_width + GetAdjustedStride(p_bitmap);
MxLong length = -2 * p_width + p_desc->lPitch;
while (p_height--) {
MxU8* surfaceBefore = surface;
for (MxS32 i = 0; p_width > i; i++) {
*surface++ = *data;
*surface++ = *data++;
}
data += stride;
surface += length;
memcpy(surface, surfaceBefore, 2 * p_width);
surface += p_desc->lPitch;
}
break;
}
case 16: {
MxU8* surface = (MxU8*) p_desc->lpSurface + (2 * p_right) + (p_bottom * p_desc->lPitch);
MxLong stride = -p_width + GetAdjustedStride(p_bitmap);
MxS32 length = -4 * p_width + p_desc->lPitch;
MxS32 height = p_height;
MxS32 width = p_width;
MxS32 copyWidth = width * 4;
MxU16* p16bitPal = m_16bitPal;
MxS32 i;
if (!stride && !length) {
while (height--) {
MxU8* surfaceBefore = surface;
for (i = 0; i < width; i++) {
MxU16 element = p16bitPal[*data];
*(MxU16*) surface = element;
surface += 2;
*(MxU16*) surface = element;
data++;
surface += 2;
}
memcpy(surface, surfaceBefore, copyWidth);
surface += p_desc->lPitch;
}
}
else {
while (height--) {
MxU8* surfaceBefore = surface;
for (i = 0; i < width; i++) {
MxU16 element = p16bitPal[*data];
*(MxU16*) surface = element;
surface += 2;
*(MxU16*) surface = element;
data++;
surface += 2;
}
data += stride;
surface += length;
memcpy(surface, surfaceBefore, p_width * 4);
surface += p_desc->lPitch;
}
}
break;
}
default:
break;
}
}
else {
switch (m_surfaceDesc.ddpfPixelFormat.dwRGBBitCount) {
case 8: {
MxU8* surface = (MxU8*) p_desc->lpSurface + p_right + (p_bottom * p_desc->lPitch);
MxLong stride = GetAdjustedStride(p_bitmap);
MxLong length = p_desc->lPitch;
while (p_height--) {
memcpy(surface, data, p_width);
data += stride;
surface += length;
}
break;
}
case 16: {
MxU8* surface = (MxU8*) p_desc->lpSurface + (2 * p_right) + (p_bottom * p_desc->lPitch);
MxLong stride = -p_width + GetAdjustedStride(p_bitmap);
MxLong length = -2 * p_width + p_desc->lPitch;
for (MxS32 i = 0; i < p_height; i++) {
for (MxS32 j = 0; j < p_width; j++) {
*(MxU16*) surface = m_16bitPal[*data++];
surface += 2;
}
data += stride;
surface += length;
}
break;
}
default:
break;
}
}
} }
// STUB: LEGO1 0x100bc630 // STUB: LEGO1 0x100bc630