mirror of
https://github.com/isledecomp/isle-portable.git
synced 2026-01-12 02:41:14 +00:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
olebeck
commit
8158bca0ab
@ -501,6 +501,13 @@ SDL_AppResult SDL_AppEvent(void* appstate, SDL_Event* event)
|
||||
}
|
||||
break;
|
||||
}
|
||||
case SDL_EVENT_GAMEPAD_ADDED:
|
||||
case SDL_EVENT_GAMEPAD_REMOVED: {
|
||||
if (InputManager()) {
|
||||
InputManager()->GetJoystick();
|
||||
}
|
||||
break;
|
||||
}
|
||||
case SDL_EVENT_GAMEPAD_BUTTON_DOWN: {
|
||||
switch (event->gbutton.button) {
|
||||
case SDL_GAMEPAD_BUTTON_DPAD_UP:
|
||||
|
||||
@ -108,7 +108,7 @@ class LegoInputManager : public MxPresenter {
|
||||
|
||||
MxResult Create(HWND p_hwnd);
|
||||
void Destroy() override;
|
||||
MxResult GetJoystick();
|
||||
LEGO1_EXPORT MxResult GetJoystick();
|
||||
MxResult GetJoystickState(MxU32* p_joystickX, MxU32* p_joystickY, MxU32* p_povPosition);
|
||||
void StartAutoDragTimer();
|
||||
void StopAutoDragTimer();
|
||||
|
||||
@ -701,101 +701,129 @@ void MxTransitionManager::FakeMosaicTransition()
|
||||
EndTransition(TRUE);
|
||||
return;
|
||||
}
|
||||
else {
|
||||
if (m_animationTimer == 0) {
|
||||
g_colorOffset = SDL_rand(32);
|
||||
|
||||
if (m_animationTimer == 0) {
|
||||
g_colorOffset = SDL_rand(32);
|
||||
for (MxS32 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;
|
||||
// Same init/shuffle steps as the dissolve transition, except that
|
||||
// we are using big blocky pixels and only need 64 columns.
|
||||
MxS32 i;
|
||||
for (i = 0; i < 64; i++) {
|
||||
m_columnOrder[i] = i;
|
||||
}
|
||||
|
||||
for (MxS32 row = 0; row < 48; row++) {
|
||||
int paletteIndex = GetColorIndexWithLocality(col, row);
|
||||
for (i = 0; i < 64; i++) {
|
||||
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;
|
||||
MxU8* dest = (MxU8*) ddsd.lpSurface + row * ddsd.lPitch + xShift * bytesPerPixel;
|
||||
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;
|
||||
|
||||
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;
|
||||
if (MVideoManager()->GetDirectDraw()->CreateSurface(&tempDesc, &g_fakeTranstionSurface, nullptr) != DD_OK) {
|
||||
return;
|
||||
}
|
||||
|
||||
DWORD fillColor = 0x00000000;
|
||||
switch (mainDesc.ddpfPixelFormat.dwRGBBitCount) {
|
||||
case 8:
|
||||
fillColor = 0x10;
|
||||
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++;
|
||||
}
|
||||
|
||||
@ -52,7 +52,7 @@ void MxDisplaySurface::ClearScreen()
|
||||
DDSURFACEDESC desc;
|
||||
|
||||
if (!m_videoParam.Flags().GetFlipSurfaces()) {
|
||||
backBuffers = 1;
|
||||
backBuffers = 2;
|
||||
}
|
||||
else {
|
||||
backBuffers = m_videoParam.GetBackBuffers() + 1;
|
||||
@ -80,6 +80,17 @@ void MxDisplaySurface::ClearScreen()
|
||||
if (m_videoParam.Flags().GetFlipSurfaces()) {
|
||||
m_ddSurface1->Flip(NULL, DDFLIP_WAIT);
|
||||
}
|
||||
else {
|
||||
DDBLTFX data;
|
||||
memset(&data, 0, sizeof(data));
|
||||
data.dwSize = sizeof(data);
|
||||
data.dwDDFX = DDBLTFX_NOTEARING;
|
||||
|
||||
if (m_ddSurface1->Blt(NULL, m_ddSurface2, NULL, DDBLT_NONE, &data) == DDERR_SURFACELOST) {
|
||||
m_ddSurface1->Restore();
|
||||
m_ddSurface1->Blt(NULL, m_ddSurface2, NULL, DDBLT_NONE, &data);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -800,9 +800,17 @@ void Direct3DRMSoftwareRenderer::Draw2DImage(
|
||||
return;
|
||||
}
|
||||
|
||||
bool isUpscaling = centeredRect.w > srcRect.w || centeredRect.h > srcRect.h;
|
||||
|
||||
SDL_Surface* surface = m_textures[textureId].cached;
|
||||
SDL_UnlockSurface(surface);
|
||||
SDL_BlitSurfaceScaled(surface, &srcRect, m_renderedImage, ¢eredRect, SDL_SCALEMODE_LINEAR);
|
||||
SDL_BlitSurfaceScaled(
|
||||
surface,
|
||||
&srcRect,
|
||||
m_renderedImage,
|
||||
¢eredRect,
|
||||
isUpscaling ? SDL_SCALEMODE_NEAREST : SDL_SCALEMODE_LINEAR
|
||||
);
|
||||
SDL_LockSurface(surface);
|
||||
}
|
||||
|
||||
|
||||
@ -12,4 +12,9 @@ set_source_files_properties(${MANIFEST_FILE} PROPERTIES
|
||||
VS_DEPLOYMENT_CONTENT 1
|
||||
)
|
||||
|
||||
target_sources(isle PRIVATE ${ASSET_FILES} ${MANIFEST_FILE})
|
||||
set(SIGNING_KEY_FILE IslePortable.pfx)
|
||||
set_source_files_properties(${SIGNING_KEY_FILE} PROPERTIES
|
||||
VS_DEPLOYMENT_CONTENT 1
|
||||
)
|
||||
|
||||
target_sources(isle PRIVATE ${ASSET_FILES} ${MANIFEST_FILE} ${SIGNING_KEY_FILE})
|
||||
|
||||
BIN
packaging/UWP/IslePortable.pfx
Normal file
BIN
packaging/UWP/IslePortable.pfx
Normal file
Binary file not shown.
@ -6,11 +6,11 @@
|
||||
xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5"
|
||||
xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4"
|
||||
IgnorableNamespaces="uap mp">
|
||||
<Identity Name="org.legoisland.Isle" Publisher="CN=Helloyunho" Version="0.1.0.0" />
|
||||
<Identity Name="org.legoisland.Isle" Publisher="CN=Isle Portable" Version="0.1.0.0" />
|
||||
<mp:PhoneIdentity PhoneProductId="077047DC-73D0-4EE7-9359-EDFF0ED96127" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
|
||||
<Properties>
|
||||
<DisplayName>LEGO® Island</DisplayName>
|
||||
<PublisherDisplayName>Helloyunho</PublisherDisplayName>
|
||||
<PublisherDisplayName>isledecomp/isle-portable</PublisherDisplayName>
|
||||
<Logo>StoreLogo.png</Logo>
|
||||
</Properties>
|
||||
<Dependencies>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user