mirror of
https://github.com/isledecomp/isle-portable.git
synced 2025-09-23 12:03:56 -04:00
Align FakeMosaicTransition with MosaicTransition (#545)
The palette is a bit off but I have no strong urge to fix it
This commit is contained in:
Anders Jenbo
GitHub
parent
b82cfc4b36
commit
c6b94dabcf
@ -701,101 +701,129 @@ void MxTransitionManager::FakeMosaicTransition()
|
|||||||
EndTransition(TRUE);
|
EndTransition(TRUE);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
if (m_animationTimer == 0) {
|
||||||
|
g_colorOffset = SDL_rand(32);
|
||||||
|
|
||||||
if (m_animationTimer == 0) {
|
// Same init/shuffle steps as the dissolve transition, except that
|
||||||
g_colorOffset = SDL_rand(32);
|
// we are using big blocky pixels and only need 64 columns.
|
||||||
for (MxS32 i = 0; i < 64; i++) {
|
MxS32 i;
|
||||||
m_columnOrder[i] = i;
|
for (i = 0; i < 64; i++) {
|
||||||
}
|
m_columnOrder[i] = i;
|
||||||
for (MxS32 i = 0; i < 64; i++) {
|
|
||||||
MxS32 swap = SDL_rand(64);
|
|
||||||
std::swap(m_columnOrder[i], m_columnOrder[swap]);
|
|
||||||
}
|
|
||||||
for (MxS32 i = 0; i < 48; i++) {
|
|
||||||
m_randomShift[i] = SDL_rand(64);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!g_fakeTranstionSurface) {
|
|
||||||
DDSURFACEDESC mainDesc = {};
|
|
||||||
mainDesc.dwSize = sizeof(mainDesc);
|
|
||||||
if (m_ddSurface->GetSurfaceDesc(&mainDesc) != DD_OK) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
DDSURFACEDESC tempDesc = {};
|
|
||||||
tempDesc.dwSize = sizeof(tempDesc);
|
|
||||||
tempDesc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT | DDSD_CAPS;
|
|
||||||
tempDesc.dwWidth = 64;
|
|
||||||
tempDesc.dwHeight = 48;
|
|
||||||
tempDesc.ddpfPixelFormat = mainDesc.ddpfPixelFormat;
|
|
||||||
tempDesc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN;
|
|
||||||
|
|
||||||
HRESULT hr = MVideoManager()->GetDirectDraw()->CreateSurface(&tempDesc, &g_fakeTranstionSurface, nullptr);
|
|
||||||
if (hr != DD_OK || !g_fakeTranstionSurface) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
DDSURFACEDESC ddsd = {};
|
|
||||||
ddsd.dwSize = sizeof(ddsd);
|
|
||||||
HRESULT res = g_fakeTranstionSurface->Lock(NULL, &ddsd, DDLOCK_WAIT | DDLOCK_WRITEONLY, NULL);
|
|
||||||
if (res == DDERR_SURFACELOST) {
|
|
||||||
g_fakeTranstionSurface->Restore();
|
|
||||||
res = g_fakeTranstionSurface->Lock(NULL, &ddsd, DDLOCK_WAIT | DDLOCK_WRITEONLY, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (res == DD_OK) {
|
|
||||||
SubmitCopyRect(&ddsd);
|
|
||||||
|
|
||||||
static const MxU8 g_palette[32][3] = {
|
|
||||||
{0x00, 0x00, 0x00}, {0x12, 0x1e, 0x50}, {0x00, 0x22, 0x6c}, {0x14, 0x2d, 0x9f}, {0x0e, 0x36, 0xb0},
|
|
||||||
{0x0e, 0x39, 0xd0}, {0x47, 0x96, 0xe2}, {0x79, 0xaa, 0xca}, {0xff, 0xff, 0xff}, {0xc9, 0xcd, 0xcb},
|
|
||||||
{0xad, 0xad, 0xab}, {0xa6, 0x91, 0x8e}, {0xaf, 0x59, 0x49}, {0xc0, 0x00, 0x00}, {0xab, 0x18, 0x18},
|
|
||||||
{0x61, 0x0c, 0x0c}, {0x04, 0x38, 0x12}, {0x2c, 0x67, 0x28}, {0x4a, 0xb4, 0x6b}, {0x94, 0xb7, 0x7c},
|
|
||||||
{0xb6, 0xb9, 0x87}, {0x52, 0x4a, 0x67}, {0x87, 0x8d, 0x8a}, {0xa6, 0x91, 0x8e}, {0xf8, 0xee, 0xdc},
|
|
||||||
{0xf4, 0xe2, 0xc3}, {0x87, 0x8d, 0x8a}, {0xba, 0x9f, 0x12}, {0xb5, 0x83, 0x00}, {0x6a, 0x44, 0x27},
|
|
||||||
{0x36, 0x37, 0x34}, {0x2b, 0x23, 0x0f}
|
|
||||||
};
|
|
||||||
|
|
||||||
MxS32 bytesPerPixel = ddsd.ddpfPixelFormat.dwRGBBitCount / 8;
|
|
||||||
|
|
||||||
for (MxS32 col = 0; col < 64; col++) {
|
|
||||||
if (m_animationTimer * 4 > m_columnOrder[col]) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (m_animationTimer * 4 + 3 < m_columnOrder[col]) {
|
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for (MxS32 row = 0; row < 48; row++) {
|
for (i = 0; i < 64; i++) {
|
||||||
int paletteIndex = GetColorIndexWithLocality(col, row);
|
MxS32 swap = SDL_rand(64);
|
||||||
|
MxU16 t = m_columnOrder[i];
|
||||||
|
m_columnOrder[i] = m_columnOrder[swap];
|
||||||
|
m_columnOrder[swap] = t;
|
||||||
|
}
|
||||||
|
|
||||||
const MxU8* color = g_palette[paletteIndex];
|
// The same is true here. We only need 48 rows.
|
||||||
|
for (i = 0; i < 48; i++) {
|
||||||
|
m_randomShift[i] = SDL_rand(64);
|
||||||
|
}
|
||||||
|
DDSURFACEDESC mainDesc = {};
|
||||||
|
mainDesc.dwSize = sizeof(mainDesc);
|
||||||
|
if (m_ddSurface->GetSurfaceDesc(&mainDesc) != DD_OK) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
MxS32 xShift = (m_randomShift[row] + col) % 64;
|
DDSURFACEDESC tempDesc = {};
|
||||||
MxU8* dest = (MxU8*) ddsd.lpSurface + row * ddsd.lPitch + xShift * bytesPerPixel;
|
tempDesc.dwSize = sizeof(tempDesc);
|
||||||
|
tempDesc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT | DDSD_CAPS;
|
||||||
|
tempDesc.dwWidth = 64;
|
||||||
|
tempDesc.dwHeight = 48;
|
||||||
|
tempDesc.ddpfPixelFormat = mainDesc.ddpfPixelFormat;
|
||||||
|
tempDesc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN;
|
||||||
|
|
||||||
switch (bytesPerPixel) {
|
if (MVideoManager()->GetDirectDraw()->CreateSurface(&tempDesc, &g_fakeTranstionSurface, nullptr) != DD_OK) {
|
||||||
case 1:
|
return;
|
||||||
*dest = paletteIndex;
|
}
|
||||||
break;
|
|
||||||
case 2:
|
DWORD fillColor = 0x00000000;
|
||||||
*((MxU16*) dest) = RGB555_CREATE(color[2], color[1], color[0]);
|
switch (mainDesc.ddpfPixelFormat.dwRGBBitCount) {
|
||||||
break;
|
case 8:
|
||||||
default:
|
fillColor = 0x10;
|
||||||
*((MxU32*) dest) = RGB8888_CREATE(color[2], color[1], color[0], 255);
|
break;
|
||||||
break;
|
case 16:
|
||||||
|
fillColor = RGB555_CREATE(0x1f, 0, 0x1f);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
DDBLTFX bltFx = {};
|
||||||
|
bltFx.dwSize = sizeof(bltFx);
|
||||||
|
bltFx.dwFillColor = fillColor;
|
||||||
|
g_fakeTranstionSurface->Blt(NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &bltFx);
|
||||||
|
|
||||||
|
DDCOLORKEY key = {};
|
||||||
|
key.dwColorSpaceLowValue = key.dwColorSpaceHighValue = fillColor;
|
||||||
|
g_fakeTranstionSurface->SetColorKey(DDCKEY_SRCBLT, &key);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Run one tick of the animation
|
||||||
|
DDSURFACEDESC ddsd;
|
||||||
|
memset(&ddsd, 0, sizeof(ddsd));
|
||||||
|
ddsd.dwSize = sizeof(ddsd);
|
||||||
|
|
||||||
|
HRESULT res = g_fakeTranstionSurface->Lock(NULL, &ddsd, DDLOCK_WAIT | DDLOCK_WRITEONLY, NULL);
|
||||||
|
if (res == DDERR_SURFACELOST) {
|
||||||
|
g_fakeTranstionSurface->Restore();
|
||||||
|
res = g_fakeTranstionSurface->Lock(NULL, &ddsd, DDLOCK_WAIT | DDLOCK_WRITEONLY, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (res == DD_OK) {
|
||||||
|
SubmitCopyRect(&ddsd);
|
||||||
|
|
||||||
|
static const MxU8 g_palette[32][3] = {
|
||||||
|
{0x00, 0x00, 0x00}, {0x12, 0x1e, 0x50}, {0x00, 0x22, 0x6c}, {0x14, 0x2d, 0x9f}, {0x0e, 0x36, 0xb0},
|
||||||
|
{0x0e, 0x39, 0xd0}, {0x47, 0x96, 0xe2}, {0x79, 0xaa, 0xca}, {0xff, 0xff, 0xff}, {0xc9, 0xcd, 0xcb},
|
||||||
|
{0xad, 0xad, 0xab}, {0xa6, 0x91, 0x8e}, {0xaf, 0x59, 0x49}, {0xc0, 0x00, 0x00}, {0xab, 0x18, 0x18},
|
||||||
|
{0x61, 0x0c, 0x0c}, {0x04, 0x38, 0x12}, {0x2c, 0x67, 0x28}, {0x4a, 0xb4, 0x6b}, {0x94, 0xb7, 0x7c},
|
||||||
|
{0xb6, 0xb9, 0x87}, {0x52, 0x4a, 0x67}, {0x87, 0x8d, 0x8a}, {0xa6, 0x91, 0x8e}, {0xf8, 0xee, 0xdc},
|
||||||
|
{0xf4, 0xe2, 0xc3}, {0x87, 0x8d, 0x8a}, {0xba, 0x9f, 0x12}, {0xb5, 0x83, 0x00}, {0x6a, 0x44, 0x27},
|
||||||
|
{0x36, 0x37, 0x34}, {0x2b, 0x23, 0x0f}
|
||||||
|
};
|
||||||
|
|
||||||
|
MxS32 bytesPerPixel = ddsd.ddpfPixelFormat.dwRGBBitCount / 8;
|
||||||
|
|
||||||
|
for (MxS32 col = 0; col < 64; col++) {
|
||||||
|
// Select 4 columns on each tick
|
||||||
|
if (m_animationTimer * 4 > m_columnOrder[col]) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (m_animationTimer * 4 + 3 < m_columnOrder[col]) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (MxS32 row = 0; row < 48; row++) {
|
||||||
|
MxS32 x = (m_randomShift[row] + col) % 64;
|
||||||
|
MxU8* dest = (MxU8*) ddsd.lpSurface + row * ddsd.lPitch + x * bytesPerPixel;
|
||||||
|
|
||||||
|
const MxU8 paletteIndex = GetColorIndexWithLocality(col, row);
|
||||||
|
const MxU8* color = g_palette[paletteIndex];
|
||||||
|
switch (bytesPerPixel) {
|
||||||
|
case 1:
|
||||||
|
*dest = paletteIndex;
|
||||||
|
break;
|
||||||
|
case 2:
|
||||||
|
*((MxU16*) dest) = RGB555_CREATE(color[2], color[1], color[0]);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
*((MxU32*) dest) = RGB8888_CREATE(color[2], color[1], color[0], 255);
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SetupCopyRect(&ddsd);
|
||||||
|
g_fakeTranstionSurface->Unlock(ddsd.lpSurface);
|
||||||
|
|
||||||
|
RECT srcRect = {0, 0, 64, 48};
|
||||||
|
m_ddSurface->Blt(&g_fullScreenRect, g_fakeTranstionSurface, &srcRect, DDBLT_WAIT | DDBLT_KEYSRC, NULL);
|
||||||
|
|
||||||
|
m_animationTimer++;
|
||||||
}
|
}
|
||||||
|
|
||||||
SetupCopyRect(&ddsd);
|
|
||||||
g_fakeTranstionSurface->Unlock(ddsd.lpSurface);
|
|
||||||
|
|
||||||
RECT srcRect = {0, 0, 64, 48};
|
|
||||||
m_ddSurface->Blt(&g_fullScreenRect, g_fakeTranstionSurface, &srcRect, DDBLT_WAIT, NULL);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
m_animationTimer++;
|
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user