Add atmosphere system

database/server/202503252314_create.sql

@@ -24,7 +24,7 @@ CREATE TABLE "planet_chunks" (
 	"chunk_data"	BLOB NOT NULL,
 	"last_update"   TEXT NOT NULL,
 	PRIMARY KEY("position_x","planet_id","position_y","position_z"),
-	FOREIGN KEY("planet_id") REFERENCES "planets"("id")
+	FOREIGN KEY("planet_id") REFERENCES "planets"("id") ON DELETE CASCADE
 ) WITHOUT ROWID,STRICT;
 
 CREATE TABLE "planet_links" (
@@ -34,6 +34,6 @@ CREATE TABLE "planet_links" (
 	"position_y"	REAL NOT NULL,
 	"position_z"	REAL NOT NULL,
 	PRIMARY KEY("source_planet_id","destination_planet_id"),
-	FOREIGN KEY("destination_planet_id") REFERENCES "planets"("id"),
-	FOREIGN KEY("source_planet_id") REFERENCES "planets"("id")
+	FOREIGN KEY("destination_planet_id") REFERENCES "planets"("id") ON DELETE CASCADE,
+	FOREIGN KEY("source_planet_id") REFERENCES "planets"("id") ON DELETE CASCADE
 ) WITHOUT ROWID,STRICT;

database/server/202504052243_planet_entities.sql

@@ -0,0 +1,19 @@
+CREATE TABLE "planet_entities" (
+	"id"	INTEGER NOT NULL,
+	"unique_id"	TEXT NOT NULL,
+	"planet_id"	INTEGER NOT NULL,
+	"class_name"	TEXT NOT NULL,
+	"class_version"	INTEGER NOT NULL,
+	"position_x"	REAL NOT NULL,
+	"position_y"	REAL NOT NULL,
+	"position_z"	REAL NOT NULL,
+	"rotation_x"	REAL NOT NULL,
+	"rotation_y"	REAL NOT NULL,
+	"rotation_z"	REAL NOT NULL,
+	"rotation_w"	REAL NOT NULL,
+	"properties"	TEXT NOT NULL DEFAULT '{}' CHECK(json_valid("properties")),
+	"last_update"	TEXT NOT NULL,
+	PRIMARY KEY("id"),
+    UNIQUE("unique_id"),
+	FOREIGN KEY("planet_id") REFERENCES "planets"("id") ON DELETE CASCADE
+) STRICT

include/ClientLib/ClientSessionHandler.hpp

@@ -62,7 +62,7 @@ namespace tsom
 			void HandlePacket(Packets::EntitiesStateUpdate&& stateUpdate);
 			void HandlePacket(Packets::EntityEnvironmentUpdate&& environmentUpdate);
 			void HandlePacket(Packets::EntityProcedureCall&& procedureCall);
-			void HandlePacket(Packets::EntityPropertyUpdate&& propertyUpdate);
+			void HandlePacket(Packets::EntityPropertiesUpdate&& propertyUpdate);
 			void HandlePacket(Packets::EnvironmentCreate&& envCreate);
 			void HandlePacket(Packets::EnvironmentDestroy&& envDestroy);
 			void HandlePacket(Packets::EnvironmentsUpdateOwner&& envOwnerUpdate);

include/ClientLib/Entities/ClientEntityClassLibrary.hpp

@@ -0,0 +1,38 @@
+// Copyright (C) 2025 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_ENTITIES_CLIENTENTITYCLASSLIBRARY_HPP
+#define TSOM_CLIENTLIB_ENTITIES_CLIENTENTITYCLASSLIBRARY_HPP
+
+#include <ClientLib/Export.hpp>
+#include <CommonLib/Entities/SharedEntityClassLibrary.hpp>
+#include <entt/fwd.hpp>
+
+namespace Nz
+{
+	class ApplicationBase;
+}
+
+namespace tsom
+{
+	class BlockLibrary;
+	class ChunkContainer;
+	class ChunkEntities;
+
+	class TSOM_CLIENTLIB_API ClientEntityClassLibrary final : public SharedEntityClassLibrary
+	{
+		public:
+			using SharedEntityClassLibrary::SharedEntityClassLibrary;
+
+		private:
+			void OnPlayerActivate(entt::handle entity) override;
+			void OnPlayerRpc_Death(entt::handle entity) override;
+	};
+}
+
+#include <ClientLib/Entities/ClientEntityClassLibrary.inl>
+
+#endif // TSOM_CLIENTLIB_ENTITIES_CLIENTENTITYCLASSLIBRARY_HPP

include/ClientLib/Entities/ClientEntityClassLibrary.inl

@@ -0,0 +1,7 @@
+// Copyright (C) 2025 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
+
+namespace tsom
+{
+}

include/ClientLib/Rendering/AtmosphereScatteringPipelinePass.hpp

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#ifndef TSOM_CLIENTLIB_RENDERING_ATMOSPHEREPIPELINEPASS_HPP
-#define TSOM_CLIENTLIB_RENDERING_ATMOSPHEREPIPELINEPASS_HPP
+#ifndef TSOM_CLIENTLIB_RENDERING_ATMOSPHERESCATTERINGPIPELINEPASS_HPP
+#define TSOM_CLIENTLIB_RENDERING_ATMOSPHERESCATTERINGPIPELINEPASS_HPP
 
 #include <ClientLib/Export.hpp>
 #include <Nazara/Core/ParameterList.hpp>
@@ -66,4 +66,4 @@ namespace tsom
 
 #include <ClientLib/Rendering/AtmosphereScatteringPipelinePass.inl>
 
-#endif // TSOM_CLIENTLIB_RENDERING_ATMOSPHEREPIPELINEPASS_HPP
+#endif // TSOM_CLIENTLIB_RENDERING_ATMOSPHERESCATTERINGPIPELINEPASS_HPP

include/ClientLib/Scripting/ClientAssetScriptingLibrary.hpp

@@ -0,0 +1,48 @@
+// Copyright (C) 2025 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_SCRIPTING_CLIENTASSETSCRIPTINGLIBRARY_HPP
+#define TSOM_CLIENTLIB_SCRIPTING_CLIENTASSETSCRIPTINGLIBRARY_HPP
+
+#include <ClientLib/Export.hpp>
+#include <CommonLib/Scripting/AssetScriptingLibrary.hpp>
+
+namespace Nz
+{
+	class ApplicationBase;
+}
+
+namespace tsom
+{
+	class ClientSessionHandler;
+
+	class TSOM_CLIENTLIB_API ClientAssetScriptingLibrary final : public AssetScriptingLibrary
+	{
+		public:
+			using AssetScriptingLibrary::AssetScriptingLibrary;
+			ClientAssetScriptingLibrary(const ClientAssetScriptingLibrary&) = delete;
+			ClientAssetScriptingLibrary(ClientAssetScriptingLibrary&&) = delete;
+			~ClientAssetScriptingLibrary() = default;
+
+			void Register(sol::state& state) override;
+
+			ClientAssetScriptingLibrary& operator=(const ClientAssetScriptingLibrary&) = delete;
+			ClientAssetScriptingLibrary& operator=(ClientAssetScriptingLibrary&&) = delete;
+
+		private:
+			void RegisterAssetLibrary(sol::state& state);
+			void RegisterMaterial(sol::state& state);
+			void RegisterMaterialInstance(sol::state& state);
+			void RegisterMaterialSettings(sol::state& state);
+			void RegisterRenderables(sol::state& state);
+			void RegisterRenderStates(sol::state& state);
+			void RegisterTexture(sol::state& state);
+	};
+}
+
+#include <ClientLib/Scripting/ClientAssetScriptingLibrary.inl>
+
+#endif // TSOM_CLIENTLIB_SCRIPTING_CLIENTASSETSCRIPTINGLIBRARY_HPP

include/ClientLib/Scripting/ClientAssetScriptingLibrary.inl

@@ -0,0 +1,7 @@
+// Copyright (C) 2025 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
+
+namespace tsom
+{
+}

include/ClientLib/Scripting/ClientScriptingLibrary.hpp

@@ -33,13 +33,8 @@ namespace tsom
 			ClientScriptingLibrary& operator=(ClientScriptingLibrary&&) = delete;
 
 		private:
-			void RegisterAssetLibrary(sol::state& state);
 			void RegisterClientSession(sol::state& state);
-			void RegisterMaterialInstance(sol::state& state);
-			void RegisterRenderables(sol::state& state);
-			void RegisterRenderStates(sol::state& state);
 			void RegisterScripts(sol::state& state);
-			void RegisterTexture(sol::state& state);
 
 			Nz::ApplicationBase& m_app;
 			ClientSessionHandler& m_sessionHandler;

include/CommonLib/Chunk.hpp

@@ -74,6 +74,7 @@ namespace tsom
 			inline BlockIndex GetBlockContent(unsigned int blockIndex) const;
 			inline BlockIndex GetBlockContent(const Nz::Vector3ui& indices) const;
 			inline std::size_t GetBlockCount() const;
+			inline Nz::UInt16 GetBlockCount(std::size_t blockIndex) const;
 			inline float GetBlockSize() const;
 			inline ChunkContainer& GetContainer();
 			inline const ChunkContainer& GetContainer() const;

include/CommonLib/Chunk.inl

@@ -77,6 +77,14 @@ namespace tsom
 		return m_size.x * m_size.y * m_size.z;
 	}
 
+	inline Nz::UInt16 Chunk::GetBlockCount(std::size_t blockIndex) const
+	{
+		if (blockIndex >= m_blockTypeCount.size())
+			return 0;
+
+		return m_blockTypeCount[blockIndex];
+	}
+
 	inline float Chunk::GetBlockSize() const
 	{
 		return m_blockSize;

include/CommonLib/Components/ClassInstanceComponent.hpp

@@ -23,6 +23,7 @@ namespace tsom
 			using PropertyUpdateSignal = Nz::Signal<Nz::UInt32, const EntityProperty&>;
 
 			ClassInstanceComponent(std::shared_ptr<const EntityClass> entityClass);
+			ClassInstanceComponent(std::shared_ptr<const EntityClass> entityClass, std::vector<EntityProperty>&& properties);
 			ClassInstanceComponent(const ClassInstanceComponent&) = delete;
 			ClassInstanceComponent(ClassInstanceComponent&&) noexcept = default;
 			~ClassInstanceComponent() = default;
@@ -34,6 +35,8 @@ namespace tsom
 			inline const EntityProperty& GetProperty(Nz::UInt32 propertyIndex) const;
 			template<EntityPropertyType Property> auto GetProperty(Nz::UInt32 propertyIndex) const;
 			template<EntityPropertyType Property> auto GetProperty(std::string_view propertyName) const;
+			inline const std::vector<EntityProperty>& GetProperties() const&;
+			inline std::vector<EntityProperty>&& GetProperties() &&;
 
 			Nz::UInt32 GetPropertyIndex(std::string_view propertyName) const;
 

include/CommonLib/Components/ClassInstanceComponent.inl

@@ -30,6 +30,16 @@ namespace tsom
 		return GetProperty<Property>(GetPropertyIndex(propertyName));
 	}
 
+	inline const std::vector<EntityProperty>& ClassInstanceComponent::GetProperties() const&
+	{
+		return m_properties;
+	}
+
+	inline std::vector<EntityProperty>&& ClassInstanceComponent::GetProperties()&&
+	{
+		return std::move(m_properties);
+	}
+
 	inline void ClassInstanceComponent::UpdateProperty(Nz::UInt32 propertyIndex, EntityProperty&& value)
 	{
 		assert(propertyIndex < m_properties.size());

include/CommonLib/Components/TickComponent.hpp

@@ -0,0 +1,24 @@
+// Copyright (C) 2025 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_COMMONLIB_COMPONENTS_TICKCOMPONENT_HPP
+#define TSOM_COMMONLIB_COMPONENTS_TICKCOMPONENT_HPP
+
+#include <Nazara/Core/Time.hpp>
+#include <entt/fwd.hpp>
+#include <functional>
+
+namespace tsom
+{
+	struct TickComponent
+	{
+		std::function<void(entt::handle)> onTick;
+		Nz::Time timeBeforeTick = Nz::Time::Zero(); // 0 = tick each time
+		Nz::Time tickRate = Nz::Time::Zero();
+	};
+}
+
+#endif // TSOM_COMMONLIB_COMPONENTS_TICKCOMPONENT_HPP

include/CommonLib/Entities/SharedEntityClassLibrary.hpp

@@ -0,0 +1,53 @@
+// Copyright (C) 2025 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_COMMONLIB_ENTITIES_SHAREDENTITYCLASSLIBRARY_HPP
+#define TSOM_COMMONLIB_ENTITIES_SHAREDENTITYCLASSLIBRARY_HPP
+
+#include <CommonLib/Export.hpp>
+#include <CommonLib/Entities/EntityClassLibrary.hpp>
+#include <entt/fwd.hpp>
+
+namespace Nz
+{
+	class ApplicationBase;
+	class Collider3D;
+}
+
+namespace tsom
+{
+	class EntityClass;
+
+	class TSOM_COMMONLIB_API SharedEntityClassLibrary : public EntityClassLibrary
+	{
+		public:
+			SharedEntityClassLibrary(Nz::ApplicationBase& app);
+			SharedEntityClassLibrary(const SharedEntityClassLibrary&) = delete;
+			SharedEntityClassLibrary(SharedEntityClassLibrary&&) = delete;
+			~SharedEntityClassLibrary() = default;
+
+			void Register(EntityRegistry& registry) override;
+
+			SharedEntityClassLibrary& operator=(const SharedEntityClassLibrary&) = delete;
+			SharedEntityClassLibrary& operator=(SharedEntityClassLibrary&&) = delete;
+
+		protected:
+			virtual void OnPlayerActivate(entt::handle entity);
+			virtual void OnPlayerInit(entt::handle entity);
+			virtual void OnPlayerRpc_Death(entt::handle entity);
+			virtual void OnShipExteriorActivate(entt::handle entity);
+			virtual void OnShipExteriorInit(entt::handle entity);
+
+			std::shared_ptr<Nz::Collider3D> m_playerCollider;
+			std::shared_ptr<const EntityClass> m_playerClass;
+			std::shared_ptr<const EntityClass> m_shipExteriorClass;
+			Nz::ApplicationBase& m_app;
+	};
+}
+
+#include <CommonLib/Entities/SharedEntityClassLibrary.inl>
+
+#endif // TSOM_COMMONLIB_ENTITIES_SHAREDENTITYCLASSLIBRARY_HPP

include/CommonLib/Entities/SharedEntityClassLibrary.inl

@@ -0,0 +1,7 @@
+// Copyright (C) 2025 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
+
+namespace tsom
+{
+}

include/CommonLib/EntityClass.hpp

@@ -10,8 +10,10 @@
 #include <CommonLib/Export.hpp>
 #include <CommonLib/EntityProperties.hpp>
 #include <entt/fwd.hpp>
+#include <nlohmann/json_fwd.hpp>
 #include <tsl/hopscotch_map.h>
 #include <functional>
+#include <span>
 #include <string>
 #include <vector>
 
@@ -45,6 +47,9 @@ namespace tsom
 			void InitAndActivateEntity(entt::handle entity) const;
 			void InitEntity(entt::handle entity) const;
 
+			std::vector<EntityProperty> PropertiesFromJson(const nlohmann::json& propertiesJson) const;
+			nlohmann::json PropertiesToJson(std::span<const EntityProperty> properties) const;
+
 			EntityClass& operator=(const EntityClass&) = delete;
 			EntityClass& operator=(EntityClass&&) noexcept = default;
 

include/CommonLib/EntityRegistry.hpp

@@ -34,7 +34,7 @@ namespace tsom
 
 			void Refresh(std::span<entt::registry*> registries, Nz::FunctionRef<void()> refreshCallback);
 
-			void RegisterClass(EntityClass entityClass);
+			std::shared_ptr<const EntityClass> RegisterClass(EntityClass entityClass);
 
 			template<typename T, typename... Args> void RegisterClassLibrary(Args&&... args);
 			void RegisterClassLibrary(std::unique_ptr<EntityClassLibrary>&& library);

include/CommonLib/GameConstants.hpp

@@ -15,6 +15,11 @@
 
 namespace tsom::Constants
 {
+	// Atmosphere constants
+	constexpr Nz::UInt64 OxygenAtmospherePct = 21;
+	constexpr Nz::Int64 PlayerOxygenConsumption = 100;
+	constexpr Nz::UInt64 SecondsToEmptyOxygenBlock = 5;
+
 	// Chat constants
 	constexpr std::size_t ChatMaxLines = 100;
 	constexpr std::size_t ChatMaxMessageLength = 1024;
@@ -35,6 +40,7 @@ namespace tsom::Constants
 	constexpr float PlayerWalkSpeed = 5.f;
 	constexpr Nz::DegreeAnglef GravityMaxRotationSpeed = 180.f;
 	constexpr Nz::DegreeAnglef PlayerRotationSpeed = 90.f;
+	constexpr Nz::Time PlayerRespawnTime = Nz::Time::Seconds(5);
 
 	// Ship constants
 	constexpr float ShipGravityAcceleration = 9.81f;