Améliore la gestion des chunks et simplifie Application

Modifications apportées à `Application::Start()` pour se concentrer sur `update_x` et ajouter une méthode `copy_to_render` dans `ChunkManager`. La méthode `compute_world_update_x` a été optimisée pour préallouer de la mémoire et gérer les chunks via `_setup_list`. Normalisation des noms de variables dans `ChunkManager.h` et mise à jour des dépendances de projet dans `R3D_Engine.sln`.

Author: MrScriptX

R3DVoxel/Application.cpp

@@ -68,13 +68,16 @@ void Application::Start()
 	{
 		const auto update_x = chunk_manager.compute_world_update_x(*mp_engine->GetMainCamera());
 		if (update_x.updated)
+		{
+			chunk_manager.copy_to_render();
 			chunk_manager.update_world_x(update_x.created, update_x.update_plus, update_x.update_min);
+		}
 
-		const auto update_z = chunk_manager.compute_world_update_z(*mp_engine->GetMainCamera());
+		/* const auto update_z = chunk_manager.compute_world_update_z(*mp_engine->GetMainCamera());
 		if (update_z.updated)
-			chunk_manager.update_world_z(update_z.created, update_z.update_plus, update_z.update_min);
+			chunk_manager.update_world_z(update_z.created, update_z.update_plus, update_z.update_min);*/
 
-		if (update_x.updated || update_z.updated)
+		if (update_x.updated /* || update_z.updated */)
 			scene->ToUpdate();
 
 		Watcher::WatchPosition("camera", mp_engine->GetMainCamera()->GetPosition());

R3DVoxel/VoxelEngine/ChunkManager.cpp

@@ -208,12 +208,22 @@ render_update_t ChunkManager::compute_world_update_x(const Camera& camera)
 
 		m_render_max.x = m_render_max.x + 1;
 
+		// preallocate memory for chunks
 		for (int32_t z = m_render_min.z; z <= m_render_max.z; z++)
 		{
 			for (int32_t y = m_render_min.y; y <= m_render_max.y; y++)
 			{
-				CreateNewChunk(m_render_max.x, y, z);
-				DestroyChunk(m_render_min.x, y, z);
+				const ChunkKey key = { .x = m_render_max.x, .y = y, .z = z };
+				_setup_list.insert(std::pair<ChunkKey, std::unique_ptr<Chunk>>(key, nullptr));
+			}
+		}
+
+		for (int32_t z = m_render_min.z; z <= m_render_max.z; z++)
+		{
+			for (int32_t y = m_render_min.y; y <= m_render_max.y; y++)
+			{
+				_setup_list.at({ m_render_max.x, y, z }) = create_chunk(m_render_max.x, y, z);
+				// DestroyChunk(m_render_min.x, y, z);
 			}
 		}
 
@@ -230,12 +240,22 @@ render_update_t ChunkManager::compute_world_update_x(const Camera& camera)
 
 		m_render_min.x = m_render_min.x - 1;
 
+		// preallocate memory for chunks
 		for (int32_t z = m_render_min.z; z <= m_render_max.z; z++)
 		{
 			for (int32_t y = m_render_min.y; y <= m_render_max.y; y++)
 			{
-				CreateNewChunk(m_render_min.x, y, z);
-				DestroyChunk(m_render_max.x, y, z);
+				const ChunkKey key = { .x = m_render_min.x, .y = y, .z = z };
+				_setup_list.insert(std::pair<ChunkKey, std::unique_ptr<Chunk>>(key, nullptr));
+			}
+		}
+
+		for (int32_t z = m_render_min.z; z <= m_render_max.z; z++)
+		{
+			for (int32_t y = m_render_min.y; y <= m_render_max.y; y++)
+			{
+				_setup_list.at({ m_render_min.x, y, z }) = create_chunk(m_render_min.x, y, z);
+				// DestroyChunk(m_render_max.x, y, z);
 			}
 		}
 
@@ -328,6 +348,28 @@ void ChunkManager::update_world_z(int32_t create_z, int32_t update_zplus, int32_
 	}
 }
 
+void ChunkManager::copy_to_render()
+{
+	for (auto& [key, chunk] : _setup_list)
+	{
+		if (chunk)
+		{
+			m_chunk_map.insert(std::pair<ChunkKey, std::unique_ptr<Chunk>>(key, std::move(chunk)));
+		}
+	}
+
+	for (auto& [key, chunk] : _destroy_list)
+	{
+		if (chunk)
+		{
+			m_chunk_map.erase(key);
+		}
+	}
+
+	_setup_list.clear();
+	_destroy_list.clear();
+}
+
 void ChunkManager::CreateNewChunk(int32_t x, int32_t y, int32_t z)
 {
 	const ChunkKey key = { x, y, z };

R3DVoxel/VoxelEngine/ChunkManager.h

@@ -34,6 +34,8 @@ class ChunkManager
 	void update_world_x(int32_t create_x, int32_t update_xplus, int32_t update_xmin) const;
 	void update_world_z(int32_t create_z, int32_t update_zplus, int32_t update_zmin) const;
 
+	void copy_to_render();
+
 	void CreateNewChunk(int32_t x, int32_t y, int32_t z);
 	void DestroyChunk(const int32_t x, const int32_t y, const int32_t z);
 
@@ -47,8 +49,10 @@ class ChunkManager
 	std::shared_ptr<GameObject> mp_world;
 	std::shared_ptr<Material> mp_world_mat;
 
-	std::map<ChunkKey, std::unique_ptr<Chunk>> m_setup_list;
+	std::map<ChunkKey, std::unique_ptr<Chunk>> _setup_list;
+	std::map<ChunkKey, std::unique_ptr<Chunk>> _destroy_list;
 	std::map<ChunkKey, std::unique_ptr<Chunk>> m_chunk_map;
+
 	uint8_t m_load_radius = 10;
 	glm::vec3 m_render_position;
 

R3D_Engine.sln

@@ -21,6 +21,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MovingLight", "MovingLight\
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "R3DVoxel", "R3DVoxel\R3DVoxel.vcxproj", "{E129D7F0-3D7C-4F89-8034-30B8F0E20A14}"
+	ProjectSection(ProjectDependencies) = postProject
+		{4401C86B-984C-4184-A0A5-33586F893073} = {4401C86B-984C-4184-A0A5-33586F893073}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution