chore: remove lz4 as dependency

conanfile.py

@@ -29,11 +29,7 @@ class LightRecipe(ConanFile):
     }
 
     def requirements(self):
-        self.requires("imgui/1.92.0-docking")
         self.requires("entt/3.15.0")
-        self.requires("stb/cci.20240531")
-        self.requires("yaml-cpp/0.8.0")
-        self.requires("lz4/1.10.0")
 
     def layout(self):
         cmake_layout(self)

modules/asset_baker/CMakeLists.txt

@@ -5,6 +5,5 @@ add_executable_module(
 target_link_libraries(
     asset_baker
     PRIVATE asset_parser
-    PRIVATE stb::stb
     PRIVATE logger
 )

modules/asset_baker/public/bakers.hpp

@@ -7,9 +7,6 @@
 #include <string_view>
 #include <unordered_set>
 
-#define STB_IMAGE_IMPLEMENTATION
-#include <stb_image.h>
-
 namespace lt {
 
 class Loader
@@ -42,78 +39,11 @@ public:
 	    = 0;
 };
 
-
-class StbLoader: public TextureLoader
-{
-public:
-	StbLoader() = default;
-
-	void load(std::filesystem::path path);
-
-	[[nodiscard]] static auto get_supported_extensions() -> std::unordered_set<std::string_view>
-	{
-		return { ".png" };
-	}
-
-	[[nodiscard]] auto get_name() const -> std::string_view override
-	{
-		return "StbLoader";
-	}
-
-	[[nodiscard]] auto load(std::filesystem::path file_path) const
-	    -> Assets::TextureAsset::PackageData override
-	{
-		auto width = int {};
-		auto height = int {};
-		auto channels = int {};
-
-		auto *pixels = stbi_load(file_path.string().c_str(), &width, &height, &channels, 4);
-		if (!pixels)
-		{
-			throw std::runtime_error {
-				std::format("Failed to load image file at: {} using stbi_load", file_path.string()),
-			};
-		}
-
-		const auto metadata = Assets::Asset::Metadata {
-			.type = Assets::Asset::Type::Texture,
-		};
-
-		const auto texture_metadata = Assets::TextureAsset::Metadata {
-            .format = Assets::TextureAsset::Format::RGBA8,
-            .num_components = static_cast<uint32_t>(channels),
-            .pixel_size = {
-                static_cast<uint32_t>(width),
-                static_cast<uint32_t>(height),
-                {},
-            },
-        };
-
-		auto pixels_blob = Assets::Blob {};
-		pixels_blob.resize(static_cast<size_t>(width) * height * channels);
-
-		// TODO(Light): figure out if it's possible to directly populate a blob with stbi functions
-		memcpy(pixels_blob.data(), pixels, pixels_blob.size());
-		stbi_image_free(pixels);
-
-		return Assets::TextureAsset::PackageData {
-			.metadata = metadata,
-			.texture_metadata = texture_metadata,
-			.pixels = std::move(pixels_blob),
-		};
-	}
-};
-
 class TextureLoaderFactory
 {
 public:
 	static auto create(std::string_view file_extension) -> std::unique_ptr<TextureLoader>
 	{
-		if (StbLoader::get_supported_extensions().contains(file_extension))
-		{
-			return std::make_unique<StbLoader>();
-		}
-
 		return {};
 	}
 };

modules/asset_parser/CMakeLists.txt

@@ -6,6 +6,5 @@ add_library_module(asset_parser
 
 target_link_libraries(
     asset_parser
-    PRIVATE LZ4::lz4_static 
     PRIVATE logger
 )

modules/asset_parser/private/assets/text.cpp

@@ -1,5 +1,4 @@
 #include <asset_parser/assets/text.hpp>
-#include <lz4.h>
 
 namespace Assets {
 

modules/asset_parser/private/assets/texture.cpp

@@ -1,5 +1,4 @@
 #include <asset_parser/assets/texture.hpp>
-#include <lz4.h>
 
 namespace Assets {
 

modules/asset_parser/private/parser.cpp

@@ -1,62 +1,5 @@
 #include <asset_parser/parser.hpp>
-#include <format>
-#include <fstream>
-#include <utility>
 
 namespace Assets {
 
-// void Asset::unpack(std::byte *destination)
-// {
-// 	if (!m_stream.is_open())
-// 	{
-// 		throw std::logic_error {
-// 			"Failed to unpack asset: "
-// 			"ifstream is closed",
-// 		};
-// 	}
-//
-// 	switch (m_metadata.blob_compression_type)
-// 	{
-// 	case CompressionType::None:
-// 		if (m_metadata.packed_size != m_metadata.unpacked_size)
-// 		{
-// 			throw std::logic_error {
-// 				"Failed to unpack asset: "
-// 				"compression type set to none but packed/unpacked sizes differ",
-// 			};
-// 		}
-//
-// 		m_stream.read(
-// 		    std::bit_cast<char *>(destination),
-// 		    static_cast<long>(m_metadata.packed_size)
-// 		);
-// 		m_stream.close();
-//
-// 	case CompressionType::LZ4:
-// 		m_stream.close();
-// 		throw std::logic_error {
-// 			"Failed to unpack asset: "
-// 			"LZ4 compression is not implemented yet",
-// 		};
-//
-//
-// 	case CompressionType::LZ4HC:
-// 		m_stream.close();
-// 		throw std::logic_error {
-// 			"Failed to unpack asset: "
-// 			"LZ4HC compression is not implemented yet",
-// 		};
-//
-// 	default:
-// 		m_stream.close();
-// 		throw std::logic_error {
-// 			std::format(
-// 			    "Failed to unpack asset: "
-// 			    "Compression type was not recognized: {}",
-// 			    std::to_underlying(m_metadata.blob_compression_type)
-// 			),
-// 		};
-// 	}
-// }
-
 } // namespace Assets

modules/ecs/CMakeLists.txt

@@ -1,4 +1,2 @@
 add_library_module(ecs entity.cpp scene.cpp uuid.cpp)
-target_link_libraries(ecs 
+target_link_libraries(ecs PUBLIC logger lt_debug EnTT::EnTT camera math)
-    PUBLIC logger lt_debug EnTT::EnTT camera math
-)

modules/ecs/private/serializer.cpp

@@ -1,325 +0,0 @@
-#include <asset_manager/asset_manager.hpp>
-#include <camera/component.hpp>
-#include <ecs/components.hpp>
-#include <ecs/serializer.hpp>
-#include <math/vec3.hpp>
-#include <math/vec4.hpp>
-#include <yaml-cpp/yaml.h>
-
-namespace YAML {
-
-template<>
-struct convert<lt::math::vec3>
-{
-	static auto encode(const lt::math::vec3 &rhs) -> Node
-	{
-		auto node = Node {};
-		node.push_back(rhs.x);
-		node.push_back(rhs.y);
-		node.push_back(rhs.z);
-		return node;
-	}
-
-	static auto decode(const Node &node, lt::math::vec3 &rhs) -> bool
-	{
-		if (!node.IsSequence() || node.size() != 3)
-		{
-			return false;
-		}
-
-		rhs.x = node[0].as<float>();
-		rhs.y = node[1].as<float>();
-		rhs.z = node[2].as<float>();
-		return true;
-	}
-};
-
-template<>
-struct convert<lt::math::vec4>
-{
-	static auto encode(const lt::math::vec4 &rhs) -> Node
-	{
-		auto node = Node {};
-		node.push_back(rhs.x);
-		node.push_back(rhs.y);
-		node.push_back(rhs.z);
-		node.push_back(rhs.w);
-		return node;
-	}
-
-	static auto decode(const Node &node, lt::math::vec4 &rhs) -> bool
-	{
-		if (!node.IsSequence() || node.size() != 4)
-		{
-			return false;
-		}
-
-		rhs.x = node[0].as<float>();
-		rhs.y = node[1].as<float>();
-		rhs.z = node[2].as<float>();
-		rhs.w = node[3].as<float>();
-		return true;
-	}
-};
-} // namespace YAML
-
-namespace lt {
-
-auto operator<<(YAML::Emitter &out, const math::vec3 &v) -> YAML::Emitter &
-{
-	out << YAML::Flow;
-	out << YAML::BeginSeq << v.x << v.y << v.z << YAML::EndSeq;
-	return out;
-}
-
-auto operator<<(YAML::Emitter &out, const math::vec4 &v) -> YAML::Emitter &
-{
-	out << YAML::Flow;
-	out << YAML::BeginSeq << v.x << v.y << v.z << v.w << YAML::EndSeq;
-	return out;
-}
-
-SceneSerializer::SceneSerializer(const Ref<Scene> &scene): m_scene(scene)
-{
-}
-
-void SceneSerializer::serialize(const std::string &filePath)
-{
-	auto out = YAML::Emitter {};
-	out << YAML::BeginMap; // Scene
-	out << YAML::Key << "Scene" << YAML::Value << "Untitled";
-
-	out << YAML::Key << "Entities" << YAML::Value << YAML::BeginSeq;
-	for (auto [entityID, storage] : m_scene->m_registry.storage())
-	{
-		auto entity = Entity { static_cast<entt::entity>(entityID), m_scene.get() };
-		if (!entity.is_valid())
-		{
-			return;
-		}
-
-		serialize_entity(out, entity);
-	};
-	out << YAML::EndSeq;
-	out << YAML::EndMap;
-
-	std::filesystem::create_directories(filePath.substr(0ull, filePath.find_last_of('\\')));
-
-	auto fout = std::ofstream { filePath };
-	if (!fout.is_open())
-	{
-		log_trc("Failed to create fout at: {}", filePath);
-	}
-
-	fout << out.c_str();
-}
-
-auto SceneSerializer::deserialize(const std::string &file_path) -> bool
-{
-	auto stream = std::ifstream { file_path };
-	auto ss = std::stringstream {};
-	ss << stream.rdbuf();
-
-	auto data = YAML::Load(ss.str());
-	if (!data["Scene"])
-	{
-		return false;
-	}
-
-	auto sceneName = data["Scene"].as<std::string>();
-	log_trc("Deserializing scene: '{}'", sceneName);
-
-	auto entities = data["Entities"];
-	if (entities)
-	{
-		auto texturePaths = std::unordered_set<std::string> {};
-
-		for (auto entity : entities)
-		{
-			auto uuid = entity["entity"].as<uint64_t>(); // #todo
-
-			auto name = std::string {};
-			auto tagComponent = entity["TagComponent"];
-			if (tagComponent)
-			{
-				name = tagComponent["Tag"].as<std::string>();
-			}
-
-			log_trc("Deserialized entity '{}' : '{}'", uuid, name);
-
-			auto deserializedEntity = m_scene->create_entity_with_uuid(name, uuid);
-
-			auto gg = deserializedEntity.get_component<TagComponent>();
-			log_trc("tag: {}", gg.tag);
-			auto transformComponent = entity["TransformComponent"];
-			if (transformComponent)
-			{
-				auto &entityTransforomComponent = deserializedEntity
-				                                      .get_component<TransformComponent>();
-
-				entityTransforomComponent.translation = transformComponent["Translation"]
-				                                            .as<math::vec3>();
-				entityTransforomComponent.rotation = transformComponent["Rotation"]
-				                                         .as<math::vec3>();
-				entityTransforomComponent.scale = transformComponent["Scale"].as<math::vec3>();
-			}
-
-			/* #TEMPORARY SOLUTION# */
-			auto spriteRendererComponent = entity["SpriteRendererComponent"];
-			if (spriteRendererComponent)
-			{
-				auto &entitySpriteRendererComponent = deserializedEntity
-				                                          .add_component<SpriteRendererComponent>();
-				entitySpriteRendererComponent.tint = spriteRendererComponent["Tint"]
-				                                         .as<math::vec4>();
-
-				auto texturePath = spriteRendererComponent["Texture"].as<std::string>();
-
-				if (!texturePaths.contains(texturePath))
-				{
-					AssetManager::load_texture(texturePath, texturePath);
-					texturePaths.insert(texturePath);
-				}
-
-				entitySpriteRendererComponent.texture = AssetManager::get_texture(texturePath);
-			}
-			/* #TEMPORARY SOLUTION# */
-
-			auto cameraComponent = entity["CameraComponent"];
-			if (cameraComponent)
-			{
-				auto &entityCameraComponent = deserializedEntity.add_component<CameraComponent>();
-
-				const auto &cameraSpecifications = cameraComponent["Camera"];
-				entityCameraComponent.camera.set_projection_type(
-				    (SceneCamera::ProjectionType)cameraSpecifications["ProjectionType"].as<int>()
-				);
-
-				entityCameraComponent.camera.set_orthographic_size(
-				    cameraSpecifications["OrthographicSize"].as<float>()
-				);
-				entityCameraComponent.camera.set_orthographic_near_plane(
-				    cameraSpecifications["OrthographicNearPlane"].as<float>()
-				);
-				entityCameraComponent.camera.set_orthographic_far_plane(
-				    cameraSpecifications["OrthographicFarPlane"].as<float>()
-				);
-
-				entityCameraComponent.camera.set_perspective_vertical_fov(
-				    cameraSpecifications["PerspectiveVerticalFOV"].as<float>()
-				);
-				entityCameraComponent.camera.set_perspective_near_plane(
-				    cameraSpecifications["PerspectiveNearPlane"].as<float>()
-				);
-				entityCameraComponent.camera.set_perspective_far_plane(
-				    cameraSpecifications["PerspectiveFarPlane"].as<float>()
-				);
-
-				entityCameraComponent.camera.set_background_color(
-				    cameraSpecifications["BackgroundColor"].as<math::vec4>()
-				);
-
-				entityCameraComponent.isPrimary = cameraComponent["IsPrimary"].as<bool>();
-			}
-		}
-
-		return true;
-	}
-
-	return false;
-}
-
-void SceneSerializer::serialize_binary(const std::string & /*filePath*/)
-{
-	log_err("NO_IMPLEMENT");
-}
-
-auto SceneSerializer::deserialize_binary(const std::string & /*filePath*/) -> bool
-{
-	log_err("NO_IMPLEMENT");
-	return false;
-}
-
-void SceneSerializer::serialize_entity(YAML::Emitter &out, Entity entity)
-{
-	out << YAML::BeginMap;                                            // entity
-	out << YAML::Key << "entity" << YAML::Value << entity.get_uuid(); // dummy uuid
-
-	if (entity.has_component<TagComponent>())
-	{
-		out << YAML::Key << "TagComponent";
-		out << YAML::BeginMap; // tag component
-
-		auto &tagComponent = entity.get_component<TagComponent>().tag;
-		out << YAML::Key << "Tag" << YAML::Value << tagComponent;
-
-		out << YAML::EndMap; // tag component
-	}
-
-	if (entity.has_component<TransformComponent>())
-	{
-		out << YAML::Key << "TransformComponent";
-		out << YAML::BeginMap; // transform component
-
-		auto &transformComponent = entity.get_component<TransformComponent>();
-
-		out << YAML::Key << "Translation" << YAML::Value << transformComponent.translation;
-		out << YAML::Key << "Rotation" << YAML::Value << transformComponent.rotation;
-		out << YAML::Key << "Scale" << YAML::Value << transformComponent.scale;
-
-		out << YAML::EndMap; // transform component;
-	}
-
-	if (entity.has_component<SpriteRendererComponent>())
-	{
-		// TODO(Light): get scene serialization/de-serialization working.
-		// out << YAML::Key << "SpriteRendererComponent";
-		// out << YAML::BeginMap; // sprite renderer component;
-
-		// auto &spriteRendererComponent = entity.get_component<SpriteRendererComponent>();
-
-		// out << YAML::Key << "Texture" << YAML::Value
-		//     << spriteRendererComponent.texture->GetFilePath();
-		// out << YAML::Key << "Tint" << YAML::Value << spriteRendererComponent.tint;
-
-		// out << YAML::EndMap; // sprite renderer component
-	}
-
-	// #todo:
-	// if(entity.has_component<NativeScriptComponent>())
-
-	if (entity.has_component<CameraComponent>())
-	{
-		out << YAML::Key << "CameraComponent";
-		out << YAML::BeginMap; // camera component
-
-		auto &cameraComponent = entity.get_component<CameraComponent>();
-
-		out << YAML::Key << "Camera" << YAML::Value;
-		out << YAML::BeginMap; // camera
-		out << YAML::Key << "OrthographicSize" << YAML::Value
-		    << cameraComponent.camera.get_orthographic_size();
-		out << YAML::Key << "OrthographicFarPlane" << YAML::Value
-		    << cameraComponent.camera.get_orthographic_far_plane();
-		out << YAML::Key << "OrthographicNearPlane" << YAML::Value
-		    << cameraComponent.camera.get_orthographic_near_plane();
-		out << YAML::Key << "PerspectiveVerticalFOV" << YAML::Value
-		    << cameraComponent.camera.get_perspective_vertical_fov();
-		out << YAML::Key << "PerspectiveFarPlane" << YAML::Value
-		    << cameraComponent.camera.get_perspective_far_plane();
-		out << YAML::Key << "PerspectiveNearPlane" << YAML::Value
-		    << cameraComponent.camera.get_perspective_near_plane();
-		out << YAML::Key << "ProjectionType" << YAML::Value
-		    << (int)cameraComponent.camera.get_projection_type();
-		out << YAML::Key << "BackgroundColor" << YAML::Value
-		    << cameraComponent.camera.get_background_color();
-		out << YAML::EndMap; // camera
-
-		out << YAML::Key << "IsPrimary" << YAML::Value << cameraComponent.isPrimary;
-
-		out << YAML::EndMap; // camera component
-	}
-	out << YAML::EndMap; // entity
-}
-
-} // namespace lt

modules/ecs/public/serializer.hpp

@@ -1,34 +0,0 @@
-#pragma once
-
-#include <ecs/entity.hpp>
-#include <ecs/scene.hpp>
-
-namespace YAML {
-
-class Emitter;
-
-}
-
-namespace lt {
-
-class SceneSerializer
-{
-public:
-	SceneSerializer(const Ref<Scene> &scene);
-
-	void serialize(const std::string &filePath);
-
-	auto deserialize(const std::string &file_path) -> bool;
-
-	void serialize_binary(const std::string &file_path);
-
-	auto deserialize_binary(const std::string &file_path) -> bool;
-
-private:
-	Ref<Scene> m_scene;
-
-	void serialize_entity(YAML::Emitter &out, Entity entity);
-};
-
-
-} // namespace lt

modules/renderer/CMakeLists.txt

@@ -30,7 +30,6 @@ target_link_libraries(
   PUBLIC logger
   PUBLIC imgui
   PUBLIC asset_parser
-  PUBLIC yaml-cpp::yaml-cpp
   PUBLIC EnTT::EnTT
   PRIVATE lt_debug 
   PRIVATE window

tools/cmake/dependencies.cmake

@@ -1,4 +1 @@
-find_package(stb REQUIRED)
-find_package(yaml-cpp REQUIRED)
 find_package(EnTT REQUIRED)
-find_package(lz4 REQUIRED)