isle-portable/LEGO1/lego/sources/misc/legoimage.cpp
foxtacles fdbe9a8705
Some checks are pending
CI / clang-format (push) Waiting to run
CI / ${{ matrix.name }} (false, --toolchain $GITHUB_WORKSPACE/CMake/i586-pc-msdosdjgpp.cmake, false, true, false, Ninja, DOS, ubuntu-latest, true) (push) Waiting to run
CI / ${{ matrix.name }} (false, --toolchain /usr/local/vitasdk/share/vita.toolchain.cmake, false, false, Ninja, Vita, ubuntu-latest, true, true) (push) Waiting to run
CI / ${{ matrix.name }} (false, -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0.26100.0, false, false, Visual Studio 18 2026, true, Xbox One, windows-latest, amd64, false, true) (push) Waiting to run
CI / ${{ matrix.name }} (false, -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/3DS.cmake, false, devkitpro/devkitarm:latest, false, Ninja, true, Nintendo 3DS, ubuntu-latest, true) (push) Waiting to run
CI / ${{ matrix.name }} (false, -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/Switch.cmake, false, devkitpro/devkita64:latest, false, Ninja, Nintendo Switch, true, ubuntu-latest, true) (push) Waiting to run
CI / ${{ matrix.name }} (false, emcmake, false, false, true, Ninja, Emscripten, ubuntu-latest, true) (push) Waiting to run
CI / ${{ matrix.name }} (false, false, false, Ninja, true, MSVC (arm64), windows-latest, amd64_arm64, false) (push) Waiting to run
CI / ${{ matrix.name }} (false, false, true, Ninja, true, MSVC (x86), windows-latest, amd64_x86, false) (push) Waiting to run
CI / ${{ matrix.name }} (false, true, false, Ninja, true, MSVC (x64), windows-latest, amd64, false) (push) Waiting to run
CI / ${{ matrix.name }} (false, true, true, false, Ninja, true, MSVC (x64 Debug), windows-latest, amd64, false) (push) Waiting to run
CI / ${{ matrix.name }} (true, false, -DCMAKE_SYSTEM_NAME=iOS, false, false, Xcode, true, iOS, macos-15, true) (push) Waiting to run
CI / ${{ matrix.name }} (true, false, false, false, Ninja, Android, ubuntu-latest, true) (push) Waiting to run
CI / ${{ matrix.name }} (true, false, true, false, Ninja, macOS, macos-latest, true) (push) Waiting to run
CI / ${{ matrix.name }} (true, true, false, Ninja, true, mingw-w64-x86_64, mingw64, msys2 mingw64, windows-latest, msys2 {0}, true) (push) Waiting to run
CI / ${{ matrix.name }} (true, true, true, false, Ninja, true, Linux (Debug), ubuntu-latest, true) (push) Waiting to run
CI / ${{ matrix.name }} (true, true, true, false, Ninja, true, Linux, ubuntu-latest, true) (push) Waiting to run
CI / FreeBSD (push) Waiting to run
CI / Flatpak (${{ matrix.arch }}) (aarch64, ubuntu-22.04-arm) (push) Waiting to run
CI / Flatpak (${{ matrix.arch }}) (x86_64, ubuntu-latest) (push) Waiting to run
CI / C++ (push) Waiting to run
CI / Release (push) Blocked by required conditions
Docker / Publish web port (push) Waiting to run
Rescale save-loaded textures to runtime texture dimensions (#805)
* Rescale save-loaded textures to runtime texture dimensions

`LegoTextureInfo::LoadBits` sized its memcpy from the destination
DirectDraw surface and assumed the source bits matched. They don't
when the save was made under a different renderer than the current
one: HW mode squares non-square assets in `LegoImage::Read` (e.g.
128x32 -> 128x128 via row duplication), SW mode keeps the original
dimensions, and `ReadNamedTexture` always loads with `p_square=0`,
so saved bits keep whatever size they had at save time. SW save
loaded under HW caused an OOB read in `LoadBits`; HW save loaded
under SW silently truncated the source and rendered a distorted
texture.

Add `LegoImage::Resize(width, height)` (nearest-neighbor, handles
both up- and down-scale) and call it in `LoadFromNamedTexture` to
match the runtime `LegoTextureInfo` surface dimensions before
binding. Save format unchanged; `LoadBits` signature unchanged.
Square textures and matching-mode loads short-circuit on the
fast-path.

* ci: bump Android SDL3 download + Xbox One generator for VS 18

- Android: SDL3's `build-release.py` started requiring `download`
  before `android` so it can fetch the new gameinput dependency.
  (build-release.py is technically internal SDL tooling; longer-term
  we may want to invoke a different SDL3 build entry point.)

- Xbox One: windows-latest now ships VS 18, so the
  `Visual Studio 17 2022` generator can no longer find a VS install.
  Bump to `Visual Studio 18 2026`.
2026-05-15 01:45:40 +00:00

216 lines
5.1 KiB
C++

#include "legoimage.h"
#include "decomp.h"
#include "legostorage.h"
#include "memory.h"
DECOMP_SIZE_ASSERT(LegoPaletteEntry, 0x03);
DECOMP_SIZE_ASSERT(LegoImage, 0x310);
// FUNCTION: LEGO1 0x100994c0
LegoPaletteEntry::LegoPaletteEntry()
{
m_color.r = 0;
m_color.g = 0;
m_color.b = 0;
m_color.a = SDL_ALPHA_OPAQUE;
}
// FUNCTION: LEGO1 0x100994d0
LegoResult LegoPaletteEntry::Read(LegoStorage* p_storage)
{
LegoResult result;
if ((result = p_storage->Read(&m_color.r, sizeof(Uint8))) != SUCCESS) {
return result;
}
if ((result = p_storage->Read(&m_color.g, sizeof(Uint8))) != SUCCESS) {
return result;
}
if ((result = p_storage->Read(&m_color.b, sizeof(Uint8))) != SUCCESS) {
return result;
}
return SUCCESS;
}
// FUNCTION: LEGO1 0x10099520
LegoResult LegoPaletteEntry::Write(LegoStorage* p_storage) const
{
LegoResult result;
if ((result = p_storage->Write(&m_color.r, sizeof(Uint8))) != SUCCESS) {
return result;
}
if ((result = p_storage->Write(&m_color.g, sizeof(Uint8))) != SUCCESS) {
return result;
}
if ((result = p_storage->Write(&m_color.b, sizeof(Uint8))) != SUCCESS) {
return result;
}
return SUCCESS;
}
// FUNCTION: LEGO1 0x10099570
LegoImage::LegoImage()
{
m_surface = NULL;
m_palette = NULL;
}
// FUNCTION: LEGO1 0x100995a0
LegoImage::LegoImage(LegoU32 p_width, LegoU32 p_height)
{
m_surface = SDL_CreateSurface(p_width, p_height, SDL_PIXELFORMAT_INDEX8);
m_palette = NULL;
}
// FUNCTION: LEGO1 0x100995f0
LegoImage::~LegoImage()
{
SDL_DestroySurface(m_surface);
SDL_DestroyPalette(m_palette);
}
// FUNCTION: LEGO1 0x10099610
LegoResult LegoImage::Read(LegoStorage* p_storage, LegoU32 p_square)
{
LegoResult result;
LegoU32 width, height, count;
if ((result = p_storage->Read(&width, sizeof(LegoU32))) != SUCCESS) {
return result;
}
if ((result = p_storage->Read(&height, sizeof(LegoU32))) != SUCCESS) {
return result;
}
if ((result = p_storage->Read(&count, sizeof(LegoU32))) != SUCCESS) {
return result;
}
if (m_palette) {
SDL_DestroyPalette(m_palette);
}
m_palette = SDL_CreatePalette(count);
for (LegoU32 i = 0; i < count; i++) {
LegoPaletteEntry paletteEntry;
if ((result = paletteEntry.Read(p_storage)) != SUCCESS) {
return result;
}
m_palette->colors[i] = paletteEntry.GetColor();
}
if (m_surface) {
SDL_DestroySurface(m_surface);
}
m_surface = SDL_CreateSurface(width, height, SDL_PIXELFORMAT_INDEX8);
if ((result = p_storage->Read(m_surface->pixels, width * height)) != SUCCESS) {
return result;
}
if (p_square && width != height) {
SDL_Surface* newSurface;
if (height < width) {
LegoU32 aspect = width / height;
newSurface = SDL_CreateSurface(width, width, SDL_PIXELFORMAT_INDEX8);
LegoU8* src = (LegoU8*) m_surface->pixels;
LegoU8* dst = (LegoU8*) newSurface->pixels;
for (LegoU32 row = 0; row < height; row++) {
if (aspect) {
for (LegoU32 dup = aspect; dup; dup--) {
memcpy(dst, src, width);
dst += width;
}
}
src += width;
}
height = width;
}
else {
LegoU32 aspect = height / width;
newSurface = SDL_CreateSurface(height, height, SDL_PIXELFORMAT_INDEX8);
LegoU8* src = (LegoU8*) m_surface->pixels;
LegoU8* dst = (LegoU8*) newSurface->pixels;
for (LegoU32 row = 0; row < height; row++) {
for (LegoU32 col = 0; col < width; col++) {
if (aspect) {
for (LegoU32 dup = aspect; dup; dup--) {
*dst = *src;
dst++;
}
}
src++;
}
}
width = height;
}
SDL_DestroySurface(m_surface);
m_surface = newSurface;
}
return SUCCESS;
}
// FUNCTION: LEGO1 0x100997e0
LegoResult LegoImage::Write(LegoStorage* p_storage)
{
LegoResult result;
if ((result = p_storage->Write(&m_surface->w, sizeof(int))) != SUCCESS) {
return result;
}
if ((result = p_storage->Write(&m_surface->h, sizeof(int))) != SUCCESS) {
return result;
}
if ((result = p_storage->Write(&m_palette->ncolors, sizeof(int))) != SUCCESS) {
return result;
}
if (m_palette) {
LegoPaletteEntry paletteEntry;
for (LegoU32 i = 0; i < m_palette->ncolors; i++) {
paletteEntry.SetColor(m_palette->colors[i]);
if ((result = paletteEntry.Write(p_storage)) != SUCCESS) {
return result;
}
}
if ((result = p_storage->Write(m_surface->pixels, m_surface->w * m_surface->h)) != SUCCESS) {
return result;
}
}
return SUCCESS;
}
LegoResult LegoImage::Resize(LegoU32 p_width, LegoU32 p_height)
{
if (m_surface == NULL) {
return FAILURE;
}
if (m_surface->w == (int) p_width && m_surface->h == (int) p_height) {
return SUCCESS;
}
SDL_Surface* newSurface = SDL_CreateSurface(p_width, p_height, SDL_PIXELFORMAT_INDEX8);
if (newSurface == NULL) {
return FAILURE;
}
LegoU32 srcW = m_surface->w;
LegoU32 srcH = m_surface->h;
const LegoU8* src = (const LegoU8*) m_surface->pixels;
LegoU8* dst = (LegoU8*) newSurface->pixels;
for (LegoU32 dy = 0; dy < p_height; dy++) {
LegoU32 sy = dy * srcH / p_height;
const LegoU8* srcRow = src + sy * srcW;
LegoU8* dstRow = dst + dy * p_width;
for (LegoU32 dx = 0; dx < p_width; dx++) {
LegoU32 sx = dx * srcW / p_width;
dstRow[dx] = srcRow[sx];
}
}
SDL_DestroySurface(m_surface);
m_surface = newSurface;
return SUCCESS;
}