From e07cfc502aeddab8554804e9f6d254466cf56adc Mon Sep 17 00:00:00 2001 From: Guido Diego Quispe Robles Date: Thu, 28 Dec 2023 09:16:44 -0300 Subject: [PATCH 1/3] Update tasks.json fixes rsync issue and prevents files from disappearing: rsync warning: some files vanished before they could be transferred (code 24) --- template/.vscode/configurations/windows-docker/tasks.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template/.vscode/configurations/windows-docker/tasks.json b/template/.vscode/configurations/windows-docker/tasks.json index 3ad0777..18e713a 100644 --- a/template/.vscode/configurations/windows-docker/tasks.json +++ b/template/.vscode/configurations/windows-docker/tasks.json @@ -18,7 +18,7 @@ { "type": "shell", "label": "1. Copy source code to docker volume", - "command": "docker exec -t tyra-game-compiler sh -c 'rsync -ac --delete --exclude \".git\" --exclude \".vscode\" --exclude \"*obj*/**\" --exclude \"*bin*/**\" /host/ /src/'" + "command": "docker exec -t tyra-game-compiler sh -c 'rsync -ac --delete --exclude=\".git\" --exclude=\".vscode\" --exclude=\"*obj*/**\" --exclude=\"*bin*/**\" /host/ /src/'" }, { "type": "shell", @@ -34,7 +34,7 @@ { "type": "shell", "label": "3. Copy binaries to host", - "command": "docker exec -t tyra-game-compiler sh -c 'rsync -zac --include=\"*/\" --include=\"*bin*/**\" --exclude=\"*\" /src/ /host/'", + "command": "docker exec -t tyra-game-compiler sh -c 'rsync -zac --include=\"*/\" --include=\"*bin*/**\" --exclude=\"*\" /src/ /host/'" }, { "type": "shell", From aa21baaaf20d744f444d5ecd32d02c5eca1d0063 Mon Sep 17 00:00:00 2001 From: Guido Diego Quispe Robles Date: Thu, 4 Jan 2024 22:11:10 -0300 Subject: [PATCH 2/3] change core width and clut width --- .../src/renderer/core/paths/path3/path3.cpp | 22 +++++++++---------- .../texture/renderer_core_texture_sender.cpp | 8 +++++-- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/engine/src/renderer/core/paths/path3/path3.cpp b/engine/src/renderer/core/paths/path3/path3.cpp index 42c956a..83431a3 100644 --- a/engine/src/renderer/core/paths/path3/path3.cpp +++ b/engine/src/renderer/core/paths/path3/path3.cpp @@ -65,20 +65,20 @@ void Path3::sendTexture(const Texture* texture, const RendererCoreTextureBuffers& texBuffers) { packet2_reset(texturePacket, false); - int coreWidth = texBuffers.core->width <= 64 ? 64 : texBuffers.core->width; - packet2_update(texturePacket, - draw_texture_transfer(texturePacket->base, texture->core->data, - texture->getWidth(), - texture->getHeight(), texture->core->psm, - texBuffers.core->address, coreWidth)); + packet2_update( + texturePacket, + draw_texture_transfer(texturePacket->base, texture->core->data, + texture->getWidth(), texture->getHeight(), + texture->core->psm, texBuffers.core->address, + texBuffers.core->width)); if (texBuffers.clut != nullptr) { auto* clut = texture->clut; - int clutWidth = texBuffers.clut->width <= 64 ? 64 : texBuffers.clut->width; - packet2_update(texturePacket, - draw_texture_transfer(texturePacket->next, clut->data, - clut->width, clut->height, clut->psm, - texBuffers.clut->address, clutWidth)); + packet2_update( + texturePacket, + draw_texture_transfer(texturePacket->next, clut->data, clut->width, + clut->height, clut->psm, texBuffers.clut->address, + texBuffers.clut->width)); } packet2_chain_open_cnt(texturePacket, 0, 0, 0); diff --git a/engine/src/renderer/core/texture/renderer_core_texture_sender.cpp b/engine/src/renderer/core/texture/renderer_core_texture_sender.cpp index 56c90e5..8e94476 100644 --- a/engine/src/renderer/core/texture/renderer_core_texture_sender.cpp +++ b/engine/src/renderer/core/texture/renderer_core_texture_sender.cpp @@ -58,7 +58,9 @@ texbuffer_t* RendererCoreTextureSender::allocateTextureCore( auto* result = new texbuffer_t; const auto* core = t_texture->core; - result->width = t_texture->getWidth(); + int coreWidth = core->width <= 64 ? 64 : core->width; + + result->width = coreWidth; result->psm = core->psm; result->info.components = core->components; @@ -77,7 +79,9 @@ texbuffer_t* RendererCoreTextureSender::allocateTextureClut( auto* result = new texbuffer_t; const auto* clut = t_texture->clut; - result->width = clut->width; + int clutWidth = clut->width <= 64 ? 64 : clut->width; + + result->width = clutWidth; result->psm = clut->psm; result->info.components = clut->components; From 586180764e28c33caefd449dd8e07e6ee1cfe877 Mon Sep 17 00:00:00 2001 From: Guido Diego Quispe Robles Date: Thu, 25 Jan 2024 01:33:15 -0300 Subject: [PATCH 3/3] Update png_loader.cpp optimization --- engine/src/loaders/texture/png_loader.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/engine/src/loaders/texture/png_loader.cpp b/engine/src/loaders/texture/png_loader.cpp index b1b2e6a..54b61f0 100644 --- a/engine/src/loaders/texture/png_loader.cpp +++ b/engine/src/loaders/texture/png_loader.cpp @@ -211,10 +211,6 @@ void PngLoader::handle8bppPalletized(TextureBuilderData* result, auto* pixel = static_cast(result->data); struct PngClut* clut = (struct PngClut*)result->clut; - for (int i = numPallete; i < 256; i++) { - memset(&clut[i], 0, sizeof(clut[i])); - } - for (int i = 0; i < numPallete; i++) { clut[i].r = palette[i].red; clut[i].g = palette[i].green; @@ -273,10 +269,6 @@ void PngLoader::handle4bppPalletized(TextureBuilderData* result, auto* pixel = static_cast(result->data); struct PngClut* clut = (struct PngClut*)result->clut; - for (int i = numPallete; i < 16; i++) { - memset(&clut[i], 0, sizeof(clut[i])); - } - for (int i = 0; i < numPallete; i++) { clut[i].r = palette[i].red; clut[i].g = palette[i].green;