Merge pull request #43 from antkeeper/gh-29-reenter-play-state

GH-29: Fix re-entering of play state.

Author: cjhoward

CMakeLists.txt

@@ -66,7 +66,7 @@ FetchContent_Declare(dr_libs
 )
 FetchContent_Declare(entt
 	GIT_REPOSITORY https://github.com/skypjack/entt.git
-	GIT_TAG e4ccb878f47245a319704912435d3c89f34ad6be # v3.10.3
+	GIT_TAG 4a2d1a8541228a90e02a873dba6a980506c42c03 # v3.14.0
 	GIT_PROGRESS TRUE
 )
 FetchContent_Declare(freetype

src/engine/animation/skeletal-animation.cpp

@@ -7,7 +7,7 @@
 #include <engine/math/euler-angles.hpp>
 #include <engine/debug/log.hpp>
 #include <engine/scene/skeletal-mesh.hpp>
-#include "game/components/scene-component.hpp"
+#include "game/components/scene-object-component.hpp"
 #include <filesystem>
 #include <format>
 #include <stdexcept>
@@ -48,7 +48,7 @@ void bind_skeletal_animation([[maybe_unused]] animation_sequence& sequence, [[ma
 		{
 			track.output() = [bone_index](auto samples, auto& context)
 			{
-				auto& scene_object = *(context.handle.template get<scene_component>().object);
+				auto& scene_object = *(context.handle.template get<scene_object_component>().object);
 				auto& skeletal_mesh = static_cast<scene::skeletal_mesh&>(scene_object);
 
 				const auto translation = math::fvec3{samples[0], samples[1], samples[2]};
@@ -60,7 +60,7 @@ void bind_skeletal_animation([[maybe_unused]] animation_sequence& sequence, [[ma
 		{
 			track.output() = [bone_index](auto samples, auto& context)
 			{
-				auto& scene_object = *(context.handle.template get<scene_component>().object);
+				auto& scene_object = *(context.handle.template get<scene_object_component>().object);
 				auto& skeletal_mesh = static_cast<scene::skeletal_mesh&>(scene_object);
 
 				const auto rotation = math::normalize(math::fquat{samples[0], samples[1], samples[2], samples[3]});
@@ -72,7 +72,7 @@ void bind_skeletal_animation([[maybe_unused]] animation_sequence& sequence, [[ma
 		{
 			track.output() = [bone_index](auto samples, auto& context)
 			{
-				auto& scene_object = *(context.handle.template get<scene_component>().object);
+				auto& scene_object = *(context.handle.template get<scene_object_component>().object);
 				auto& skeletal_mesh = static_cast<scene::skeletal_mesh&>(scene_object);
 
 				const auto rotation = math::euler_xyz_to_quat(math::fvec3{samples[0], samples[1], samples[2]});
@@ -84,7 +84,7 @@ void bind_skeletal_animation([[maybe_unused]] animation_sequence& sequence, [[ma
 		{
 			track.output() = [bone_index](auto samples, auto& context)
 			{
-				auto& scene_object = *(context.handle.template get<scene_component>().object);
+				auto& scene_object = *(context.handle.template get<scene_object_component>().object);
 				auto& skeletal_mesh = static_cast<scene::skeletal_mesh&>(scene_object);
 
 				const auto scale = math::fvec3{samples[0], samples[1], samples[2]};

src/engine/config.hpp.in

@@ -4,9 +4,6 @@
 #ifndef ANTKEEPER_CONFIG_HPP
 #define ANTKEEPER_CONFIG_HPP
 
-#include <cstddef>
-#include <engine/math/vector.hpp>
-
 /// Global configuration constants.
 namespace config {
 
@@ -52,7 +49,7 @@ inline constexpr const char* application_url = "@PROJECT_HOMEPAGE_URL@";
 /// @{
 
 /// Maximum number of debug logs to archive.
-inline constexpr std::size_t debug_log_archive_capacity = 5;
+inline constexpr unsigned int debug_log_archive_capacity = 5;
 
 /// @}
 
@@ -85,34 +82,6 @@ inline constexpr int opengl_min_stencil_size = 0;
 
 /// @}
 
-inline constexpr math::vector<float, 3> global_forward = {0.0f, 0.0f, -1.0f};
-inline constexpr math::vector<float, 3> global_up = {0.0f, 1.0f, 0.0f};
-inline constexpr math::vector<float, 3> global_right = {1.0f, 0.0f, 0.0f};
-
-/// Duration of the menu fade in animation, in seconds.
-inline constexpr float menu_fade_in_duration = 0.25f;
-
-/// Duration of the menu fade out animation, in seconds.
-inline constexpr float menu_fade_out_duration = 0.125f;
-
-/// Padding of the a menu item mouseover bounds, as a percentage of the font size.
-inline constexpr float menu_mouseover_padding = 0.1f;
-
-/// Opacity of the menu background.
-inline constexpr float menu_bg_opacity = 3.0f / 4.0f;
-
-/// Duration of the title screen fade in, in seconds.
-inline constexpr float title_fade_in_duration = 1.0f;
-
-/// Duration of the fade out when quitting the game or returning to the main menu, in seconds.
-inline constexpr float quit_fade_out_duration = 0.5f;
-
-/// Duration of the fade out when a new colony is started, in seconds.
-inline constexpr float new_colony_fade_out_duration = 1.0f;
-
-/// Duration of the nuptial flight fade in, in seconds.
-inline constexpr float nuptial_flight_fade_in_duration = 5.0f;
-
 } // namespace config
 
 #endif // ANTKEEPER_CONFIG_HPP

src/engine/entity/clone.cpp

@@ -11,7 +11,7 @@ void clone(entity::registry& registry, entity::id source, entity::id destination
 	{
 		if (auto& storage = it.second; storage.contains(source))
 		{
-			storage.emplace(destination, storage.get(source));
+			storage.push(destination, storage.value(source));
 		}
 	}
 }

src/engine/hash/fnv.hpp

@@ -18,10 +18,10 @@
 namespace hash {
 
 /// 32-bit FNV hash value.
-enum class fnv32_t : std::uint32_t {};
+enum class fnv32_t: std::uint32_t{};
 
 /// 64-bit FNV hash value.
-enum class fnv64_t : std::uint64_t {};
+enum class fnv64_t: std::uint64_t{};
 
 namespace types
 {

src/engine/render/stages/light-probe-stage.cpp

@@ -6,6 +6,7 @@
 #include <engine/scene/light-probe.hpp>
 #include <engine/scene/collection.hpp>
 #include <engine/hash/fnv.hpp>
+#include <engine/debug/contract.hpp>
 #include <stdexcept>
 
 using namespace hash::literals;
@@ -105,6 +106,27 @@ light_probe_stage::light_probe_stage(gl::pipeline& pipeline, ::resource_manager&
 	// Load cubemap filter shader template and build shader program
 	m_cubemap_filter_shader_template = resource_manager.load<gl::shader_template>("cubemap-filter.glsl");
 	rebuild_cubemap_filter_shader_program();
+
+	debug::postcondition(m_vertex_array != nullptr);
+
+	debug::postcondition(m_cubemap_to_sh_shader_program != nullptr);
+	debug::postcondition(m_cubemap_to_sh_cubemap_var != nullptr);
+
+	debug::postcondition(m_cubemap_downsample_shader_program != nullptr);
+	debug::postcondition(m_cubemap_downsample_cubemap_var != nullptr);
+
+	debug::postcondition(m_cubemap_filter_lut_texture != nullptr);
+	debug::postcondition(m_cubemap_filter_lut_framebuffer != nullptr);
+	debug::postcondition(m_cubemap_filter_lut_shader_program != nullptr);
+	debug::postcondition(m_cubemap_filter_lut_resolution_var != nullptr);
+	debug::postcondition(m_cubemap_filter_lut_face_size_var != nullptr);
+	debug::postcondition(m_cubemap_filter_lut_mip_bias_var != nullptr);
+
+	debug::postcondition(m_cubemap_filter_shader_program != nullptr);
+	debug::postcondition(m_cubemap_filter_cubemap_var != nullptr);
+	debug::postcondition(m_cubemap_filter_filter_lut_var != nullptr);
+	debug::postcondition(m_cubemap_filter_mip_level_var != nullptr);
+
 }
 
 void light_probe_stage::execute(render::context& ctx)
@@ -131,6 +153,8 @@ void light_probe_stage::update_light_probes_luminance(const std::vector<scene::o
 		{
 			continue;
 		}
+
+		debug::invariant(light_probe.get_luminance_texture() != nullptr);
 
 		// Store light probe luminance sampler
 		auto light_probe_luminance_sampler = light_probe.get_luminance_texture()->get_sampler();
@@ -233,6 +257,9 @@ void light_probe_stage::update_light_probes_illuminance(const std::vector<scene:
 		{
 			continue;
 		}
+
+		debug::invariant(light_probe.get_luminance_texture() != nullptr);
+		debug::invariant(light_probe.get_illuminance_framebuffer() != nullptr);
 
 		// Setup viewport and bind cubemap to spherical harmonics shader program
 		if (!state_bound)

src/engine/render/stages/light-probe-stage.hpp

@@ -95,10 +95,8 @@ class light_probe_stage: public stage
 
 	std::shared_ptr<gl::shader_template> m_cubemap_downsample_shader_template;
 	std::unique_ptr<gl::shader_program> m_cubemap_downsample_shader_program;
-
 	const gl::shader_variable* m_cubemap_downsample_cubemap_var{};
 	std::vector<std::unique_ptr<gl::framebuffer>> m_cubemap_downsample_framebuffers;
-	std::unique_ptr<gl::texture_cube> m_cubemap_downsample_texture;
 
 	std::shared_ptr<gl::texture_2d> m_cubemap_filter_lut_texture;
 	std::unique_ptr<gl::framebuffer> m_cubemap_filter_lut_framebuffer;

src/engine/scene/directional-light.hpp

@@ -210,9 +210,9 @@ class directional_light: public light
 	float m_shadow_max_distance{100.0f};
 	float m_shadow_fade_range{0.0f};
 	float m_shadow_cascade_distribution{0.8f};
-	math::fvec4 m_shadow_cascade_distances;
-	math::fmat4 m_shadow_cascade_matrices[4];
-	math::fmat4 m_shadow_scale_bias_matrices[4];
+	math::fvec4 m_shadow_cascade_distances{};
+	math::fmat4 m_shadow_cascade_matrices[4]{};
+	math::fmat4 m_shadow_scale_bias_matrices[4]{};
 };
 
 } // namespace scene

src/engine/scene/light-probe.cpp

@@ -2,9 +2,55 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #include <engine/scene/light-probe.hpp>
+#include <engine/debug/contract.hpp>
 
 namespace scene {
 
+namespace
+{
+	// 4 floats per pixel to encode the 3 4x4 spherical harmonics illuminance matrices in a 12 pixel 1D image.
+	inline constexpr gl::format light_probe_illuminance_image_format = gl::format::r32g32b32a32_sfloat;
+
+	// 12 pixels, corresponding to the column vectors of three spherical harmonics illuminance matrices (R0, R1, R2, R3, G0, G1, G2, G3, B0, B1, B2, B3).
+	inline constexpr std::uint32_t light_probe_illuminance_image_width = 12;
+}
+
+light_probe::light_probe(gl::format format, std::uint32_t face_size):
+	light_probe()
+{
+	const auto mip_levels = static_cast<std::uint32_t>(std::bit_width(face_size));
+
+	set_luminance_texture
+	(
+		std::make_shared<gl::texture_cube>
+		(
+			// Luminance texture image view
+			std::make_shared<gl::image_view_cube>
+			(
+				std::make_shared<gl::image_cube>
+				(
+					format,
+					face_size,
+					mip_levels
+				),
+				gl::format::undefined,
+				0,
+				mip_levels
+			),
+
+			// Lumiance texture sampler
+			std::make_shared<gl::sampler>
+			(
+				gl::sampler_filter::linear,
+				gl::sampler_filter::linear,
+				gl::sampler_mipmap_mode::linear,
+				gl::sampler_address_mode::clamp_to_edge,
+				gl::sampler_address_mode::clamp_to_edge
+			)
+		)
+	);
+}
+
 light_probe::light_probe()
 {
 	// Allocate illuminance texture
@@ -14,8 +60,8 @@ light_probe::light_probe()
 		(
 			std::make_shared<gl::image_1d>
 			(
-				gl::format::r32g32b32a32_sfloat,
-				12
+				light_probe_illuminance_image_format,
+				light_probe_illuminance_image_width
 			)
 		),
 		std::make_shared<gl::sampler>
@@ -36,7 +82,7 @@ light_probe::light_probe()
 			0
 		}
 	};
-	m_illuminance_framebuffer = std::make_shared<gl::framebuffer>(attachments, 12, 1);
+	m_illuminance_framebuffer = std::make_shared<gl::framebuffer>(attachments, light_probe_illuminance_image_width, 1);
 
 	// Init illuminance matrices
 	m_illuminance_matrices[0] = {};
@@ -46,55 +92,62 @@ light_probe::light_probe()
 
 void light_probe::update_illuminance_matrices()
 {
+	debug::precondition(m_illuminance_texture != nullptr);
+
 	m_illuminance_texture->get_image_view()->get_image()->read
 	(
 		0,
 		0,
 		0,
 		0,
-		12,
+		light_probe_illuminance_image_width,
 		1,
 		1,
-		gl::format::r32g32b32a32_sfloat,
+		light_probe_illuminance_image_format,
 		std::as_writable_bytes(std::span{m_illuminance_matrices})
 	);
 }
 
 void light_probe::set_luminance_texture(std::shared_ptr<gl::texture_cube> texture)
 {
-	if (m_luminance_texture != texture)
+	if (m_luminance_texture == texture)
 	{
-		m_luminance_texture = texture;
+		return;
+	}
+
+	m_luminance_texture = texture;
 
-		// Update luminance framebuffers
-		if (m_luminance_texture)
-		{
-			const auto face_size = texture->get_image_view()->get_image()->get_dimensions()[0];
-			const auto mip_count = static_cast<std::uint32_t>(std::bit_width(face_size));
+	// Update luminance framebuffers
+	if (m_luminance_texture)
+	{
+		debug::invariant(m_luminance_texture->get_image_view() != nullptr);
+		debug::invariant(m_luminance_texture->get_image_view()->get_image() != nullptr);
+
+		const auto face_size = m_luminance_texture->get_image_view()->get_image()->get_dimensions()[0];
+		const auto mip_count = static_cast<std::uint32_t>(std::bit_width(face_size));
 
-			m_luminance_framebuffers.resize(mip_count);
+		m_luminance_framebuffers.resize(mip_count);
 
-			for (std::uint32_t i = 0; i < mip_count; ++i)
+		for (std::uint32_t i = 0; i < mip_count; ++i)
+		{
+			const gl::framebuffer_attachment attachments[1] =
 			{
-				const gl::framebuffer_attachment attachments[1] =
 				{
-					{
-						gl::color_attachment_bit,
-						m_luminance_texture->get_image_view(),
-						i
-					}
-				};
-				m_luminance_framebuffers[i] = std::make_shared<gl::framebuffer>(attachments, face_size >> i, face_size >> i);
-			}
-		}
-		else
-		{
-			m_luminance_framebuffers.clear();
+					gl::color_attachment_bit,
+					m_luminance_texture->get_image_view(),
+					i
+				}
+			};
+			m_luminance_framebuffers[i] = std::make_shared<gl::framebuffer>(attachments, face_size >> i, face_size >> i);
 		}
-		
-		set_luminance_outdated(true);
-		set_illuminance_outdated(true);
 	}
+	else
+	{
+		m_luminance_framebuffers.clear();
+	}
+		
+	set_luminance_outdated(true);
+	set_illuminance_outdated(true);
 }
 
 void light_probe::set_luminance_outdated(bool outdated)