Minor fixes

Author: SirLynix

include/CommonLib/BlockIndex.hpp

@@ -7,8 +7,8 @@
 #ifndef TSOM_COMMONLIB_BLOCKINDEX_HPP
 #define TSOM_COMMONLIB_BLOCKINDEX_HPP
 
-#include <NazaraUtils/Prerequisites.hpp>
 #include <NazaraUtils/Constants.hpp>
+#include <NazaraUtils/Prerequisites.hpp>
 
 namespace tsom
 {

include/CommonLib/BlockIndex.inl

@@ -1,4 +1,4 @@
-// Copyright (C) 2025 Jérôme "SirLynix" Leclercq (lynix680@gmail.com)
+// Copyright (C) 2026 Jérôme "SirLynix" Leclercq (lynix680@gmail.com)
 // This file is part of the "This Space Of Mine" project
 // For conditions of distribution and use, see copyright notice in LICENSE
 

include/CommonLib/Direction.inl

@@ -24,9 +24,9 @@ namespace tsom
 
 	constexpr NeighborChunk ToNeighborChunk(const Nz::Vector3i32& chunkIndices)
 	{
-		NazaraAssert(chunkIndices.x >= -1 && chunkIndices.x <= -1);
-		NazaraAssert(chunkIndices.y >= -1 && chunkIndices.y <= -1);
-		NazaraAssert(chunkIndices.z >= -1 && chunkIndices.z <= -1);
+		NazaraAssert(chunkIndices.x >= -1 && chunkIndices.x <= 1);
+		NazaraAssert(chunkIndices.y >= -1 && chunkIndices.y <= 1);
+		NazaraAssert(chunkIndices.z >= -1 && chunkIndices.z <= 1);
 
 		return static_cast<NeighborChunk>((chunkIndices.x + 1) * 9 + (chunkIndices.y + 1) * 3 + (chunkIndices.z + 1));
 	}

include/CommonLib/SurfaceNetsChunk.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2025 Jérôme "SirLynix" Leclercq (lynix680@gmail.com)
+// Copyright (C) 2026 Jérôme "SirLynix" Leclercq (lynix680@gmail.com)
 // This file is part of the "This Space Of Mine" project
 // For conditions of distribution and use, see copyright notice in LICENSE
 

include/CommonLib/SurfaceNetsChunk.inl

@@ -1,4 +1,4 @@
-// Copyright (C) 2025 Jérôme "SirLynix" Leclercq (lynix680@gmail.com)
+// Copyright (C) 2026 Jérôme "SirLynix" Leclercq (lynix680@gmail.com)
 // This file is part of the "This Space Of Mine" project
 // For conditions of distribution and use, see copyright notice in LICENSE
 

src/CommonLib/ChunkEntities.cpp

@@ -138,12 +138,14 @@ namespace tsom
 					DestroyChunkEntity(chunkIndices);
 			}
 			m_createdDestroyedChunks.clear();
-		}
 
-		for (auto&& [chunkIndices, neighborMask] : m_invalidatedChunks)
-			UpdateChunkEntity(chunkIndices, neighborMask);
+			std::lock_guard lock2(m_invalidatedChunkMutex);
+
+			for (auto&& [chunkIndices, neighborMask] : m_invalidatedChunks)
+				UpdateChunkEntity(chunkIndices, neighborMask);
 
-		m_invalidatedChunks.clear();
+			m_invalidatedChunks.clear();
+		}
 	}
 
 	void ChunkEntities::CreateChunkEntity(const ChunkIndices& chunkIndices)

src/CommonLib/SurfaceNetsChunk.cpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2025 Jérôme "SirLynix" Leclercq (lynix680@gmail.com)
+// Copyright (C) 2026 Jérôme "SirLynix" Leclercq (lynix680@gmail.com)
 // This file is part of the "This Space Of Mine" project
 // For conditions of distribution and use, see copyright notice in LICENSE
 
@@ -12,9 +12,9 @@
 #include <NazaraUtils/Bitset.hpp>
 #include <NazaraUtils/CallOnExit.hpp>
 #include <NazaraUtils/FixedVector.hpp>
+#include <spdlog/spdlog.h>
 #include <map>
 #include <numeric>
-#include <spdlog/spdlog.h>
 
 // Thanks a lot to:
 // https://github.com/Q-Minh/naive-surface-nets
@@ -362,6 +362,9 @@ namespace tsom
 		MultiChunkReadLock chunkLock;
 		for (const ChunkIndices& dir : s_neighborChunkOffset)
 		{
+			if (dir.x == 0 && dir.y == 0 && dir.z == 0)
+				continue; //< Our own chunk is already locked
+
 			const Chunk* chunk = m_owner.GetChunk(m_indices + dir);
 
 			neighborChunks[ToNeighborChunk(dir)] = chunk;

src/Game/States/PlanetEditorState.cpp

@@ -33,9 +33,9 @@
 #include <Nazara/Graphics/PropertyHandler/UniformValuePropertyHandler.hpp>
 #include <Nazara/Platform/Window.hpp>
 #include <Nazara/Renderer/Plugins/ImGuiPlugin.hpp>
-#include <numeric>
 #include <imgui.h>
 #include <misc/cpp/imgui_stdlib.h>
+#include <numeric>
 
 namespace tsom
 {