isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2024-11-26 17:46:38 -05:00
Code Issues Projects Releases Packages Wiki Activity

MxTransitionManager corrections (#513)

Browse source
This commit is contained in:
MS 2024-01-31 17:39:50 -05:00 committed by GitHub
parent a1488b16b4
commit 97d1ba7c71
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
LEGO1/lego/legoomni/src/video/mxtransitionmanager.cpp
View file

@ -223,10 +223,12 @@ void MxTransitionManager::TransitionDissolve()
// Set the chosen pixel to black // Set the chosen pixel to black
if (ddsd.ddpfPixelFormat.dwRGBBitCount == 8) { if (ddsd.ddpfPixelFormat.dwRGBBitCount == 8) {
((MxU8*) ddsd.lpSurface)[row * ddsd.lPitch + xShift] = 0; MxU8* surf = (MxU8*) ddsd.lpSurface + ddsd.lPitch * row + xShift;
*surf = 0;
} }
else { else {
((MxU16*) ddsd.lpSurface)[row * ddsd.lPitch + xShift] = 0; MxU8* surf = (MxU8*) ddsd.lpSurface + ddsd.lPitch * row + xShift * 2;
*(MxU16*) surf = 0;
} }
} }
} }
@ -296,53 +298,38 @@ void MxTransitionManager::TransitionPixelation()
continue; continue;
for (MxS32 row = 0; row < 48; row++) { for (MxS32 row = 0; row < 48; row++) {
MxS32 xShift = 10 * ((m_randomShift[row] + col) % 64);
// To do the pixelation, we subdivide the 640x480 surface into // To do the pixelation, we subdivide the 640x480 surface into
// 10x10 pixel blocks. At the chosen block, we sample the top-leftmost // 10x10 pixel blocks. At the chosen block, we sample the top-leftmost
// color and set the other 99 pixels to that value. // color and set the other 99 pixels to that value.
// Find the pixel to sample // First, get the offset of the 10x10 block that we will sample for this row.
MxS32 sampleOfs = 10 * row * ddsd.lPitch + xShift; MxS32 xShift = 10 * ((m_randomShift[row] + col) % 64);
// Combine xShift with this value to target the correct location in the buffer.
MxS32 bytesPerPixel = ddsd.ddpfPixelFormat.dwRGBBitCount / 8; MxS32 bytesPerPixel = ddsd.ddpfPixelFormat.dwRGBBitCount / 8;
// Save this cast from void* to save time. // Seek to the sample position.
// Seems to help accuracy doing it this way. MxU8* source = (MxU8*) ddsd.lpSurface + 10 * row * ddsd.lPitch + bytesPerPixel * xShift;
MxU8* surface = (MxU8*) ddsd.lpSurface;
MxU8* source = surface + sampleOfs * bytesPerPixel;
// Sample byte or word depending on display mode.
MxU32 sample = bytesPerPixel == 1 ? *source : *(MxU16*) source; MxU32 sample = bytesPerPixel == 1 ? *source : *(MxU16*) source;
// For each of the 10 rows in the 10x10 square:
for (MxS32 k = 10 * row; k < 10 * row + 10; k++) { for (MxS32 k = 10 * row; k < 10 * row + 10; k++) {
if (ddsd.ddpfPixelFormat.dwRGBBitCount == 8) { if (ddsd.ddpfPixelFormat.dwRGBBitCount == 8) {
// TODO: This block and the next don't match, but they are MxU8* pos = (MxU8*) ddsd.lpSurface + k * ddsd.lPitch + xShift;
// hopefully correct in principle.
MxU16 colorWord = MAKEWORD(LOBYTE(sample), LOBYTE(sample));
MxU32 newColor = MAKELONG(colorWord, colorWord);
MxU8* pos = surface + k * ddsd.lPitch + xShift; for (MxS32 tt = 0; tt < 10; tt++) {
MxU32* dest = (MxU32*) pos; pos[tt] = sample;
}
// Sets 10 pixels (10 bytes)
dest[0] = newColor;
dest[1] = newColor;
MxU16* half = (MxU16*) (dest + 2);
*half = newColor;
} }
else { else {
MxU32 newColor = MAKELONG(sample, sample); // Need to double xShift because it measures pixels not bytes
MxU16* pos = (MxU16*) ((MxU8*) ddsd.lpSurface + k * ddsd.lPitch + 2 * xShift);
// You might expect a cast to MxU16* instead, but lPitch is for (MxS32 tt = 0; tt < 10; tt++) {
// bytes/scanline, not pixels/scanline. Therefore, we just pos[tt] = sample;
// need to double the xShift to get to the right spot. }
MxU8* pos = surface + k * ddsd.lPitch + 2 * xShift;
MxU32* dest = (MxU32*) pos;
// Sets 10 pixels (20 bytes)
dest[0] = newColor;
dest[1] = newColor;
dest[2] = newColor;
dest[3] = newColor;
dest[4] = newColor;
} }
} }
} }