Add atmosphere scattering to planet entities

Author: SirLynix

include/ClientLib/Entities/ClientChunkClassLibrary.hpp

@@ -20,7 +20,8 @@ namespace tsom
 			ClientChunkClassLibrary(Nz::ApplicationBase& app, const ClientBlockLibrary& blockLibrary);
 
 		private:
-			void InitializeChunkEntity(entt::handle entity) override;
+			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;
 	};
 }

include/CommonLib/Entities/ChunkClassLibrary.hpp

@@ -38,7 +38,8 @@ namespace tsom
 			ChunkClassLibrary& operator=(ChunkClassLibrary&&) = delete;
 
 		protected:
-			virtual void InitializeChunkEntity(entt::handle entity);
+			virtual void InitializePlanetEntity(entt::handle entity);
+			virtual void InitializeShipEntity(entt::handle entity);
 			virtual std::unique_ptr<ChunkEntities> SetupChunkEntities(Nz::EnttWorld& world, ChunkContainer& chunkContainer, std::size_t layerIndex);
 
 			Nz::ApplicationBase& m_app;

src/ClientLib/Entities/ClientChunkClassLibrary.cpp

@@ -5,7 +5,9 @@
 #include <ClientLib/Entities/ClientChunkClassLibrary.hpp>
 #include <ClientLib/ClientBlockLibrary.hpp>
 #include <ClientLib/ClientChunkEntities.hpp>
+#include <CommonLib/AtmosphereScattering.hpp>
 #include <ClientLib/Components/ChunkNetworkMapComponent.hpp>
+#include <CommonLib/Components/ClassInstanceComponent.hpp>
 
 namespace tsom
 {
@@ -14,7 +16,18 @@ namespace tsom
 	{
 	}
 
-	void ClientChunkClassLibrary::InitializeChunkEntity(entt::handle entity)
+	void ClientChunkClassLibrary::InitializePlanetEntity(entt::handle entity)
+	{
+		entity.emplace<ChunkNetworkMapComponent>();
+		auto& atmosphereScattering = entity.emplace<AtmosphereScattering>();
+
+		auto& entityInstance = entity.get<ClassInstanceComponent>();
+
+		atmosphereScattering.planetCornerRadius = entityInstance.GetProperty<EntityPropertyType::Float>("CornerRadius");
+		atmosphereScattering.planetDimensions = entityInstance.GetProperty<EntityPropertyType::FloatSize3D>("AtmospherePlanetDims");
+	}
+
+	void ClientChunkClassLibrary::InitializeShipEntity(entt::handle entity)
 	{
 		entity.emplace<ChunkNetworkMapComponent>();
 	}

src/ClientLib/Rendering/AtmosphereScatteringPipelinePass.cpp

@@ -196,9 +196,10 @@ namespace tsom
 		{
 			auto&& [planetPos, atmosphereScattering] = *rit;
 
+			Nz::AccessByOffset<Nz::Vector3f&>(atmosphereBasePtr, AtmosphereScatteringFields.planetPositionOffset) = planetPos;
+
 			Nz::AccessByOffset<Nz::Vector3f&>(atmosphereBasePtr, AtmosphereScatteringFields.sunDirOffset) = atmosphereScattering->sunDir;
 			Nz::AccessByOffset<Nz::Vector3f&>(atmosphereBasePtr, AtmosphereScatteringFields.sunIntensityOffset) = atmosphereScattering->sunIntensity;
-			Nz::AccessByOffset<Nz::Vector3f&>(atmosphereBasePtr, AtmosphereScatteringFields.planetPositionOffset) = atmosphereScattering->planetPosition;
 			Nz::AccessByOffset<Nz::Vector3f&>(atmosphereBasePtr, AtmosphereScatteringFields.planetDimensionsOffset) = atmosphereScattering->planetDimensions;
 			Nz::AccessByOffset<float&>(atmosphereBasePtr, AtmosphereScatteringFields.planetCornerRadiusOffset) = atmosphereScattering->planetCornerRadius;
 			Nz::AccessByOffset<float&>(atmosphereBasePtr, AtmosphereScatteringFields.atmosphereMaxHeightOffset) = atmosphereScattering->atmosphereMaxHeight;

src/CommonLib/ChunkEntities.cpp

@@ -84,6 +84,8 @@ namespace tsom
 	{
 		for (auto it = m_updateJobs.begin(); it != m_updateJobs.end(); ++it)
 		{
+			//FIXME: If applyFunc inserts a new job it will invalidate the iterators
+
 			UpdateJob& job = *it->second;
 			if (!job.HasFinished())
 				continue;

src/CommonLib/Entities/ChunkClassLibrary.cpp

@@ -18,9 +18,10 @@ namespace tsom
 	{
 		registry.RegisterClass(EntityClass("planet", {
 			{
-				EntityClass::Property { .name = "CellSize",     .type = EntityPropertyType::Float, .defaultValue = EntityPropertySingleValue<EntityPropertyType::Float>(1.f),   .isNetworked = true },
-				EntityClass::Property { .name = "CornerRadius", .type = EntityPropertyType::Float, .defaultValue = EntityPropertySingleValue<EntityPropertyType::Float>(16.f),  .isNetworked = true },
-				EntityClass::Property { .name = "Gravity",      .type = EntityPropertyType::Float, .defaultValue = EntityPropertySingleValue<EntityPropertyType::Float>(9.81f), .isNetworked = true }
+				EntityClass::Property { .name = "CellSize",             .type = EntityPropertyType::Float,       .defaultValue = EntityPropertySingleValue<EntityPropertyType::Float>(1.f),                      .isNetworked = true },
+				EntityClass::Property { .name = "CornerRadius",         .type = EntityPropertyType::Float,       .defaultValue = EntityPropertySingleValue<EntityPropertyType::Float>(16.f),                     .isNetworked = true },
+				EntityClass::Property { .name = "Gravity",              .type = EntityPropertyType::Float,       .defaultValue = EntityPropertySingleValue<EntityPropertyType::Float>(9.81f),                    .isNetworked = true },
+				EntityClass::Property { .name = "AtmospherePlanetDims", .type = EntityPropertyType::FloatSize3D, .defaultValue = EntityPropertySingleValue<EntityPropertyType::FloatSize3D>(Nz::Vector3f(60.f)), .isNetworked = true },
 			}
 		},
 		{
@@ -45,7 +46,7 @@ namespace tsom
 					planetComponent.planetEntities[layerIndex]->SetParentEntity(entity);
 				}
 
-				InitializeChunkEntity(entity);
+				InitializePlanetEntity(entity);
 			}
 		},
 		{}));
@@ -75,13 +76,17 @@ namespace tsom
 					shipComponent.shipEntities[layerIndex]->SetParentEntity(entity);
 				}
 
-				InitializeChunkEntity(entity);
+				InitializeShipEntity(entity);
 			}
 		},
 		{}));
 	}
 
-	void ChunkClassLibrary::InitializeChunkEntity(entt::handle entity)
+	void ChunkClassLibrary::InitializePlanetEntity(entt::handle entity)
+	{
+	}
+
+	void ChunkClassLibrary::InitializeShipEntity(entt::handle entity)
 	{
 	}