Add Rgb; inspectors for Rgb, nvec3, vec3 colour

- Split `DirLight` into scene data vs SSBO data.
- Prepare for inspecting dir lights in editor.

Author: karnkaul

lib/engine/include/facade/engine/editor/inspector.hpp

@@ -2,6 +2,8 @@
 #include <facade/engine/editor/common.hpp>
 #include <facade/scene/material.hpp>
 #include <facade/scene/node.hpp>
+#include <facade/util/nvec3.hpp>
+#include <facade/util/rgb.hpp>
 #include <limits>
 
 namespace facade {
@@ -28,7 +30,10 @@ class Inspector {
 	bool inspect(char const* label, glm::vec2& out_vec2, float speed = 1.0f, float lo = min_v, float hi = max_v) const;
 	bool inspect(char const* label, glm::vec3& out_vec3, float speed = 1.0f, float lo = min_v, float hi = max_v) const;
 	bool inspect(char const* label, glm::vec4& out_vec4, float speed = 1.0f, float lo = min_v, float hi = max_v) const;
+	bool inspect(char const* label, nvec3& out_vec3, float speed = 0.01f) const;
 	bool inspect(char const* label, glm::quat& out_quat) const;
+	bool inspect_rgb(char const* label, glm::vec3& out_rgb) const;
+	bool inspect(char const* label, Rgb& out_rgb) const;
 	bool inspect(Transform& out_transform, Bool& out_unified_scaling) const;
 	bool inspect(std::span<Transform> out_instances, Bool unfied_scaling) const;
 

lib/engine/src/editor/inspector.cpp

@@ -50,6 +50,15 @@ bool Inspector::inspect(char const* label, glm::vec4& out_vec4, float speed, flo
 	return false;
 }
 
+bool Inspector::inspect(char const* label, nvec3& out_vec3, float speed) const {
+	auto vec3 = out_vec3.value();
+	if (inspect(label, vec3, speed, -1.0f, 1.0f)) {
+		out_vec3 = vec3;
+		return true;
+	}
+	return false;
+}
+
 bool Inspector::inspect(char const* label, glm::quat& out_quat) const {
 	auto euler = to_degree(glm::eulerAngles(out_quat));
 	auto const org = euler;
@@ -62,6 +71,25 @@ bool Inspector::inspect(char const* label, glm::quat& out_quat) const {
 	return false;
 }
 
+bool Inspector::inspect_rgb(char const* label, glm::vec3& out_rgb) const {
+	float arr[3] = {out_rgb.x, out_rgb.y, out_rgb.z};
+	if (ImGui::ColorEdit3(label, arr)) {
+		out_rgb = {arr[0], arr[1], arr[2]};
+		return true;
+	}
+	return false;
+}
+
+bool Inspector::inspect(char const* label, Rgb& out_rgb) const {
+	auto ret = Modified{};
+	if (auto tn = TreeNode{label}) {
+		auto vec3 = out_rgb.to_vec3();
+		if (inspect_rgb("RGB", vec3)) { ret.value = true; }
+		ret(ImGui::DragFloat("Intensity", &out_rgb.intensity, 0.05f, 0.1f, 1000.0f));
+	}
+	return ret.value;
+}
+
 bool Inspector::inspect(Transform& out_transform, Bool& out_unified_scaling) const {
 	if (ImGui::CollapsingHeader("Transform", ImGuiTreeNodeFlags_DefaultOpen)) { return do_inspect(out_transform, out_unified_scaling, {true}); }
 	return false;
@@ -111,6 +139,7 @@ bool SceneInspector::inspect([[maybe_unused]] TreeNode const& node, LitMaterial&
 	auto ret = Modified{};
 	ret(ImGui::SliderFloat("Metallic", &out_material.metallic, 0.0f, 1.0f));
 	ret(ImGui::SliderFloat("Roughness", &out_material.roughness, 0.0f, 1.0f));
+	ret(inspect_rgb("Albedo", out_material.albedo));
 	if (out_material.base_colour || out_material.roughness_metallic) {
 		if (auto tn = TreeNode{"Textures"}) {
 			if (out_material.base_colour) {

lib/engine/src/scene_renderer.cpp

@@ -24,6 +24,19 @@ struct Img1x1 {
 		};
 	}
 };
+
+struct DirLightSSBO {
+	alignas(16) glm::vec3 direction{front_v};
+	alignas(16) glm::vec3 ambient{0.04f};
+	alignas(16) glm::vec3 diffuse{1.0f};
+
+	static DirLightSSBO make(DirLight const& light) {
+		return {
+			.direction = light.direction.value(),
+			.diffuse = light.rgb.to_vec4(),
+		};
+	}
+};
 } // namespace
 
 SceneRenderer::SceneRenderer(Gfx const& gfx)
@@ -51,7 +64,9 @@ void SceneRenderer::write_view(glm::vec2 const extent) {
 		.pos_v = {cam_node.transform.position(), 1.0f},
 	};
 	m_view_proj.write(&vp, sizeof(vp));
-	m_dir_lights.write(m_scene->dir_lights.data(), m_scene->dir_lights.size() * sizeof(DirLight));
+	auto dir_lights = FlexArray<DirLightSSBO, 4>{};
+	for (auto const& light : m_scene->dir_lights.span()) { dir_lights.insert(DirLightSSBO::make(light)); }
+	m_dir_lights.write(dir_lights.span().data(), dir_lights.span().size_bytes());
 }
 
 void SceneRenderer::update_view(Pipeline& out_pipeline) const {

lib/scene/include/facade/scene/lights.hpp

@@ -1,13 +1,19 @@
 #pragma once
 #include <facade/util/nvec3.hpp>
+#include <facade/util/rgb.hpp>
 
 namespace facade {
 ///
-/// \brief GPU data for directional lights.
+/// \brief Directional light.
 ///
 struct DirLight {
-	alignas(16) glm::vec3 direction{front_v};
-	alignas(16) glm::vec3 ambient{0.04f};
-	alignas(16) glm::vec3 diffuse{1.0f};
+	///
+	/// \brief Direction.
+	///
+	nvec3 direction{front_v};
+	///
+	/// \brief Colour and intensity.
+	///
+	Rgb rgb{};
 };
 } // namespace facade

lib/scene/include/facade/scene/scene.hpp

@@ -8,6 +8,7 @@
 #include <facade/scene/node.hpp>
 #include <facade/scene/node_data.hpp>
 #include <facade/util/enum_array.hpp>
+#include <facade/util/flex_array.hpp>
 #include <facade/util/image.hpp>
 #include <facade/util/ptr.hpp>
 #include <facade/util/transform.hpp>
@@ -245,7 +246,7 @@ class Scene {
 	///
 	/// \brief All the directional lights in the scene.
 	///
-	std::vector<DirLight> dir_lights{};
+	FlexArray<DirLight, 4> dir_lights{};
 
   private:
 	struct TreeBuilder;

lib/util/CMakeLists.txt

@@ -79,6 +79,7 @@ target_sources(${PROJECT_NAME} PRIVATE
   include/${target_prefix}/util/nvec3.hpp
   include/${target_prefix}/util/pinned.hpp
   include/${target_prefix}/util/ptr.hpp
+  include/${target_prefix}/util/rgb.hpp
   include/${target_prefix}/util/time.hpp
   include/${target_prefix}/util/transform.hpp
   include/${target_prefix}/util/type_id.hpp
@@ -90,5 +91,6 @@ target_sources(${PROJECT_NAME} PRIVATE
   src/data_provider.cpp
   src/image.cpp
   src/logger.cpp
+  src/rgb.cpp
   src/time.cpp
 )

lib/util/include/facade/util/rgb.hpp

@@ -0,0 +1,25 @@
+#pragma once
+#include <glm/vec3.hpp>
+#include <glm/vec4.hpp>
+
+namespace facade {
+struct Rgb {
+	glm::tvec3<std::uint8_t> channels{0xff, 0xff, 0xff};
+	float intensity{1.0f};
+
+	static constexpr float to_f32(std::uint8_t channel) { return static_cast<float>(channel) / static_cast<float>(0xff); }
+	static constexpr float to_u8(float normalized) { return static_cast<std::uint8_t>(normalized * static_cast<float>(0xff)); }
+	static glm::vec4 to_srgb(glm::vec4 const& linear);
+	static glm::vec4 to_linear(glm::vec4 const& srgb);
+
+	static constexpr Rgb make(glm::vec3 const& serialized, float intensity = 1.0f) {
+		return {
+			.channels = {to_u8(serialized.x), to_u8(serialized.y), to_u8(serialized.z)},
+			.intensity = intensity,
+		};
+	}
+
+	constexpr glm::vec3 to_vec3() const { return intensity * glm::vec3{to_f32(channels.x), to_f32(channels.y), to_f32(channels.z)}; }
+	constexpr glm::vec4 to_vec4(float alpha = 1.0f) const { return {to_vec3(), alpha}; }
+};
+} // namespace facade

lib/util/src/rgb.cpp

@@ -0,0 +1,8 @@
+#include <facade/util/rgb.hpp>
+#include <glm/gtc/color_space.hpp>
+#include <glm/mat4x4.hpp>
+
+namespace facade {
+glm::vec4 Rgb::to_srgb(glm::vec4 const& linear) { return glm::convertLinearToSRGB(linear); }
+glm::vec4 Rgb::to_linear(glm::vec4 const& srgb) { return glm::convertSRGBToLinear(srgb); }
+} // namespace facade

src/main.cpp

@@ -259,7 +259,7 @@ void run() {
 		engine->add_shader(shaders::unlit());
 
 		auto& scene = engine->scene();
-		scene.dir_lights.push_back(DirLight{.direction = glm::normalize(glm::vec3{-1.0f, -1.0f, -1.0f}), .diffuse = glm::vec3{5.0f}});
+		scene.dir_lights.insert(DirLight{.direction = glm::normalize(glm::vec3{-1.0f, -1.0f, -1.0f}), .rgb = {.intensity = 5.0f}});
 		scene.load_gltf(dj::Json::parse(test_json_v), DummyDataProvider{});
 		post_scene_load(engine->scene());
 		engine->show(true);