Add experimental surface nets normal smoothing

SirLynix · SirLynix · commit e4c4d016e5c1 · 2026-02-24T13:11:25.000+01:00
diff --git a/gameconfig.lua.default b/gameconfig.lua.default
@@ -14,3 +14,6 @@ Player = {
 Server = {
 	Port = 29536,
 }
+Visual = {
+	ChunkNormalSmoothAngle = 0.0
+}
diff --git a/include/ClientLib/ClientChunkEntities.hpp b/include/ClientLib/ClientChunkEntities.hpp
@@ -32,10 +32,12 @@ namespace tsom
 		Nz::Vector3f tangent;
 	};
 
+	class ConfigFile;
+
 	class TSOM_CLIENTLIB_API ClientChunkEntities final : public ChunkEntities
 	{
 		public:
-			ClientChunkEntities(Nz::ApplicationBase& app, Nz::EnttWorld& world, ChunkContainer& chunkContainer, const ClientBlockLibrary& blockLibrary, std::size_t layerIndex);
+			ClientChunkEntities(Nz::ApplicationBase& app, ConfigFile& config, Nz::EnttWorld& world, ChunkContainer& chunkContainer, const ClientBlockLibrary& blockLibrary, std::size_t layerIndex);
 			ClientChunkEntities(const ClientChunkEntities&) = delete;
 			ClientChunkEntities(ClientChunkEntities&&) = delete;
 			~ClientChunkEntities() = default;
@@ -58,6 +60,8 @@ namespace tsom
 
 			std::shared_ptr<Nz::MaterialInstance> m_chunkMaterial;
 			std::shared_ptr<Nz::VertexDeclaration> m_chunkVertexDeclaration;
+			Nz::Signal<double>::ConnectionGuard m_onVisualChunkNormalSmoothAngleUpdatedSlot;
+			ConfigFile& m_configFile;
 			bool m_isCollisionGenerationEnabled;
 	};
 }
diff --git a/include/ClientLib/ClientChunkEntities.inl b/include/ClientLib/ClientChunkEntities.inl
@@ -7,5 +7,6 @@ namespace tsom
 	inline void ClientChunkEntities::EnableCollisionGeneration(bool enable)
 	{
 		m_isCollisionGenerationEnabled = enable;
+		RebuildAllChunks();
 	}
 }
diff --git a/include/ClientLib/ClientConfigs.hpp b/include/ClientLib/ClientConfigs.hpp
@@ -0,0 +1,17 @@
+// 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
+
+#pragma once
+
+#ifndef TSOM_CLIENTLIB_CLIENTCONFIGS_HPP
+#define TSOM_CLIENTLIB_CLIENTCONFIGS_HPP
+
+#include <CommonLib/ConfigFile.hpp>
+
+namespace tsom::Config
+{
+	static constexpr auto Visual_ChunkNormalSmoothAngle = ConfigFile::FloatOptionName{ "Visual.ChunkNormalSmoothAngle" };
+}
+
+#endif // TSOM_CLIENTLIB_CLIENTCONFIGS_HPP
diff --git a/include/ClientLib/ClientSessionHandler.hpp b/include/ClientLib/ClientSessionHandler.hpp
@@ -31,6 +31,7 @@ namespace Nz
 namespace tsom
 {
 	class ClientBlockLibrary;
+	class ConfigFile;
 	class GravityController;
 	struct PlayerAnimationAssets;
 
@@ -39,7 +40,7 @@ namespace tsom
 		public:
 			struct PlayerInfo;
 
-			ClientSessionHandler(NetworkSession* session, Nz::ApplicationBase& app, Nz::EnttWorld& world, ClientBlockLibrary& blockLibrary);
+			ClientSessionHandler(NetworkSession* session, Nz::ApplicationBase& app, ConfigFile& config, Nz::EnttWorld& world, ClientBlockLibrary& blockLibrary);
 			~ClientSessionHandler();
 
 			inline entt::handle GetControlledEntity() const;
@@ -142,6 +143,7 @@ namespace tsom
 			Nz::ApplicationBase& m_app;
 			Nz::EnttWorld& m_world;
 			ClientBlockLibrary& m_blockLibrary;
+			ConfigFile& m_config;
 			Nz::UInt16 m_lastTickIndex;
 			Nz::UInt16 m_ownPlayerIndex;
 			ScriptingContext m_scriptingContext;
diff --git a/include/ClientLib/Entities/ClientChunkClassLibrary.hpp b/include/ClientLib/Entities/ClientChunkClassLibrary.hpp
@@ -13,16 +13,19 @@
 namespace tsom
 {
 	class ClientBlockLibrary;
+	class ConfigFile;
 
 	class TSOM_CLIENTLIB_API ClientChunkClassLibrary final : public ChunkClassLibrary
 	{
 		public:
-			ClientChunkClassLibrary(Nz::ApplicationBase& app, const ClientBlockLibrary& blockLibrary);
+			ClientChunkClassLibrary(Nz::ApplicationBase& app, ConfigFile& config, const ClientBlockLibrary& blockLibrary);
 
 		private:
 			void InitializePlanetEntity(entt::handle entity) override;
 			void InitializeShipEntity(entt::handle entity) override;
 			std::unique_ptr<ChunkEntities> SetupChunkEntities(Nz::EnttWorld& world, ChunkContainer& chunkContainer, std::size_t layerIndex) override;
+
+			ConfigFile& m_config;
 	};
 }
 
diff --git a/include/ClientLib/Scripting/ClientScriptingLibrary.hpp b/include/ClientLib/Scripting/ClientScriptingLibrary.hpp
@@ -18,11 +18,12 @@ namespace Nz
 namespace tsom
 {
 	class ClientSessionHandler;
+	class ConfigFile;
 
 	class TSOM_CLIENTLIB_API ClientScriptingLibrary final : public ScriptingLibrary
 	{
 		public:
-			inline ClientScriptingLibrary(Nz::ApplicationBase& app, ClientSessionHandler& sessionHandler);
+			inline ClientScriptingLibrary(Nz::ApplicationBase& app, ConfigFile& configFile, ClientSessionHandler& sessionHandler);
 			ClientScriptingLibrary(const ClientScriptingLibrary&) = delete;
 			ClientScriptingLibrary(ClientScriptingLibrary&&) = delete;
 			~ClientScriptingLibrary() = default;
@@ -34,10 +35,12 @@ namespace tsom
 
 		private:
 			void RegisterClientSession(sol::state& state);
+			void RegisterConfig(sol::state& state);
 			void RegisterScripts(sol::state& state);
 
 			Nz::ApplicationBase& m_app;
 			ClientSessionHandler& m_sessionHandler;
+			ConfigFile& m_config;
 	};
 }
 
diff --git a/include/ClientLib/Scripting/ClientScriptingLibrary.inl b/include/ClientLib/Scripting/ClientScriptingLibrary.inl
@@ -4,9 +4,10 @@
 
 namespace tsom
 {
-	inline ClientScriptingLibrary::ClientScriptingLibrary(Nz::ApplicationBase& app, ClientSessionHandler& sessionHandler) :
+	inline ClientScriptingLibrary::ClientScriptingLibrary(Nz::ApplicationBase& app, ConfigFile& configFile, ClientSessionHandler& sessionHandler) :
 	m_app(app),
-	m_sessionHandler(sessionHandler)
+	m_sessionHandler(sessionHandler),
+	m_config(configFile)
 	{
 	}
 }
diff --git a/include/CommonLib/ChunkEntities.hpp b/include/CommonLib/ChunkEntities.hpp
@@ -56,6 +56,7 @@ namespace tsom
 			void FillChunks();
 			virtual UpdateJob* ProcessChunkUpdate(const Chunk& chunk, DirectionMask neighborMask);
 			void OnParentNodeInvalidated(const Nz::Node* node);
+			void RebuildAllChunks();
 			inline void UpdateChunkEntity(const ChunkIndices& chunkIndices, DirectionMask neighborMask);
 
 			struct UpdateJob
diff --git a/src/ClientLib/ClientChunkEntities.cpp b/src/ClientLib/ClientChunkEntities.cpp
@@ -3,16 +3,19 @@
 // For conditions of distribution and use, see copyright notice in LICENSE
 
 #include <ClientLib/ClientChunkEntities.hpp>
+#include <ClientLib/ClientConfigs.hpp>
 #include <ClientLib/RenderConstants.hpp>
 #include <ClientLib/Components/VisualEntityComponent.hpp>
 #include <CommonLib/ChunkLock.hpp>
+#include <CommonLib/ConfigFile.hpp>
 #include <CommonLib/Components/EntityOwnerComponent.hpp>
 #include <Nazara/Core/ApplicationBase.hpp>
 #include <Nazara/Core/EnttWorld.hpp>
 #include <Nazara/Core/FilesystemAppComponent.hpp>
 #include <Nazara/Core/IndexBuffer.hpp>
 #include <Nazara/Core/TaskSchedulerAppComponent.hpp>
 #include <Nazara/Core/VertexBuffer.hpp>
+#include <Nazara/Core/VertexMapper.hpp>
 #include <Nazara/Core/Components/NodeComponent.hpp>
 #include <Nazara/Graphics/GraphicalMesh.hpp>
 #include <Nazara/Graphics/Graphics.hpp>
@@ -26,8 +29,9 @@
 
 namespace tsom
 {
-	ClientChunkEntities::ClientChunkEntities(Nz::ApplicationBase& app, Nz::EnttWorld& world, ChunkContainer& chunkContainer, const ClientBlockLibrary& blockLibrary, std::size_t layerIndex) :
+	ClientChunkEntities::ClientChunkEntities(Nz::ApplicationBase& app, ConfigFile& config, Nz::EnttWorld& world, ChunkContainer& chunkContainer, const ClientBlockLibrary& blockLibrary, std::size_t layerIndex) :
 	ChunkEntities(app, world, chunkContainer, blockLibrary, layerIndex, NoInit{}),
+	m_configFile(config),
 	m_isCollisionGenerationEnabled(true)
 	{
 		auto& filesystem = app.GetComponent<Nz::FilesystemAppComponent>();
@@ -145,6 +149,11 @@ namespace tsom
 			}
 		});
 
+		m_onVisualChunkNormalSmoothAngleUpdatedSlot.Connect(m_configFile.GetFloatUpdateSignal(Config::Visual_ChunkNormalSmoothAngle), [this](double /*newValue*/)
+		{
+			RebuildAllChunks();
+		});
+
 		FillChunks();
 	}
 
@@ -177,6 +186,47 @@ namespace tsom
 		std::shared_ptr<Nz::StaticMesh> staticMesh = std::make_shared<Nz::StaticMesh>(std::move(vertexBuffer), std::move(indexBuffer));
 		staticMesh->GenerateAABB();
 
+		Nz::DegreeAnglef smoothLimitAngle = m_configFile.GetFloatValue<float>(Config::Visual_ChunkNormalSmoothAngle);
+		if (smoothLimitAngle > 0.0f)
+		{
+			Nz::VertexMapper mapper(*staticMesh);
+			Nz::UInt32 vertexCount = mapper.GetVertexCount();
+
+			Nz::SparsePtr<Nz::Vector3f> normals = mapper.GetComponentPtr<Nz::Vector3f>(Nz::VertexComponent::Normal);
+			Nz::SparsePtr<Nz::Vector3f> positions = mapper.GetComponentPtr<Nz::Vector3f>(Nz::VertexComponent::Position);
+
+			// TODO: Replace by a vertex finder-like
+			std::map<Nz::Vector3i, Nz::HybridVector<Nz::UInt32, 6>> posToVerts;
+			for (Nz::UInt32 i = 0; i < vertexCount; ++i)
+			{
+				Nz::Vector3i p = Nz::Vector3i(Nz::Vector3f::Apply(positions[i] * 100.f, std::roundf));
+				posToVerts[p].push_back(i);
+			}
+
+			float fLimit = smoothLimitAngle.GetCos();
+			for (Nz::UInt32 i = 0; i < vertexCount; ++i)
+			{
+				Nz::Vector3i p = Nz::Vector3i(Nz::Vector3f::Apply(positions[i] * 100.f, std::roundf));
+
+				Nz::Vector3f vr = normals[i];
+
+				auto& verticesFound = posToVerts[p];
+				Nz::Vector3f pcNor;
+				for (Nz::UInt32 j : verticesFound)
+				{
+					Nz::Vector3f v = normals[j];
+
+					// Check whether the angle between the two normals is not too large.
+					// Skip the angle check on our own normal to avoid false negatives
+					// (v*v is not guaranteed to be 1.0 for all unit vectors v)
+					if ((j == i || (Nz::Vector3f::DotProduct(v, vr) >= fLimit)))
+						pcNor += v;
+				}
+
+				normals[i] = pcNor.Normalize();
+			}
+		}
+
 		std::shared_ptr<Nz::Mesh> chunkMesh = std::make_shared<Nz::Mesh>();
 		chunkMesh->CreateStatic();
 		chunkMesh->AddSubMesh(std::move(staticMesh));
diff --git a/src/ClientLib/ClientSessionHandler.cpp b/src/ClientLib/ClientSessionHandler.cpp
@@ -65,11 +65,12 @@ namespace tsom
 		{ PacketIndex<Packets::C_UpdatePlayerInputs>, { .channel = 1, .flags = Nz::ENetPacketFlag_Unreliable } }
 	});
 
-	ClientSessionHandler::ClientSessionHandler(NetworkSession* session, Nz::ApplicationBase& app, Nz::EnttWorld& world, ClientBlockLibrary& blockLibrary) :
+	ClientSessionHandler::ClientSessionHandler(NetworkSession* session, Nz::ApplicationBase& app, ConfigFile& config, Nz::EnttWorld& world, ClientBlockLibrary& blockLibrary) :
 	SessionHandler(session),
 	m_app(app),
 	m_world(world),
 	m_blockLibrary(blockLibrary),
+	m_config(config),
 	m_ownPlayerIndex(InvalidPlayerIndex),
 	m_scriptingContext(app),
 	m_lastInputIndex(0)
@@ -81,11 +82,11 @@ namespace tsom
 		m_scriptingContext.RegisterLibrary<ClientAssetScriptingLibrary>(m_app);
 		m_scriptingContext.LoadDirectory("scripts/assets");
 
-		m_entityRegistry.RegisterClassLibrary<ClientChunkClassLibrary>(m_app, m_blockLibrary);
+		m_entityRegistry.RegisterClassLibrary<ClientChunkClassLibrary>(m_app, config, m_blockLibrary);
 		m_entityRegistry.RegisterClassLibrary<ClientEntityClassLibrary>(m_app);
 
 		m_scriptingContext.RegisterLibrary<ClientEntityScriptingLibrary>(m_entityRegistry);
-		m_scriptingContext.RegisterLibrary<ClientScriptingLibrary>(m_app, *this);
+		m_scriptingContext.RegisterLibrary<ClientScriptingLibrary>(m_app, config, *this);
 
 		LoadScripts();
 	}
diff --git a/src/ClientLib/Entities/ClientChunkClassLibrary.cpp b/src/ClientLib/Entities/ClientChunkClassLibrary.cpp
@@ -13,8 +13,9 @@
 
 namespace tsom
 {
-	ClientChunkClassLibrary::ClientChunkClassLibrary(Nz::ApplicationBase& app, const ClientBlockLibrary& blockLibrary) :
-	ChunkClassLibrary(app, blockLibrary)
+	ClientChunkClassLibrary::ClientChunkClassLibrary(Nz::ApplicationBase& app, ConfigFile& config, const ClientBlockLibrary& blockLibrary) :
+	ChunkClassLibrary(app, blockLibrary),
+	m_config(config)
 	{
 	}
 
@@ -36,6 +37,6 @@ namespace tsom
 
 	std::unique_ptr<ChunkEntities> ClientChunkClassLibrary::SetupChunkEntities(Nz::EnttWorld& world, ChunkContainer& chunkContainer, std::size_t layerIndex)
 	{
-		return std::make_unique<ClientChunkEntities>(m_app, world, chunkContainer, Nz::SafeCast<const ClientBlockLibrary&>(m_blockLibrary), layerIndex);
+		return std::make_unique<ClientChunkEntities>(m_app, m_config, world, chunkContainer, Nz::SafeCast<const ClientBlockLibrary&>(m_blockLibrary), layerIndex);
 	}
 }
diff --git a/src/ClientLib/Scripting/ClientScriptingLibrary.cpp b/src/ClientLib/Scripting/ClientScriptingLibrary.cpp
@@ -5,6 +5,7 @@
 #include <ClientLib/Scripting/ClientScriptingLibrary.hpp>
 #include <ClientLib/ClientAssetLibraryAppComponent.hpp>
 #include <ClientLib/ClientSessionHandler.hpp>
+#include <CommonLib/ConfigFile.hpp>
 #include <CommonLib/Scripting/ScriptingUtils.hpp>
 #include <Nazara/Graphics/Model.hpp>
 #include <sol/state.hpp>
@@ -31,6 +32,7 @@ namespace tsom
 		state["SERVER"] = false;
 
 		RegisterClientSession(state);
+		RegisterConfig(state);
 		RegisterScripts(state);
 	}
 
@@ -40,6 +42,50 @@ namespace tsom
 
 	}
 
+	void ClientScriptingLibrary::RegisterConfig(sol::state& state)
+	{
+		sol::table configLibrary = state.create_named_table("Config");
+		configLibrary["GetBool"] = LuaFunction([this](std::string_view configName)
+		{
+			return m_config.GetBoolValue(ConfigFile::BoolOptionName{ configName });
+		});
+
+		configLibrary["GetFloat"] = LuaFunction([this](std::string_view configName)
+		{
+			return m_config.GetFloatValue<lua_Number>(ConfigFile::FloatOptionName{ configName });
+		});
+
+		configLibrary["GetInteger"] = LuaFunction([this](std::string_view configName)
+		{
+			return m_config.GetIntegerValue<lua_Integer>(ConfigFile::IntegerOptionName{ configName });
+		});
+
+		configLibrary["GetString"] = LuaFunction([this](std::string_view configName)
+		{
+			return m_config.GetStringValue(ConfigFile::StringOptionName{ configName });
+		});
+
+		configLibrary["SetBool"] = LuaFunction([this](std::string_view configName, bool value)
+		{
+			return m_config.SetBoolValue(ConfigFile::BoolOptionName{ configName }, value);
+		});
+
+		configLibrary["SetFloat"] = LuaFunction([this](std::string_view configName, double value)
+		{
+			return m_config.SetFloatValue(ConfigFile::FloatOptionName{ configName }, value);
+		});
+
+		configLibrary["SetInteger"] = LuaFunction([this](std::string_view configName, long long value)
+		{
+			return m_config.SetIntegerValue(ConfigFile::IntegerOptionName{ configName }, value);
+		});
+
+		configLibrary["SetString"] = LuaFunction([this](std::string_view configName, std::string value)
+		{
+			return m_config.SetStringValue(ConfigFile::StringOptionName{ configName }, std::move(value));
+		});
+	}
+
 	void ClientScriptingLibrary::RegisterScripts(sol::state& state)
 	{
 		sol::table scriptsLibrary = state.create_named_table("Scripts");
diff --git a/src/CommonLib/ChunkEntities.cpp b/src/CommonLib/ChunkEntities.cpp
@@ -287,4 +287,20 @@ namespace tsom
 			rigidBody.TeleportTo(chunkNode.GetGlobalPosition(), chunkNode.GetGlobalRotation());
 		}
 	}
+
+	void ChunkEntities::RebuildAllChunks()
+	{
+		for (auto it = m_updateJobs.begin(); it != m_updateJobs.end(); ++it)
+		{
+			it->second->cancelled = true;
+		}
+		m_updateJobs.clear();
+
+		std::lock_guard lock(m_invalidatedChunkMutex);
+		for (const auto& [chunkIndices, entity] : m_chunkEntities)
+		{
+			NazaraUnused(entity);
+			m_invalidatedChunks[chunkIndices] = 0;
+		}
+	}
 }
diff --git a/src/Game/GameAppComponent.cpp b/src/Game/GameAppComponent.cpp
@@ -18,6 +18,7 @@
 #include <CommonLib/Physics/PhysicsSettings.hpp>
 #include <CommonLib/Systems/PlanetSystem.hpp>
 #include <CommonLib/Systems/ShipSystem.hpp>
+#include <Game/GameConfigAppComponent.hpp>
 #include <Game/States/BackgroundState.hpp>
 #include <Game/States/ConnectionState.hpp>
 #include <Game/States/DebugInfoState.hpp>
@@ -92,10 +93,13 @@ namespace tsom
 			SetupCanvas(world, window);
 			SetupCamera(renderWindow, world);
 
+			auto& gameConfig = GetApp().GetComponent<GameConfigAppComponent>();
+
 			std::shared_ptr<tsom::StateData> stateData = std::make_shared<tsom::StateData>();
 			stateData->app = &GetApp();
 			stateData->blockLibrary = &m_blockLibrary.value();
 			stateData->canvas = &m_canvas.value();
+			stateData->config = &gameConfig.GetConfig();
 			stateData->renderTarget = std::move(renderWindow);
 			stateData->window = &window;
 			stateData->swapchain = &swapchain;
diff --git a/src/Game/GameConfigAppComponent.cpp b/src/Game/GameConfigAppComponent.cpp
diff --git a/src/Game/States/ConnectionState.cpp b/src/Game/States/ConnectionState.cpp
diff --git a/src/Game/States/PlanetEditorState.cpp b/src/Game/States/PlanetEditorState.cpp
diff --git a/src/Game/States/StateData.hpp b/src/Game/States/StateData.hpp

Original file line number	Diff line number	Diff line change
`@@ -14,3 +14,6 @@ Player = {`
`14`	`14`	`Server = {`
`15`	`15`	`Port = 29536,`
`16`	`16`	`}`
	`17`	`+Visual = {`
	`18`	`+ ChunkNormalSmoothAngle = 0.0`
	`19`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,6 @@ namespace tsom`
`7`	`7`	`inline void ClientChunkEntities::EnableCollisionGeneration(bool enable)`
`8`	`8`	`{`
`9`	`9`	`m_isCollisionGenerationEnabled = enable;`
	`10`	`+ RebuildAllChunks();`
`10`	`11`	`}`
`11`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,16 +13,19 @@`
`13`	`13`	`namespace tsom`
`14`	`14`	`{`
`15`	`15`	`class ClientBlockLibrary;`
	`16`	`+ class ConfigFile;`
`16`	`17`
`17`	`18`	`class TSOM_CLIENTLIB_API ClientChunkClassLibrary final : public ChunkClassLibrary`
`18`	`19`	`{`
`19`	`20`	`public:`
`20`		`- ClientChunkClassLibrary(Nz::ApplicationBase& app, const ClientBlockLibrary& blockLibrary);`
	`21`	`+ ClientChunkClassLibrary(Nz::ApplicationBase& app, ConfigFile& config, const ClientBlockLibrary& blockLibrary);`
`21`	`22`
`22`	`23`	`private:`
`23`	`24`	`void InitializePlanetEntity(entt::handle entity) override;`
`24`	`25`	`void InitializeShipEntity(entt::handle entity) override;`
`25`	`26`	`std::unique_ptr<ChunkEntities> SetupChunkEntities(Nz::EnttWorld& world, ChunkContainer& chunkContainer, std::size_t layerIndex) override;`
	`27`	`+`
	`28`	`+ ConfigFile& m_config;`
`26`	`29`	`};`
`27`	`30`	`}`
`28`	`31`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,10 @@`
`4`	`4`
`5`	`5`	`namespace tsom`
`6`	`6`	`{`
`7`		`- inline ClientScriptingLibrary::ClientScriptingLibrary(Nz::ApplicationBase& app, ClientSessionHandler& sessionHandler) :`
	`7`	`+ inline ClientScriptingLibrary::ClientScriptingLibrary(Nz::ApplicationBase& app, ConfigFile& configFile, ClientSessionHandler& sessionHandler) :`
`8`	`8`	`m_app(app),`
`9`		`- m_sessionHandler(sessionHandler)`
	`9`	`+ m_sessionHandler(sessionHandler),`
	`10`	`+ m_config(configFile)`
`10`	`11`	`{`
`11`	`12`	`}`
`12`	`13`	`}`