From f2018334cb97c7b9a8187eb4e155dbda97b0b1cb Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sat, 22 Aug 2026 17:39:01 +0300 Subject: [PATCH 1/4] fix Texture::reload --- src/graphics/core/Texture.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/graphics/core/Texture.cpp b/src/graphics/core/Texture.cpp index 5f326d20c..65afd4342 100644 --- a/src/graphics/core/Texture.cpp +++ b/src/graphics/core/Texture.cpp @@ -46,7 +46,7 @@ void Texture::resize(uint width, uint height) { } void Texture::reload(const ImageData& image) { - reload(image.getData(), width, height); + reload(image.getData(), image.getWidth(), image.getHeight()); } void Texture::reload(const ubyte* data, uint width, uint height) { From 78e27c812a87c8ee2cec1d6605049b9f8535ef2d Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sat, 22 Aug 2026 19:25:49 +0300 Subject: [PATCH 2/4] fix side collision --- src/physics/PhysicsSolver.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/physics/PhysicsSolver.cpp b/src/physics/PhysicsSolver.cpp index 7ecc07f05..a3a190f82 100644 --- a/src/physics/PhysicsSolver.cpp +++ b/src/physics/PhysicsSolver.cpp @@ -122,7 +122,7 @@ static void calc_collision( auto aabb = AABB(pos - half, pos + half); glm::vec3 scale(1.0f); - scale[nz] = 1.0f - E * 8.0f; + scale[nz] = 1.0f - E * 2.0f; aabb.scale(scale); aabb = aabb + offset; aabb.b.y -= stepHeight + E * 2; From fbe992755e70a3b4d321dc7d17981aec512bf0c1 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sat, 22 Aug 2026 21:11:23 +0300 Subject: [PATCH 3/4] fix WorldConverter::createBlockFieldsConvertTasks --- src/world/files/WorldConverter.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/world/files/WorldConverter.cpp b/src/world/files/WorldConverter.cpp index 2f7716d3f..72634076b 100644 --- a/src/world/files/WorldConverter.cpp +++ b/src/world/files/WorldConverter.cpp @@ -109,7 +109,7 @@ void WorldConverter::createBlockFieldsConvertTasks() { REGION_LAYER_BLOCKS_DATA, ConvertTaskType::CONVERT_BLOCKS_DATA ); - break; + return; default: break; } @@ -189,7 +189,7 @@ void WorldConverter::upgradeRegion( } void WorldConverter::convertVoxels(const io::path& file, int x, int z) const { - logger.info() << "converting voxels region " << x << "_" << z; + logger.info() << "converting voxels in region " << x << "_" << z; wfile->getRegions().processRegion(x, z, REGION_LAYER_VOXELS, [=](std::unique_ptr data, uint32_t*) { Chunk::convert(data.get(), report.get()); @@ -212,7 +212,7 @@ void WorldConverter::convertPlayer(const io::path& file) const { } void WorldConverter::convertBlocksData(int x, int z, const ContentReport& report) const { - logger.info() << "converting blocks data"; + logger.info() << "converting blocks data in region " << x << ", " << z; wfile->getRegions().processBlocksData(x, z, [=](BlocksMetadata* heap, std::unique_ptr voxelsData) { Chunk chunk(0, 0); From 2972b0ee8517f066ec50e65136247c6e57089bd8 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sat, 22 Aug 2026 21:15:41 +0300 Subject: [PATCH 4/4] cleanup --- src/world/files/WorldConverter.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/world/files/WorldConverter.cpp b/src/world/files/WorldConverter.cpp index 72634076b..73a525d87 100644 --- a/src/world/files/WorldConverter.cpp +++ b/src/world/files/WorldConverter.cpp @@ -198,7 +198,7 @@ void WorldConverter::convertVoxels(const io::path& file, int x, int z) const { } void WorldConverter::convertInventories(const io::path& file, int x, int z) const { - logger.info() << "converting inventories region " << x << "_" << z; + logger.info() << "converting inventories in region " << x << "_" << z; wfile->getRegions().processInventories(x, z, [=](Inventory* inventory) { inventory->convert(report.get()); }); @@ -212,7 +212,7 @@ void WorldConverter::convertPlayer(const io::path& file) const { } void WorldConverter::convertBlocksData(int x, int z, const ContentReport& report) const { - logger.info() << "converting blocks data in region " << x << ", " << z; + logger.info() << "converting blocks data in region " << x << "_" << z; wfile->getRegions().processBlocksData(x, z, [=](BlocksMetadata* heap, std::unique_ptr voxelsData) { Chunk chunk(0, 0);