From a25e3551440ca47fe3268eb6d39a2bd036b8d84d Mon Sep 17 00:00:00 2001
From: unknown <eldarmuradov1234@gmail.com>
Date: Tue, 18 Feb 2025 22:37:53 +0300
Subject: [PATCH] assets compiler and input splitting

---
 .255.cache.bin                                | Bin 0 -> 28 bytes
 CMakeLists.txt                                |   1 +
 apps/assets_compiler/CMakeLists.txt           |  12 ++
 apps/assets_compiler/src/compiler/main.cpp    |  90 +++++++++++
 apps/editor/CMakeLists.txt                    |   4 +
 apps/editor/src/editor/editor_init_system.cpp |  68 +++++++++
 apps/editor/src/editor/editor_init_system.h   |  18 +++
 .../src/game/game_init_system.cpp             |  31 ++--
 apps/example_game/src/game/game_init_system.h |   2 +-
 .../game/movement/private/movement_system.cpp |   4 +-
 .../game/movement/private/movement_system.h   |   6 -
 modules/core/src/asset/bin.cpp                |   4 +-
 modules/core/src/asset/bin.h                  |  14 ++
 modules/core/src/asset/fbx.cpp                |   3 +-
 modules/core/src/asset/image.cpp              |   2 +-
 modules/core/src/asset/image.h                |   2 +-
 modules/core/src/asset/model_asset.cpp        |   8 +-
 modules/core/src/asset/model_asset.h          |   2 +-
 modules/core/src/asset/obj.cpp                |   3 +-
 .../src/core/ecs/camera_holder_component.h    |   2 -
 .../src/core/ecs/input_reciever_component.h   |   1 +
 ...t_component.h => input_sender_component.h} |  17 ++-
 .../src/core/ecs/private/camera_system.cpp    |  27 ++--
 .../core/src/core/ecs/private/camera_system.h |   2 -
 .../core/ecs/private/input_root_component.cpp |  40 -----
 .../ecs/private/input_sender_component.cpp    |  65 ++++++++
 .../src/core/ecs/private/input_system.cpp     | 144 ++++++++----------
 .../core/src/core/ecs/private/input_system.h  |   2 -
 modules/core/src/core/fps_limiter.cpp         |  52 +++++++
 modules/core/src/core/fps_limiter.h           |  33 ++++
 modules/core/src/core/string.h                |   9 ++
 modules/core/src/dx/dx_texture.cpp            |  28 ++--
 modules/core/src/dx/dx_texture.h              |  15 +-
 .../core/src/ecs/rendering/mesh_component.h   |   3 +-
 modules/core/src/engine/private/engine.cpp    |   5 +-
 modules/core/src/geometry/mesh.cpp            |  20 ++-
 modules/core/src/geometry/mesh.h              |  16 +-
 modules/core/src/geometry/mesh_builder.h      |  30 ++--
 .../rendering/ecs/private/render_system.cpp   |  91 +----------
 .../src/rendering/ecs/private/render_system.h |   2 -
 .../ecs/renderer_holder_root_component.h      |   4 +
 modules/core/src/rendering/pbr_material.cpp   |  10 +-
 modules/core/src/rendering/pbr_material.h     |   7 +-
 modules/physics/CMakeLists.txt                |   5 +
 tools/assets_compiler/assets_compiler.py      |  17 +++
 tools/python_requirements.txt                 |   3 +-
 46 files changed, 598 insertions(+), 326 deletions(-)
 create mode 100644 .255.cache.bin
 create mode 100644 apps/assets_compiler/CMakeLists.txt
 create mode 100644 apps/assets_compiler/src/compiler/main.cpp
 create mode 100644 apps/editor/src/editor/editor_init_system.cpp
 create mode 100644 apps/editor/src/editor/editor_init_system.h
 create mode 100644 modules/core/src/asset/bin.h
 rename modules/core/src/core/ecs/{input_root_component.h => input_sender_component.h} (51%)
 delete mode 100644 modules/core/src/core/ecs/private/input_root_component.cpp
 create mode 100644 modules/core/src/core/ecs/private/input_sender_component.cpp
 create mode 100644 modules/core/src/core/fps_limiter.cpp
 create mode 100644 modules/core/src/core/fps_limiter.h

diff --git a/.255.cache.bin b/.255.cache.bin
new file mode 100644
index 0000000000000000000000000000000000000000..43721a4a68a5a7fdd893103a60c142f9497f077a
GIT binary patch
literal 28
VcmY%J^K@clU|=`{1V9P}0030N1S<dl

literal 0
HcmV?d00001

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 062c6a1f2..580741eae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,6 +18,7 @@ add_subdirectory(modules/physics)
 
 add_subdirectory(apps/editor)
 add_subdirectory(apps/example_game)
+add_subdirectory(apps/assets_compiler)
 
 era_add_deploy_target(editor)
 era_add_deploy_target(example_game)
diff --git a/apps/assets_compiler/CMakeLists.txt b/apps/assets_compiler/CMakeLists.txt
new file mode 100644
index 000000000..a6fc7163f
--- /dev/null
+++ b/apps/assets_compiler/CMakeLists.txt
@@ -0,0 +1,12 @@
+include(${CMAKE_SOURCE_DIR}/cmake/common.cmake)
+
+era_begin(assets_compiler "APP")
+    require_thirdparty_module(assets_compiler EnTT)
+    require_thirdparty_module(assets_compiler yaml-cpp)
+    require_thirdparty_module(assets_compiler rttr_core)
+    require_thirdparty_module(assets_compiler DirectXTex)
+    require_module(assets_compiler base)
+    require_module(assets_compiler core)
+
+    target_include_directories(assets_compiler PUBLIC modules/thirdparty-imgui/imgui)
+era_end(assets_compiler)
\ No newline at end of file
diff --git a/apps/assets_compiler/src/compiler/main.cpp b/apps/assets_compiler/src/compiler/main.cpp
new file mode 100644
index 000000000..e946b3459
--- /dev/null
+++ b/apps/assets_compiler/src/compiler/main.cpp
@@ -0,0 +1,90 @@
+// Copyright (c) 2023-present Eldar Muradov. All rights reserved.
+#include <fstream>
+#include <iostream>
+
+#include <clara/clapa.hpp>
+
+#include <asset/bin.h>
+#include <asset/model_asset.h>
+
+#include <core/log.h>
+#include <core/string.h>
+
+int main(int argc, char** argv)
+{
+	using namespace era_engine;
+	using namespace clara;
+
+	try
+	{
+		fs::path path;
+		bool verbose = false;
+
+		Parser cli;
+		cli += Opt(verbose, "verbose")["-v"]["--verbose"]("Enable verbose logging");
+		cli += Opt(path, "path")["-p"]["--path"]("Path to asset");
+
+		auto result = cli.parse(Args(argc, argv));
+		if (!result)
+		{
+			std::cerr << "Error in command line: " << result.errorMessage() << std::endl;
+		}
+
+		path = get_full_path(path);
+
+		if (!fs::exists(path))
+		{
+			std::cerr << "Could not find file '" << path << "'.\n";
+			return EXIT_FAILURE;
+		}
+
+		std::string extension = path.extension().string();
+
+		fs::path cached_filename = path;
+		cached_filename.replace_extension("." + std::to_string(mesh_flag_default) + ".cache.bin");
+		fs::path cache_filepath = L"asset_cache" / cached_filename;
+
+		if (fs::exists(cache_filepath))
+		{
+			auto last_cache_write_time = fs::last_write_time(cache_filepath);
+			auto last_original_write_time = fs::last_write_time(path);
+
+			if (last_cache_write_time > last_original_write_time)
+			{
+				std::cout << "Asset is already compiled! \n";
+				return EXIT_SUCCESS;
+			}
+		}
+
+		std::cout << "Preprocessing asset '" << path << "' for faster loading next time.\n";
+
+		ModelAsset result_mesh;
+
+		std::transform(extension.begin(), extension.end(), extension.begin(),
+			[](char c) { return std::tolower(c); });
+		if (extension == ".fbx")
+		{
+			result_mesh = loadFBX(path, mesh_flag_default);
+		}
+		else if (extension == ".obj")
+		{
+			result_mesh = loadOBJ(path, mesh_flag_default);
+		}
+
+		fs::create_directories(cache_filepath.parent_path());
+		writeBIN(result_mesh, cache_filepath);
+	}
+	catch (const std::exception& ex)
+	{
+		std::cerr << ex.what() << "\n";
+
+		std::ofstream output("logs/compiler_error_log.txt");
+		output << "Runtime Error>" << ex.what() << std::endl;
+		output.close();
+
+		std::this_thread::sleep_for(std::chrono::duration<float>(5000.0f));
+		return EXIT_FAILURE;
+	}
+
+	return EXIT_SUCCESS;
+}
\ No newline at end of file
diff --git a/apps/editor/CMakeLists.txt b/apps/editor/CMakeLists.txt
index 00158832e..d2ad66fb7 100644
--- a/apps/editor/CMakeLists.txt
+++ b/apps/editor/CMakeLists.txt
@@ -1,6 +1,10 @@
 include(${CMAKE_SOURCE_DIR}/cmake/common.cmake)
 
 era_begin(editor "APP")
+    require_thirdparty_module(editor EnTT)
+    require_thirdparty_module(editor yaml-cpp)
+    require_thirdparty_module(editor rttr_core)
+    require_thirdparty_module(editor DirectXTex)
     require_module(editor base)
     require_module(editor core)
     require_module(editor physics)
diff --git a/apps/editor/src/editor/editor_init_system.cpp b/apps/editor/src/editor/editor_init_system.cpp
new file mode 100644
index 000000000..0fdbd38ab
--- /dev/null
+++ b/apps/editor/src/editor/editor_init_system.cpp
@@ -0,0 +1,68 @@
+#include "editor/editor_init_system.h"
+
+#include <core/ecs/input_reciever_component.h>
+#include <core/ecs/input_sender_component.h>
+#include <core/string.h>
+
+#include <rendering/mesh_shader.h>
+#include <rendering/ecs/renderer_holder_root_component.h>
+
+#include <ecs/update_groups.h>
+#include <ecs/base_components/transform_component.h>
+#include <ecs/rendering/world_renderer.h>
+#include <ecs/rendering/scene_rendering.h>
+#include <core/ecs/camera_holder_component.h>
+#include <ecs/rendering/mesh_component.h>
+
+#include <audio/audio.h>
+
+#include <terrain/terrain.h>
+
+#include <animation/skinning.h>
+
+#include <rttr/policy.h>
+#include <rttr/registration>
+
+namespace era_engine
+{
+	RTTR_REGISTRATION
+	{
+		using namespace rttr;
+
+		registration::class_<EditorInitSystem>("GameInitSystem")
+			.constructor<World*>()(policy::ctor::as_raw_ptr)
+			.method("update", &EditorInitSystem::update)(metadata("update_group", update_types::BEGIN));
+	}
+
+	EditorInitSystem::EditorInitSystem(World* _world)
+		: System(_world)
+	{
+	}
+
+	EditorInitSystem::~EditorInitSystem()
+	{
+	}
+
+	void EditorInitSystem::init()
+	{
+		RendererHolderRootComponent* renderer_holder_rc = world->add_root_component<RendererHolderRootComponent>();
+		ASSERT(renderer_holder_rc != nullptr);
+
+		Entity camera_entity = world->create_entity("CameraEntity");
+		camera_entity.add_component<CameraHolderComponent>()
+					 .add_component<InputRecieverComponent>()
+					 .add_component<InputSenderComponent>();
+
+		CameraHolderComponent& camera_holder_component = camera_entity.get_component<CameraHolderComponent>();
+		camera_holder_component.set_camera_type(CameraHolderComponent::FREE_CAMERA);
+		camera_holder_component.set_render_camera(&renderer_holder_rc->camera);
+
+		camera_entity.get_component<InputSenderComponent>().add_reciever(camera_entity.get_component_if_exists<InputRecieverComponent>());
+	}
+
+	void EditorInitSystem::update(float dt)
+	{
+		
+	}
+
+}
\ No newline at end of file
diff --git a/apps/editor/src/editor/editor_init_system.h b/apps/editor/src/editor/editor_init_system.h
new file mode 100644
index 000000000..4290d8a47
--- /dev/null
+++ b/apps/editor/src/editor/editor_init_system.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include <ecs/system.h>
+
+namespace era_engine
+{
+
+	class EditorInitSystem final : public System
+	{
+	public:
+		EditorInitSystem(World* _world);
+		~EditorInitSystem();
+
+		void init() override;
+		void update(float dt) override;
+		ERA_VIRTUAL_REFLECT(System)
+	};
+}
\ No newline at end of file
diff --git a/apps/example_game/src/game/game_init_system.cpp b/apps/example_game/src/game/game_init_system.cpp
index f89d4c826..dd30d5192 100644
--- a/apps/example_game/src/game/game_init_system.cpp
+++ b/apps/example_game/src/game/game_init_system.cpp
@@ -1,24 +1,25 @@
 #include "game/game_init_system.h"
 
 #include <core/ecs/input_reciever_component.h>
+#include <core/ecs/input_sender_component.h>
 #include <core/string.h>
-		 
+
 #include <rendering/mesh_shader.h>
 #include <rendering/ecs/renderer_holder_root_component.h>
-		 
+
 #include <ecs/update_groups.h>
 #include <ecs/base_components/transform_component.h>
 #include <ecs/rendering/world_renderer.h>
 #include <ecs/rendering/scene_rendering.h>
 #include <core/ecs/camera_holder_component.h>
 #include <ecs/rendering/mesh_component.h>
-		 
+
 #include <game/movement/movement_component.h>
-		 
+
 #include <audio/audio.h>
-		 
+
 #include <terrain/terrain.h>
-		 
+
 #include <animation/skinning.h>
 
 #include <rttr/policy.h>
@@ -49,14 +50,19 @@ namespace era_engine
 		RendererHolderRootComponent* renderer_holder_rc = world->add_root_component<RendererHolderRootComponent>();
 		ASSERT(renderer_holder_rc != nullptr);
 
-		Entity camera_entity = world->create_entity("Entity1");
-		camera_entity.add_component<CameraHolderComponent>().add_component<InputRecieverComponent>().add_component<MovementComponent>();
-		camera_entity.get_component<CameraHolderComponent>().set_camera_type(CameraHolderComponent::ATTACHED_TO_TRS);
-		camera_entity.get_component<CameraHolderComponent>().set_render_camera(&renderer_holder_rc->camera);
+		Entity camera_entity = world->create_entity("CameraEntity");
+		camera_entity.add_component<CameraHolderComponent>()
+					 .add_component<InputSenderComponent>()
+					 .add_component<InputRecieverComponent>()
+					 .add_component<MovementComponent>();
+
+		CameraHolderComponent& camera_holder_component = camera_entity.get_component<CameraHolderComponent>();
+		camera_holder_component.set_camera_type(CameraHolderComponent::ATTACHED_TO_TRS);
+		camera_holder_component.set_render_camera(&renderer_holder_rc->camera);
 
-		Entity entity2 = world->create_entity("Entity2");
+		camera_entity.get_component<InputSenderComponent>().add_reciever(camera_entity.get_component_if_exists<InputRecieverComponent>());
 
-#if 0
+#if 1
 		auto defaultmat = createPBRMaterialAsync({ "", "" });
 		defaultmat->shader = pbr_material_shader_double_sided;
 
@@ -88,6 +94,7 @@ namespace era_engine
 		{
 			auto& en = world->create_entity("Veribot")
 				.add_component<animation::AnimationComponent>()
+				.add_component<animation::SkeletonComponent>()
 				.add_component<MeshComponent>(mesh);
 
 			TransformComponent& transform_component = en.get_component<TransformComponent>();
diff --git a/apps/example_game/src/game/game_init_system.h b/apps/example_game/src/game/game_init_system.h
index 0d4bf130c..5e0a362f1 100644
--- a/apps/example_game/src/game/game_init_system.h
+++ b/apps/example_game/src/game/game_init_system.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "ecs/system.h"
+#include <ecs/system.h>
 
 namespace era_engine
 {
diff --git a/apps/example_game/src/game/movement/private/movement_system.cpp b/apps/example_game/src/game/movement/private/movement_system.cpp
index b625a4b45..1f7d8314f 100644
--- a/apps/example_game/src/game/movement/private/movement_system.cpp
+++ b/apps/example_game/src/game/movement/private/movement_system.cpp
@@ -2,7 +2,7 @@
 #include <game/movement/movement_component.h>
 		 
 #include <core/ecs/input_reciever_component.h>
-#include <core/ecs/input_root_component.h>
+#include <core/ecs/input_sender_component.h>
 #include <core/ecs/camera_holder_component.h>
 
 #include <ecs/update_groups.h>
@@ -26,8 +26,6 @@ namespace era_engine
 	MovementSystem::MovementSystem(World* _world)
 		: System(_world)
 	{
-		input_rc = world->add_root_component<InputRootComponent>();
-		ASSERT(input_rc != nullptr);
 	}
 
 	MovementSystem::~MovementSystem()
diff --git a/apps/example_game/src/game/movement/private/movement_system.h b/apps/example_game/src/game/movement/private/movement_system.h
index cc511de2a..3e0ef9ba0 100644
--- a/apps/example_game/src/game/movement/private/movement_system.h
+++ b/apps/example_game/src/game/movement/private/movement_system.h
@@ -4,9 +4,6 @@
 
 namespace era_engine
 {
-	class InputRootComponent;
-	class MovementComponent;
-
 	class MovementSystem final : public System
 	{
 	public:
@@ -19,8 +16,5 @@ namespace era_engine
 		void reset_input(float dt);
 
 		ERA_VIRTUAL_REFLECT(System)
-
-	private:
-		InputRootComponent* input_rc = nullptr;
 	};
 }
\ No newline at end of file
diff --git a/modules/core/src/asset/bin.cpp b/modules/core/src/asset/bin.cpp
index 0eb4be803..956382c58 100644
--- a/modules/core/src/asset/bin.cpp
+++ b/modules/core/src/asset/bin.cpp
@@ -1,5 +1,7 @@
 // Copyright (c) 2023-present Eldar Muradov. All rights reserved.
 
+#include "asset/bin.h"
+
 #include "asset/model_asset.h"
 #include "asset/io.h"
 
@@ -359,7 +361,7 @@ namespace era_engine
 		return result;
 	}
 
-	NODISCARD ModelAsset loadBIN(const fs::path& path)
+	ModelAsset loadBIN(const fs::path& path)
 	{
 		PROFILE("Loading BIN");
 
diff --git a/modules/core/src/asset/bin.h b/modules/core/src/asset/bin.h
new file mode 100644
index 000000000..0d62584ee
--- /dev/null
+++ b/modules/core/src/asset/bin.h
@@ -0,0 +1,14 @@
+#pragma once 
+
+#include "core_api.h"
+
+namespace era_engine
+{
+	struct ModelAsset;
+
+	ERA_CORE_API void writeBIN(const ModelAsset& asset, const fs::path& path);
+
+	ERA_CORE_API ModelAsset loadFBX(const fs::path& path, uint32 flags);
+	ERA_CORE_API ModelAsset loadOBJ(const fs::path& path, uint32 flags);
+	ERA_CORE_API ModelAsset loadBIN(const fs::path& path);
+}
\ No newline at end of file
diff --git a/modules/core/src/asset/fbx.cpp b/modules/core/src/asset/fbx.cpp
index f9f38670b..2b4fb2051 100644
--- a/modules/core/src/asset/fbx.cpp
+++ b/modules/core/src/asset/fbx.cpp
@@ -1,5 +1,6 @@
 // Copyright (c) 2023-present Eldar Muradov. All rights reserved.
 
+#include "asset/bin.h"
 #include "asset/deflate.h"
 #include "asset/io.h"
 #include "asset/model_asset.h"
@@ -2004,7 +2005,7 @@ namespace era_engine
 		return 0;
 	}
 
-	NODISCARD ModelAsset loadFBX(const fs::path& path, uint32 flags)
+	ModelAsset loadFBX(const fs::path& path, uint32 flags)
 	{
 		std::string pathStr = path.string();
 		const char* s = pathStr.c_str();
diff --git a/modules/core/src/asset/image.cpp b/modules/core/src/asset/image.cpp
index b1390a185..9f3f5eaff 100644
--- a/modules/core/src/asset/image.cpp
+++ b/modules/core/src/asset/image.cpp
@@ -422,7 +422,7 @@ namespace era_engine
 		return true;
 	}
 
-	bool saveImageToFile(const fs::path& filepath, DirectX::Image image)
+	bool saveImageToFile(const fs::path& filepath, const DirectX::Image& image)
 	{
 		fs::path extension = filepath.extension();
 
diff --git a/modules/core/src/asset/image.h b/modules/core/src/asset/image.h
index ed89edee2..b1ffe0b20 100644
--- a/modules/core/src/asset/image.h
+++ b/modules/core/src/asset/image.h
@@ -48,7 +48,7 @@ namespace era_engine
 	bool loadImageFromFile(const fs::path& filepath, uint32 flags, DirectX::ScratchImage& scratchImage, D3D12_RESOURCE_DESC& textureDesc);
 	bool loadSVGFromFile(const fs::path& filepath, uint32 flags, DirectX::ScratchImage& scratchImage, D3D12_RESOURCE_DESC& textureDesc);
 
-	bool saveImageToFile(const fs::path& filepath, DirectX::Image image);
+	bool saveImageToFile(const fs::path& filepath, const DirectX::Image& image);
 
 	NODISCARD inline constexpr bool isUAVCompatibleFormat(DXGI_FORMAT format)
 	{
diff --git a/modules/core/src/asset/model_asset.cpp b/modules/core/src/asset/model_asset.cpp
index de4c894b4..a50f0cecf 100644
--- a/modules/core/src/asset/model_asset.cpp
+++ b/modules/core/src/asset/model_asset.cpp
@@ -1,5 +1,6 @@
 // Copyright (c) 2023-present Eldar Muradov. All rights reserved.
 
+#include "asset/bin.h"
 #include "asset/model_asset.h"
 #include "core/log.h"
 
@@ -7,12 +8,7 @@
 
 namespace era_engine
 {
-	NODISCARD ModelAsset loadFBX(const fs::path& path, uint32 flags);
-	NODISCARD ModelAsset loadOBJ(const fs::path& path, uint32 flags);
-	NODISCARD ModelAsset loadBIN(const fs::path& path);
-	void writeBIN(const ModelAsset& asset, const fs::path& path);
-
-	NODISCARD ModelAsset load_3d_model_from_file(const fs::path& path, uint32 meshFlags)
+	ModelAsset load_3d_model_from_file(const fs::path& path, uint32 meshFlags)
 	{
 		if (!fs::exists(path))
 		{
diff --git a/modules/core/src/asset/model_asset.h b/modules/core/src/asset/model_asset.h
index fc75ea236..e7801479d 100644
--- a/modules/core/src/asset/model_asset.h
+++ b/modules/core/src/asset/model_asset.h
@@ -83,7 +83,7 @@ namespace era_engine
 		mesh_flag_load_colors | mesh_flag_load_skin,
 	};
 
-	NODISCARD ModelAsset load_3d_model_from_file(const fs::path& path, uint32 mesh_flags = mesh_flag_default);
+	ERA_CORE_API ModelAsset load_3d_model_from_file(const fs::path& path, uint32 mesh_flags = mesh_flag_default);
 
 	inline bool is_mesh_extension(const fs::path& extension)
 	{
diff --git a/modules/core/src/asset/obj.cpp b/modules/core/src/asset/obj.cpp
index 601d8984b..4192243df 100644
--- a/modules/core/src/asset/obj.cpp
+++ b/modules/core/src/asset/obj.cpp
@@ -1,5 +1,6 @@
 // Copyright (c) 2023-present Eldar Muradov. All rights reserved.
 
+#include "asset/bin.h"
 #include "asset/io.h"
 #include "asset/model_asset.h"
 #include "asset/mesh_postprocessing.h"
@@ -308,7 +309,7 @@ namespace era_engine
 		return result;
 	}
 
-	NODISCARD ModelAsset loadOBJ(const fs::path& path, uint32 flags)
+	ModelAsset loadOBJ(const fs::path& path, uint32 flags)
 	{
 		PROFILE("Loading OBJ");
 
diff --git a/modules/core/src/core/ecs/camera_holder_component.h b/modules/core/src/core/ecs/camera_holder_component.h
index 17475f7f6..1ae350b5c 100644
--- a/modules/core/src/core/ecs/camera_holder_component.h
+++ b/modules/core/src/core/ecs/camera_holder_component.h
@@ -36,8 +36,6 @@ namespace era_engine
 		render_camera* camera = nullptr;
 
 		CameraType type = ATTACHED_TO_TRS;
-
-		friend class MovementSystem;
 	};
 
 }
\ No newline at end of file
diff --git a/modules/core/src/core/ecs/input_reciever_component.h b/modules/core/src/core/ecs/input_reciever_component.h
index 27c039b4a..085085577 100644
--- a/modules/core/src/core/ecs/input_reciever_component.h
+++ b/modules/core/src/core/ecs/input_reciever_component.h
@@ -34,6 +34,7 @@ namespace era_engine
 		bool active = true;
 
 		friend class InputSystem;
+		friend class InputSenderComponent;
 	};
 
 }
\ No newline at end of file
diff --git a/modules/core/src/core/ecs/input_root_component.h b/modules/core/src/core/ecs/input_sender_component.h
similarity index 51%
rename from modules/core/src/core/ecs/input_root_component.h
rename to modules/core/src/core/ecs/input_sender_component.h
index 23e1a0611..a7740521f 100644
--- a/modules/core/src/core/ecs/input_root_component.h
+++ b/modules/core/src/core/ecs/input_sender_component.h
@@ -9,28 +9,37 @@
 
 namespace era_engine
 {
+	class InputRecieverComponent;
 
-	class ERA_CORE_API InputRootComponent final : public Component
+	class ERA_CORE_API InputSenderComponent final : public Component
 	{
 	public:
-		InputRootComponent() = default;
-		InputRootComponent(ref<Entity::EcsData> _data);
+		InputSenderComponent() = default;
+		InputSenderComponent(ref<Entity::EcsData> _data);
 
-		~InputRootComponent() override;
+		~InputSenderComponent() override;
 
 		const vec3& get_current_input() const;
 		const vec3& get_last_input() const;
 
 		const UserInput& get_frame_input() const;
 
+		void add_reciever(InputRecieverComponent* reciever);
+		void remove_reciever(InputRecieverComponent* reciever);
+
 		ERA_VIRTUAL_REFLECT(Component)
 
+	private:
+		void notify_input();
+
 	private:
 		UserInput frame_input{};
 
 		vec3 current_input = vec3::zero;
 		vec3 last_input = vec3::zero;
 
+		std::vector<InputRecieverComponent*> recievers;
+
 		friend class InputSystem;
 	};
 
diff --git a/modules/core/src/core/ecs/private/camera_system.cpp b/modules/core/src/core/ecs/private/camera_system.cpp
index 600c6a2e6..7522d5fe9 100644
--- a/modules/core/src/core/ecs/private/camera_system.cpp
+++ b/modules/core/src/core/ecs/private/camera_system.cpp
@@ -1,7 +1,7 @@
 #include "core/ecs/private/camera_system.h"
 #include "core/log.h"
 #include "core/cpu_profiling.h"
-#include "core/ecs/input_root_component.h"
+#include "core/ecs/input_reciever_component.h"
 #include "core/ecs/camera_holder_component.h"
 
 #include "rendering/ecs/renderer_holder_root_component.h"
@@ -28,11 +28,8 @@ namespace era_engine
 	CameraSystem::CameraSystem(World* _world)
 		: System(_world)
 	{
-		input_rc = world->add_root_component<InputRootComponent>();
-		ASSERT(input_rc != nullptr);
-
 		renderer_holder_rc = world->add_root_component<RendererHolderRootComponent>();
-		ASSERT(input_rc != nullptr);
+		ASSERT(renderer_holder_rc != nullptr);
 	}
 
 	CameraSystem::~CameraSystem()
@@ -45,11 +42,11 @@ namespace era_engine
 
 	void CameraSystem::update(float dt)
 	{
-		const UserInput& user_input = input_rc->get_frame_input();
-		const vec3& input = input_rc->get_current_input();
-
-		for (auto [handle, camera_holder, transform] : world->group(components_group<CameraHolderComponent, TransformComponent>).each())
+		for (auto [handle, camera_holder, receiver, transform] : world->group(components_group<CameraHolderComponent, InputRecieverComponent, TransformComponent>).each())
 		{
+			const UserInput& user_input = receiver.get_frame_input();
+			const vec3& input = receiver.get_current_input();
+
 			render_camera* camera = camera_holder.get_render_camera();
 
 			camera->setViewport(renderer_holder_rc->width, renderer_holder_rc->height);
@@ -82,6 +79,18 @@ namespace era_engine
 
 			camera->updateMatrices();
 		}
+
+		for (auto [handle, camera_holder, transform] : world->group(components_group<CameraHolderComponent, TransformComponent>, components_group<InputRecieverComponent>).each())
+		{
+			render_camera* camera = camera_holder.get_render_camera();
+
+			camera->setViewport(renderer_holder_rc->width, renderer_holder_rc->height);
+
+			camera->position = transform.transform.position;
+			camera->rotation = transform.transform.rotation;
+
+			camera->updateMatrices();
+		}
 	}
 
 }
\ No newline at end of file
diff --git a/modules/core/src/core/ecs/private/camera_system.h b/modules/core/src/core/ecs/private/camera_system.h
index b5439032d..e8e8a7d0f 100644
--- a/modules/core/src/core/ecs/private/camera_system.h
+++ b/modules/core/src/core/ecs/private/camera_system.h
@@ -5,7 +5,6 @@
 namespace era_engine
 {
 
-	class InputRootComponent;
 	class RendererHolderRootComponent;
 
 	class CameraSystem final : public System
@@ -20,7 +19,6 @@ namespace era_engine
 		ERA_VIRTUAL_REFLECT(System)
 
 	private:
-		InputRootComponent* input_rc = nullptr;
 		RendererHolderRootComponent* renderer_holder_rc = nullptr;
 	};
 }
\ No newline at end of file
diff --git a/modules/core/src/core/ecs/private/input_root_component.cpp b/modules/core/src/core/ecs/private/input_root_component.cpp
deleted file mode 100644
index b685d5bc4..000000000
--- a/modules/core/src/core/ecs/private/input_root_component.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-#include "core/ecs/input_root_component.h"
-
-#include <rttr/registration>
-
-namespace era_engine
-{
-
-	RTTR_REGISTRATION
-	{
-		using namespace rttr;
-		registration::class_<InputRootComponent>("InputRootComponent")
-			.constructor<ref<Entity::EcsData>>();
-	}
-
-
-	InputRootComponent::InputRootComponent(ref<Entity::EcsData> _data)
-		: Component(_data)
-	{
-	}
-
-	InputRootComponent::~InputRootComponent()
-	{
-	}
-
-	const vec3& InputRootComponent::get_current_input() const
-	{
-		return current_input;
-	}
-
-	const vec3& InputRootComponent::get_last_input() const
-	{
-		return last_input;
-	}
-
-	const UserInput& InputRootComponent::get_frame_input() const
-	{
-		return frame_input;
-	}
-
-}
\ No newline at end of file
diff --git a/modules/core/src/core/ecs/private/input_sender_component.cpp b/modules/core/src/core/ecs/private/input_sender_component.cpp
new file mode 100644
index 000000000..14e3f0b90
--- /dev/null
+++ b/modules/core/src/core/ecs/private/input_sender_component.cpp
@@ -0,0 +1,65 @@
+#include "core/ecs/input_sender_component.h"
+#include "core/ecs/input_reciever_component.h"
+
+#include <rttr/registration>
+
+namespace era_engine
+{
+
+	RTTR_REGISTRATION
+	{
+		using namespace rttr;
+		registration::class_<InputSenderComponent>("InputSenderComponent")
+			.constructor<ref<Entity::EcsData>>();
+	}
+
+
+	InputSenderComponent::InputSenderComponent(ref<Entity::EcsData> _data)
+		: Component(_data)
+	{
+	}
+
+	InputSenderComponent::~InputSenderComponent()
+	{
+	}
+
+	const vec3& InputSenderComponent::get_current_input() const
+	{
+		return current_input;
+	}
+
+	const vec3& InputSenderComponent::get_last_input() const
+	{
+		return last_input;
+	}
+
+	const UserInput& InputSenderComponent::get_frame_input() const
+	{
+		return frame_input;
+	}
+
+	void InputSenderComponent::add_reciever(InputRecieverComponent* reciever)
+	{
+		recievers.push_back(reciever);
+	}
+
+	void InputSenderComponent::remove_reciever(InputRecieverComponent* reciever)
+	{
+		std::erase(recievers, reciever);
+	}
+
+	void InputSenderComponent::notify_input()
+	{
+		for (InputRecieverComponent* reciever : recievers)
+		{
+			if (!reciever->is_active())
+			{
+				continue;
+			}
+
+			reciever->frame_input = frame_input;
+			reciever->current_input = current_input;
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/modules/core/src/core/ecs/private/input_system.cpp b/modules/core/src/core/ecs/private/input_system.cpp
index 076445f99..7ae7707ec 100644
--- a/modules/core/src/core/ecs/private/input_system.cpp
+++ b/modules/core/src/core/ecs/private/input_system.cpp
@@ -1,5 +1,5 @@
 #include "core/ecs/private/input_system.h"
-#include "core/ecs/input_root_component.h"
+#include "core/ecs/input_sender_component.h"
 #include "core/ecs/input_reciever_component.h"
 #include "core/imgui.h"
 #include "core/log.h"
@@ -31,9 +31,6 @@ namespace era_engine
 	InputSystem::InputSystem(World* _world)
 		: System(_world)
 	{
-		input_rc = world->add_root_component<InputRootComponent>();
-		ASSERT(input_rc != nullptr);
-
 		renderer_holder_rc = world->add_root_component<RendererHolderRootComponent>();
 		ASSERT(renderer_holder_rc != nullptr);
 	}
@@ -63,19 +60,42 @@ namespace era_engine
 
 		CPU_PROFILE_BLOCK("Collect user input");
 
-		UserInput& input = input_rc->frame_input;
-
-		ImGuiIO& io = ImGui::GetIO();
-		if (ImGui::IsItemHovered())
+		for (auto [handle, transform, sender] : world->group(components_group<TransformComponent, InputSenderComponent>).each())
 		{
-			ImVec2 relative_mouse = ImGui::GetMousePos() - ImGui::GetItemRectMin();
-			vec2 mouse_mos = { relative_mouse.x, relative_mouse.y };
-			if (app_focused_last_frame)
+			UserInput& input = sender.frame_input;
+			ImGuiIO& io = ImGui::GetIO();
+			if (ImGui::IsItemHovered())
 			{
-				input.mouse.dx = (int32)(mouse_mos.x - input.mouse.x);
-				input.mouse.dy = (int32)(mouse_mos.y - input.mouse.y);
-				input.mouse.reldx = (float)input.mouse.dx / (render_width - 1);
-				input.mouse.reldy = (float)input.mouse.dy / (render_height - 1);
+				ImVec2 relative_mouse = ImGui::GetMousePos() - ImGui::GetItemRectMin();
+				vec2 mouse_mos = { relative_mouse.x, relative_mouse.y };
+				if (app_focused_last_frame)
+				{
+					input.mouse.dx = (int32)(mouse_mos.x - input.mouse.x);
+					input.mouse.dy = (int32)(mouse_mos.y - input.mouse.y);
+					input.mouse.reldx = (float)input.mouse.dx / (render_width - 1);
+					input.mouse.reldy = (float)input.mouse.dy / (render_height - 1);
+				}
+				else
+				{
+					input.mouse.dx = 0;
+					input.mouse.dy = 0;
+					input.mouse.reldx = 0.f;
+					input.mouse.reldy = 0.f;
+				}
+				input.mouse.x = (int32)mouse_mos.x;
+				input.mouse.y = (int32)mouse_mos.y;
+				input.mouse.relX = mouse_mos.x / (render_width - 1);
+				input.mouse.relY = mouse_mos.y / (render_height - 1);
+				input.mouse.left = { ImGui::IsMouseDown(ImGuiMouseButton_Left), ImGui::IsMouseClicked(ImGuiMouseButton_Left), ImGui::IsMouseDoubleClicked(ImGuiMouseButton_Left) };
+				input.mouse.right = { ImGui::IsMouseDown(ImGuiMouseButton_Right), ImGui::IsMouseClicked(ImGuiMouseButton_Right), ImGui::IsMouseDoubleClicked(ImGuiMouseButton_Right) };
+				input.mouse.middle = { ImGui::IsMouseDown(ImGuiMouseButton_Middle), ImGui::IsMouseClicked(ImGuiMouseButton_Middle), ImGui::IsMouseDoubleClicked(ImGuiMouseButton_Middle) };
+
+				for (uint32 i = 0; i < arraysize(UserInput::keyboard); ++i)
+				{
+					input.keyboard[i] = { ImGui::IsKeyDown(i), ImGui::IsKeyPressed(i, false) };
+				}
+
+				input.over_window = true;
 			}
 			else
 			{
@@ -83,79 +103,49 @@ namespace era_engine
 				input.mouse.dy = 0;
 				input.mouse.reldx = 0.f;
 				input.mouse.reldy = 0.f;
-			}
-			input.mouse.x = (int32)mouse_mos.x;
-			input.mouse.y = (int32)mouse_mos.y;
-			input.mouse.relX = mouse_mos.x / (render_width - 1);
-			input.mouse.relY = mouse_mos.y / (render_height - 1);
-			input.mouse.left = { ImGui::IsMouseDown(ImGuiMouseButton_Left), ImGui::IsMouseClicked(ImGuiMouseButton_Left), ImGui::IsMouseDoubleClicked(ImGuiMouseButton_Left) };
-			input.mouse.right = { ImGui::IsMouseDown(ImGuiMouseButton_Right), ImGui::IsMouseClicked(ImGuiMouseButton_Right), ImGui::IsMouseDoubleClicked(ImGuiMouseButton_Right) };
-			input.mouse.middle = { ImGui::IsMouseDown(ImGuiMouseButton_Middle), ImGui::IsMouseClicked(ImGuiMouseButton_Middle), ImGui::IsMouseDoubleClicked(ImGuiMouseButton_Middle) };
-
-			for (uint32 i = 0; i < arraysize(UserInput::keyboard); ++i)
-			{
-				input.keyboard[i] = { ImGui::IsKeyDown(i), ImGui::IsKeyPressed(i, false) };
-			}
-
-			input.over_window = true;
-		}
-		else
-		{
-			input.mouse.dx = 0;
-			input.mouse.dy = 0;
-			input.mouse.reldx = 0.f;
-			input.mouse.reldy = 0.f;
 
-			if (input.mouse.left.down && !ImGui::IsMouseDown(ImGuiMouseButton_Left))
-			{
-				input.mouse.left.down = false;
-			}
-			if (input.mouse.right.down && !ImGui::IsMouseDown(ImGuiMouseButton_Right))
-			{
-				input.mouse.right.down = false;
-			}
-			if (input.mouse.middle.down && !ImGui::IsMouseDown(ImGuiMouseButton_Middle))
-			{
-				input.mouse.middle.down = false;
-			}
+				if (input.mouse.left.down && !ImGui::IsMouseDown(ImGuiMouseButton_Left))
+				{
+					input.mouse.left.down = false;
+				}
+				if (input.mouse.right.down && !ImGui::IsMouseDown(ImGuiMouseButton_Right))
+				{
+					input.mouse.right.down = false;
+				}
+				if (input.mouse.middle.down && !ImGui::IsMouseDown(ImGuiMouseButton_Middle))
+				{
+					input.mouse.middle.down = false;
+				}
 
-			input.mouse.left.click_event = input.mouse.left.double_click_event = false;
-			input.mouse.right.click_event = input.mouse.right.double_click_event = false;
-			input.mouse.middle.click_event = input.mouse.middle.double_click_event = false;
+				input.mouse.left.click_event = input.mouse.left.double_click_event = false;
+				input.mouse.right.click_event = input.mouse.right.double_click_event = false;
+				input.mouse.middle.click_event = input.mouse.middle.double_click_event = false;
 
-			for (uint32 i = 0; i < arraysize(UserInput::keyboard); ++i)
-			{
-				if (!ImGui::IsKeyDown(i))
+				for (uint32 i = 0; i < arraysize(UserInput::keyboard); ++i)
 				{
-					input.keyboard[i].down = false;
+					if (!ImGui::IsKeyDown(i))
+					{
+						input.keyboard[i].down = false;
+					}
+					input.keyboard[i].press_event = false;
 				}
-				input.keyboard[i].press_event = false;
+
+				input.over_window = false;
 			}
 
-			input.over_window = false;
-		}
+			vec3 current_input = vec3(
+				(input.keyboard['D'].down ? 1.0f : 0.0f) + (input.keyboard['A'].down ? -1.f : 0.0f),
+				(input.keyboard['E'].down ? 1.0f : 0.0f) + (input.keyboard['Q'].down ? -1.f : 0.0f),
+				(input.keyboard['W'].down ? -1.0f : 0.0f) + (input.keyboard['S'].down ? 1.f : 0.0f)
+			);
 
-		vec3 current_input = vec3(
-			(input.keyboard['D'].down ? 1.0f : 0.0f) + (input.keyboard['A'].down ? -1.f : 0.0f),
-			(input.keyboard['E'].down ? 1.0f : 0.0f) + (input.keyboard['Q'].down ? -1.f : 0.0f),
-			(input.keyboard['W'].down ? -1.0f : 0.0f) + (input.keyboard['S'].down ? 1.f : 0.0f)
-		);
+			sender.last_input = sender.current_input;
+			sender.current_input = current_input;
 
-		input_rc->last_input = input_rc->current_input;
-		input_rc->current_input = current_input;
+			sender.notify_input();
+		}
 
 		app_focused_last_frame = ImGui::IsMousePosValid();
-
-		for (auto [handle, transform, reciever] : world->group(components_group<TransformComponent, InputRecieverComponent>).each())
-		{
-			if (!reciever.is_active())
-			{
-				continue;
-			}
-
-			reciever.frame_input = input_rc->frame_input;
-			reciever.current_input = input_rc->current_input;
-		}
 	}
 
 }
\ No newline at end of file
diff --git a/modules/core/src/core/ecs/private/input_system.h b/modules/core/src/core/ecs/private/input_system.h
index 64ccb822f..ab7cbf9c6 100644
--- a/modules/core/src/core/ecs/private/input_system.h
+++ b/modules/core/src/core/ecs/private/input_system.h
@@ -4,7 +4,6 @@
 
 namespace era_engine
 {
-	class InputRootComponent;
 	class RendererHolderRootComponent;
 
 	class InputSystem final : public System
@@ -21,7 +20,6 @@ namespace era_engine
 		ERA_VIRTUAL_REFLECT(System)
 
 	private:
-		InputRootComponent* input_rc = nullptr;
 		RendererHolderRootComponent* renderer_holder_rc = nullptr;
 	};
 }
\ No newline at end of file
diff --git a/modules/core/src/core/fps_limiter.cpp b/modules/core/src/core/fps_limiter.cpp
new file mode 100644
index 000000000..395a27379
--- /dev/null
+++ b/modules/core/src/core/fps_limiter.cpp
@@ -0,0 +1,52 @@
+#include "core/fps_limiter.h"
+
+namespace era_engine
+{
+
+	FpsLimiter::FpsLimiter(int32_t _frame_rate, bool _enabled)
+	{
+		enabled = _enabled;
+		frame_time = 1000.0f / static_cast<float>(_frame_rate);
+	}
+
+	FpsLimiter::~FpsLimiter()
+	{
+	}
+
+	void FpsLimiter::set_enabled(bool _enabled)
+	{
+		enabled = _enabled;
+	}
+
+	bool FpsLimiter::get_enabled() const
+	{
+		return enabled;
+	}
+
+	void FpsLimiter::begin_frame()
+	{
+		frame_start_time = std::chrono::high_resolution_clock::now();
+		frame_started = true;
+	}
+
+	void FpsLimiter::end_frame()
+	{
+		if(frame_started)
+		{
+			auto current_timme = std::chrono::high_resolution_clock::now();
+			std::chrono::duration<float, std::milli> elapsed_seconds = current_timme - frame_start_time;
+			float wait_time = frame_time - elapsed_seconds.count();
+			if (wait_time > 0.0f && enabled)
+			{
+				wait(wait_time);
+			}
+			frame_started = false;
+		}
+	}
+
+	void FpsLimiter::wait(float wait_time)
+	{
+		std::this_thread::sleep_for(std::chrono::duration<float, std::milli>(wait_time));
+	}
+
+}
\ No newline at end of file
diff --git a/modules/core/src/core/fps_limiter.h b/modules/core/src/core/fps_limiter.h
new file mode 100644
index 000000000..456b5701b
--- /dev/null
+++ b/modules/core/src/core/fps_limiter.h
@@ -0,0 +1,33 @@
+#pragma once
+
+#include "core_api.h"
+
+#include <chrono>
+
+namespace era_engine
+{
+
+	class ERA_CORE_API FpsLimiter final
+	{
+	public:
+		FpsLimiter(int32_t _frame_rate = 60.0f, bool _enabled = true);
+		~FpsLimiter();
+
+		void set_enabled(bool _enabled);
+		bool get_enabled() const;
+
+		void begin_frame();
+		void end_frame();
+
+	private:
+		void wait(float wait_time);
+
+	private:
+		float frame_time = 0.0f;
+		bool enabled = true;
+		bool frame_started = false;
+		
+		std::chrono::high_resolution_clock::time_point frame_start_time;
+	};
+
+}
\ No newline at end of file
diff --git a/modules/core/src/core/string.h b/modules/core/src/core/string.h
index 7db757285..5cb3b164b 100644
--- a/modules/core/src/core/string.h
+++ b/modules/core/src/core/string.h
@@ -136,6 +136,15 @@ namespace era_engine
 		return  wstring_to_string(Project::path) + path.data();
 #else
 		return wstring_to_string(Project::engine_path) + path.data();
+#endif	
+	}
+
+	inline fs::path get_full_path(const fs::path& path)
+	{
+#ifdef ERA_RUNTIME
+		return  wstring_to_string(Project::path) + path.data();
+#else
+		return fs::path(wstring_to_string(Project::engine_path)) / path;
 #endif	
 	}
 }
diff --git a/modules/core/src/dx/dx_texture.cpp b/modules/core/src/dx/dx_texture.cpp
index d36aad678..94e6f5796 100644
--- a/modules/core/src/dx/dx_texture.cpp
+++ b/modules/core/src/dx/dx_texture.cpp
@@ -236,7 +236,7 @@ namespace era_engine
 	static std::unordered_map<texture_key, weakref<dx_texture>> textureCache;
 	static std::mutex mutex;
 
-	NODISCARD static ref<dx_texture> loadTextureFromFileAndHandle(const fs::path& filename, AssetHandle handle, uint32 flags,
+	static ref<dx_texture> loadTextureFromFileAndHandle(const fs::path& filename, AssetHandle handle, uint32 flags,
 		bool async = false, JobHandle parentJob = {})
 	{
 		if (!fs::exists(filename))
@@ -255,7 +255,7 @@ namespace era_engine
 		return result;
 	}
 
-	NODISCARD ref<dx_texture> loadTextureFromFile(const fs::path& filename, uint32 flags)
+	ref<dx_texture> loadTextureFromFile(const fs::path& filename, uint32 flags)
 	{
 		fs::path path = filename.lexically_normal().make_preferred();
 
@@ -263,13 +263,13 @@ namespace era_engine
 		return loadTextureFromFileAndHandle(path, handle, flags);
 	}
 
-	NODISCARD ref<dx_texture> loadTextureFromHandle(AssetHandle handle, uint32 flags)
+	ref<dx_texture> loadTextureFromHandle(AssetHandle handle, uint32 flags)
 	{
 		fs::path sceneFilename = getPathFromAssetHandle(handle);
 		return loadTextureFromFileAndHandle(sceneFilename, handle, flags);
 	}
 
-	NODISCARD ref<dx_texture> loadTextureFromFileAsync(const fs::path& filename, uint32 flags, JobHandle parentJob)
+	ref<dx_texture> loadTextureFromFileAsync(const fs::path& filename, uint32 flags, JobHandle parentJob)
 	{
 		fs::path path = filename.lexically_normal().make_preferred();
 
@@ -277,55 +277,55 @@ namespace era_engine
 		return loadTextureFromFileAndHandle(path, handle, flags, true, parentJob);
 	}
 
-	NODISCARD ref<dx_texture> loadTextureFromHandleAsync(AssetHandle handle, uint32 flags, JobHandle parentJob)
+	ref<dx_texture> loadTextureFromHandleAsync(AssetHandle handle, uint32 flags, JobHandle parentJob)
 	{
 		fs::path sceneFilename = getPathFromAssetHandle(handle);
 		return loadTextureFromFileAndHandle(sceneFilename, handle, flags, true, parentJob);
 	}
 
-	NODISCARD ref<dx_texture> loadTextureFromMemory(const void* ptr, uint32 size, image_format imageFormat, const fs::path& cacheFilename, uint32 flags)
+	ref<dx_texture> loadTextureFromMemory(const void* ptr, uint32 size, image_format imageFormat, const fs::path& cacheFilename, uint32 flags)
 	{
 		return loadTextureFromMemoryInternal(ptr, size, imageFormat, cacheFilename, flags);
 	}
 
-	NODISCARD ref<dx_texture> loadVolumeTextureFromDirectory(const fs::path& dirname, uint32 flags)
+	ref<dx_texture> loadVolumeTextureFromDirectory(const fs::path& dirname, uint32 flags)
 	{
 		return loadVolumeTextureInternal(dirname, flags);
 	}
 
-	NODISCARD static bool checkFormatSupport(D3D12_FEATURE_DATA_FORMAT_SUPPORT formatSupport, D3D12_FORMAT_SUPPORT1 support)
+	static bool checkFormatSupport(D3D12_FEATURE_DATA_FORMAT_SUPPORT formatSupport, D3D12_FORMAT_SUPPORT1 support)
 	{
 		return (formatSupport.Support1 & support) != 0;
 	}
 
-	NODISCARD static bool checkFormatSupport(D3D12_FEATURE_DATA_FORMAT_SUPPORT formatSupport, D3D12_FORMAT_SUPPORT2 support)
+	static bool checkFormatSupport(D3D12_FEATURE_DATA_FORMAT_SUPPORT formatSupport, D3D12_FORMAT_SUPPORT2 support)
 	{
 		return (formatSupport.Support2 & support) != 0;
 	}
 
-	NODISCARD static bool formatSupportsRTV(D3D12_FEATURE_DATA_FORMAT_SUPPORT formatSupport)
+	static bool formatSupportsRTV(D3D12_FEATURE_DATA_FORMAT_SUPPORT formatSupport)
 	{
 		return checkFormatSupport(formatSupport, D3D12_FORMAT_SUPPORT1_RENDER_TARGET);
 	}
 
-	NODISCARD static bool formatSupportsDSV(D3D12_FEATURE_DATA_FORMAT_SUPPORT formatSupport)
+	static bool formatSupportsDSV(D3D12_FEATURE_DATA_FORMAT_SUPPORT formatSupport)
 	{
 		return checkFormatSupport(formatSupport, D3D12_FORMAT_SUPPORT1_DEPTH_STENCIL);
 	}
 
-	NODISCARD static bool formatSupportsSRV(D3D12_FEATURE_DATA_FORMAT_SUPPORT formatSupport)
+	static bool formatSupportsSRV(D3D12_FEATURE_DATA_FORMAT_SUPPORT formatSupport)
 	{
 		return checkFormatSupport(formatSupport, D3D12_FORMAT_SUPPORT1_SHADER_SAMPLE);
 	}
 
-	NODISCARD static bool formatSupportsUAV(D3D12_FEATURE_DATA_FORMAT_SUPPORT formatSupport)
+	static bool formatSupportsUAV(D3D12_FEATURE_DATA_FORMAT_SUPPORT formatSupport)
 	{
 		return checkFormatSupport(formatSupport, D3D12_FORMAT_SUPPORT1_TYPED_UNORDERED_ACCESS_VIEW) &&
 			checkFormatSupport(formatSupport, D3D12_FORMAT_SUPPORT2_UAV_TYPED_LOAD) &&
 			checkFormatSupport(formatSupport, D3D12_FORMAT_SUPPORT2_UAV_TYPED_STORE);
 	}
 
-	NODISCARD D3D12_RESOURCE_ALLOCATION_INFO getTextureAllocationInfo(uint32 width, uint32 height, DXGI_FORMAT format, bool allocateMips, D3D12_RESOURCE_FLAGS flags)
+	D3D12_RESOURCE_ALLOCATION_INFO getTextureAllocationInfo(uint32 width, uint32 height, DXGI_FORMAT format, bool allocateMips, D3D12_RESOURCE_FLAGS flags)
 	{
 		uint32 numMips = allocateMips ? 0 : 1;
 		auto desc = CD3DX12_RESOURCE_DESC::Tex2D(format, width, height, 1, numMips, 1, 0, flags);
diff --git a/modules/core/src/dx/dx_texture.h b/modules/core/src/dx/dx_texture.h
index f7f6d3e30..97f3b694c 100644
--- a/modules/core/src/dx/dx_texture.h
+++ b/modules/core/src/dx/dx_texture.h
@@ -2,6 +2,7 @@
 
 #pragma once
 
+#include "core_api.h"
 #include "core/math.h"
 #include "core/job_system.h"
 
@@ -146,15 +147,15 @@ namespace era_engine
 	// So if no one else has a reference, the texture gets deleted.
 	// This means you should keep a reference to your textures yourself and not call this every frame.
 
-	NODISCARD ref<dx_texture> loadTextureFromFile(const fs::path& filename, uint32 flags = image_load_flags_default);
-	NODISCARD ref<dx_texture> loadTextureFromHandle(AssetHandle handle, uint32 flags = image_load_flags_default);
-	NODISCARD ref<dx_texture> loadTextureFromFileAsync(const fs::path& filename, uint32 flags = image_load_flags_default, JobHandle parentJob = {});
-	NODISCARD ref<dx_texture> loadTextureFromHandleAsync(AssetHandle handle, uint32 flags = image_load_flags_default, JobHandle parentJob = {});
+	ERA_CORE_API ref<dx_texture> loadTextureFromFile(const fs::path& filename, uint32 flags = image_load_flags_default);
+	ERA_CORE_API ref<dx_texture> loadTextureFromHandle(AssetHandle handle, uint32 flags = image_load_flags_default);
+	ERA_CORE_API ref<dx_texture> loadTextureFromFileAsync(const fs::path& filename, uint32 flags = image_load_flags_default, JobHandle parentJob = {});
+	ERA_CORE_API ref<dx_texture> loadTextureFromHandleAsync(AssetHandle handle, uint32 flags = image_load_flags_default, JobHandle parentJob = {});
 
-	NODISCARD ref<dx_texture> loadTextureFromMemory(const void* ptr, uint32 size, image_format imageFormat, const fs::path& cacheFilename, uint32 flags = image_load_flags_default);
-	NODISCARD ref<dx_texture> loadVolumeTextureFromDirectory(const fs::path& dirname, uint32 flags = image_load_flags_compress | image_load_flags_cache_to_dds | image_load_flags_noncolor);
+	ERA_CORE_API ref<dx_texture> loadTextureFromMemory(const void* ptr, uint32 size, image_format imageFormat, const fs::path& cacheFilename, uint32 flags = image_load_flags_default);
+	ERA_CORE_API ref<dx_texture> loadVolumeTextureFromDirectory(const fs::path& dirname, uint32 flags = image_load_flags_compress | image_load_flags_cache_to_dds | image_load_flags_noncolor);
 
 	void copyTextureToCPUBuffer(const ref<dx_texture>& texture, void* buffer, D3D12_RESOURCE_STATES beforeAndAfterState = D3D12_RESOURCE_STATE_COMMON);
-	void saveTextureToFile(const ref<dx_texture>& texture, const fs::path& path);
+	ERA_CORE_API void saveTextureToFile(const ref<dx_texture>& texture, const fs::path& path);
 	void saveTextureToFile(dx_resource texture, uint32 width, uint32 height, DXGI_FORMAT format, const fs::path& path);
 }
\ No newline at end of file
diff --git a/modules/core/src/ecs/rendering/mesh_component.h b/modules/core/src/ecs/rendering/mesh_component.h
index 968083fe0..ea503ccb7 100644
--- a/modules/core/src/ecs/rendering/mesh_component.h
+++ b/modules/core/src/ecs/rendering/mesh_component.h
@@ -1,12 +1,13 @@
 #pragma once
 
+#include "core_api.h"
 #include "ecs/component.h"
 
 #include "geometry/mesh.h"
 
 namespace era_engine
 {
-	class MeshComponent : public Component
+	class ERA_CORE_API MeshComponent : public Component
 	{
 	public:
 		MeshComponent(ref<Entity::EcsData> _data, ref<multi_mesh> _mesh, bool _is_hidden = false);
diff --git a/modules/core/src/engine/private/engine.cpp b/modules/core/src/engine/private/engine.cpp
index 52645c37e..0f08fe6a0 100644
--- a/modules/core/src/engine/private/engine.cpp
+++ b/modules/core/src/engine/private/engine.cpp
@@ -216,8 +216,11 @@ namespace era_engine
 		execute_main_thread_jobs();
 
 		float dt;
-		while (newFrame(dt, *window))
+		bool status = true;
+		while (status)
 		{
+			status = newFrame(dt, *window);
+
 			auto& worlds = get_worlds();
 			for (auto& [name, world] : worlds)
 			{
diff --git a/modules/core/src/geometry/mesh.cpp b/modules/core/src/geometry/mesh.cpp
index 80487d49a..177113371 100644
--- a/modules/core/src/geometry/mesh.cpp
+++ b/modules/core/src/geometry/mesh.cpp
@@ -36,7 +36,7 @@ namespace std
 
 namespace era_engine
 {
-	static void meshLoaderThread(ref<multi_mesh> result, const fs::path& sceneFilename, uint32 flags, mesh_load_callback cb,
+	static void meshLoaderThread(ref<multi_mesh> result, const fs::path& sceneFilename, uint32 flags, const mesh_load_callback& cb,
 		bool async, JobHandle parentJob)
 	{
 		using namespace animation;
@@ -136,7 +136,7 @@ namespace era_engine
 		result->loadState.store(AssetLoadState::LOADED, std::memory_order_release);
 	}
 
-	static ref<multi_mesh> loadMeshFromFileInternal(const fs::path& sceneFilename, AssetHandle handle, uint32 flags, mesh_load_callback cb,
+	static ref<multi_mesh> loadMeshFromFileInternal(const fs::path& sceneFilename, AssetHandle handle, uint32 flags, const mesh_load_callback& cb,
 		bool async, JobHandle parentJob)
 	{
 		ref<multi_mesh> result = make_ref<multi_mesh>();
@@ -184,16 +184,15 @@ namespace era_engine
 	static std::unordered_map<mesh_key, weakref<multi_mesh>> meshCache;
 	static std::mutex mutex;
 
-	static ref<multi_mesh> loadMeshFromFileAndHandle(const fs::path& filename, AssetHandle handle, uint32 flags, mesh_load_callback cb,
+	static ref<multi_mesh> loadMeshFromFileAndHandle(const fs::path& filename, AssetHandle handle, uint32 flags, const mesh_load_callback& cb,
 		bool async = false, JobHandle parentJob = {})
 	{
 		if (!fs::exists(filename))
-			return 0;
+			return nullptr;
 
 		mesh_key key = { handle, flags };
 
-		mutex.lock();
-
+		std::lock_guard _lock{mutex};
 		ref<multi_mesh> result = { meshCache[key].lock(), {} };
 		if (!result)
 		{
@@ -201,11 +200,10 @@ namespace era_engine
 			meshCache[key] = result;
 		}
 
-		mutex.unlock();
 		return result;
 	}
 
-	NODISCARD ref<multi_mesh> loadMeshFromFile(const fs::path& filename, uint32 flags, mesh_load_callback cb)
+	ref<multi_mesh> loadMeshFromFile(const fs::path& filename, uint32 flags, const mesh_load_callback& cb)
 	{
 		fs::path path = filename.lexically_normal().make_preferred();
 
@@ -213,13 +211,13 @@ namespace era_engine
 		return loadMeshFromFileAndHandle(path, handle, flags, cb);
 	}
 
-	NODISCARD ref<multi_mesh> loadMeshFromHandle(AssetHandle handle, uint32 flags, mesh_load_callback cb)
+	ref<multi_mesh> loadMeshFromHandle(AssetHandle handle, uint32 flags, const mesh_load_callback& cb)
 	{
 		fs::path sceneFilename = getPathFromAssetHandle(handle);
 		return loadMeshFromFileAndHandle(sceneFilename, handle, flags, cb);
 	}
 
-	NODISCARD ref<multi_mesh> loadMeshFromFileAsync(const fs::path& filename, uint32 flags, JobHandle parentJob, mesh_load_callback cb)
+	ref<multi_mesh> loadMeshFromFileAsync(const fs::path& filename, uint32 flags, JobHandle parentJob, const mesh_load_callback& cb)
 	{
 		fs::path path = filename.lexically_normal().make_preferred();
 
@@ -227,7 +225,7 @@ namespace era_engine
 		return loadMeshFromFileAndHandle(path, handle, flags, cb, true, parentJob);
 	}
 
-	NODISCARD ref<multi_mesh> loadMeshFromHandleAsync(AssetHandle handle, uint32 flags, JobHandle parentJob, mesh_load_callback cb)
+	ref<multi_mesh> loadMeshFromHandleAsync(AssetHandle handle, uint32 flags, JobHandle parentJob, const mesh_load_callback& cb)
 	{
 		fs::path sceneFilename = getPathFromAssetHandle(handle);
 		return loadMeshFromFileAndHandle(sceneFilename, handle, flags, cb, true, parentJob);
diff --git a/modules/core/src/geometry/mesh.h b/modules/core/src/geometry/mesh.h
index 2675bb6a2..6ed46762e 100644
--- a/modules/core/src/geometry/mesh.h
+++ b/modules/core/src/geometry/mesh.h
@@ -43,28 +43,28 @@ namespace era_engine
 
 	using mesh_load_callback = std::function<void(mesh_builder& builder, std::vector<submesh>& submeshes, const bounding_box& boundingBox)>;
 
-	NODISCARD ref<multi_mesh> loadMeshFromFile(const fs::path& filename, uint32 flags = mesh_creation_flags_default, mesh_load_callback cb = nullptr);
-	NODISCARD ref<multi_mesh> loadMeshFromHandle(AssetHandle handle, uint32 flags = mesh_creation_flags_default, mesh_load_callback cb = nullptr);
-	NODISCARD ref<multi_mesh> loadMeshFromFileAsync(const fs::path& filename, uint32 flags = mesh_creation_flags_default, JobHandle parentJob = {}, mesh_load_callback cb = nullptr);
-	NODISCARD ref<multi_mesh> loadMeshFromHandleAsync(AssetHandle handle, uint32 flags = mesh_creation_flags_default, JobHandle parentJob = {}, mesh_load_callback cb = nullptr);
+	ERA_CORE_API ref<multi_mesh> loadMeshFromFile(const fs::path& filename, uint32 flags = mesh_creation_flags_default, const mesh_load_callback& cb = nullptr);
+	ERA_CORE_API ref<multi_mesh> loadMeshFromHandle(AssetHandle handle, uint32 flags = mesh_creation_flags_default, const mesh_load_callback& cb = nullptr);
+	ERA_CORE_API ref<multi_mesh> loadMeshFromFileAsync(const fs::path& filename, uint32 flags = mesh_creation_flags_default, JobHandle parentJob = {}, const mesh_load_callback& cb = nullptr);
+	ERA_CORE_API ref<multi_mesh> loadMeshFromHandleAsync(AssetHandle handle, uint32 flags = mesh_creation_flags_default, JobHandle parentJob = {}, const mesh_load_callback& cb = nullptr);
 
 	// Same functions but with different default flags (includes skin).
-	inline NODISCARD ref<multi_mesh> loadAnimatedMeshFromFile(const fs::path& filename, uint32 flags = mesh_creation_flags_animated, mesh_load_callback cb = nullptr)
+	inline ref<multi_mesh> loadAnimatedMeshFromFile(const fs::path& filename, uint32 flags = mesh_creation_flags_animated, const mesh_load_callback& cb = nullptr)
 	{
 		return loadMeshFromFile(filename, flags, cb);
 	}
 
-	inline NODISCARD ref<multi_mesh> loadAnimatedMeshFromHandle(AssetHandle handle, uint32 flags = mesh_creation_flags_animated, mesh_load_callback cb = nullptr)
+	inline ref<multi_mesh> loadAnimatedMeshFromHandle(AssetHandle handle, uint32 flags = mesh_creation_flags_animated, const mesh_load_callback& cb = nullptr)
 	{
 		return loadMeshFromHandle(handle, flags, cb);
 	}
 
-	inline NODISCARD ref<multi_mesh> loadAnimatedMeshFromFileAsync(const fs::path& filename, uint32 flags = mesh_creation_flags_animated, JobHandle parentJob = {}, mesh_load_callback cb = nullptr)
+	inline ref<multi_mesh> loadAnimatedMeshFromFileAsync(const fs::path& filename, uint32 flags = mesh_creation_flags_animated, JobHandle parentJob = {}, const mesh_load_callback& cb = nullptr)
 	{
 		return loadMeshFromFileAsync(filename, flags, parentJob, cb);
 	}
 
-	inline NODISCARD ref<multi_mesh> loadAnimatedMeshFromHandleAsync(AssetHandle handle, uint32 flags = mesh_creation_flags_animated, JobHandle parentJob = {}, mesh_load_callback cb = nullptr)
+	inline ref<multi_mesh> loadAnimatedMeshFromHandleAsync(AssetHandle handle, uint32 flags = mesh_creation_flags_animated, JobHandle parentJob = {}, const mesh_load_callback& cb = nullptr)
 	{
 		return loadMeshFromHandleAsync(handle, flags, parentJob, cb);
 	}
diff --git a/modules/core/src/geometry/mesh_builder.h b/modules/core/src/geometry/mesh_builder.h
index 7f38cf615..2daaa1266 100644
--- a/modules/core/src/geometry/mesh_builder.h
+++ b/modules/core/src/geometry/mesh_builder.h
@@ -14,7 +14,7 @@
 
 namespace era_engine
 {
-	struct submesh_info
+	struct ERA_CORE_API submesh_info
 	{
 		uint32 numIndices;
 		uint32 firstIndex;
@@ -43,21 +43,21 @@ namespace era_engine
 		mesh_index_uint32,
 	};
 
-	struct quad_mesh_desc
+	struct ERA_CORE_API quad_mesh_desc
 	{
 		vec3 center = 0.f;
 		vec2 radius = 1.f;
 		quat rotation = quat::identity;
 	};
 
-	struct box_mesh_desc
+	struct ERA_CORE_API box_mesh_desc
 	{
 		vec3 center = 0.f;
 		vec3 radius = 1.f;
 		quat rotation = quat::identity;
 	};
 
-	struct tesselated_box_mesh_desc
+	struct ERA_CORE_API tesselated_box_mesh_desc
 	{
 		vec3 center = 0.f;
 		vec3 radius = 1.f;
@@ -65,7 +65,7 @@ namespace era_engine
 		quat rotation = quat::identity;
 	};
 
-	struct sphere_mesh_desc
+	struct ERA_CORE_API sphere_mesh_desc
 	{
 		vec3 center = 0.f;
 		float radius = 1.f;
@@ -73,7 +73,7 @@ namespace era_engine
 		uint32 rows = 15;
 	};
 
-	struct icosphere_mesh_desc
+	struct ERA_CORE_API icosphere_mesh_desc
 	{
 		vec3 center = 0.f;
 		float radius = 1.f;
@@ -81,15 +81,15 @@ namespace era_engine
 	};
 
 	// All meshes are standing upright by default.
-	struct capsule_mesh_desc
+	struct ERA_CORE_API capsule_mesh_desc
 	{
 		capsule_mesh_desc() {}
 
-		capsule_mesh_desc(vec3 posA, vec3 posB, float radius)
+		capsule_mesh_desc(vec3 posA, vec3 posB, float _radius)
 		{
 			center = (posA + posB) * 0.5f;
 			height = length(posA - posB);
-			this->radius = radius;
+			radius = _radius;
 			rotation = rotate_from_to(vec3(0.f, 1.f, 0.f), posB - posA);
 		}
 
@@ -101,7 +101,7 @@ namespace era_engine
 		uint32 rows = 15;
 	};
 
-	struct cylinder_mesh_desc
+	struct ERA_CORE_API cylinder_mesh_desc
 	{
 		vec3 center = 0.f;
 		float height = 1.f;
@@ -110,7 +110,7 @@ namespace era_engine
 		uint32 slices = 15;
 	};
 
-	struct hollow_cylinder_mesh_desc
+	struct ERA_CORE_API hollow_cylinder_mesh_desc
 	{
 		vec3 center = 0.f;
 		float height = 1.f;
@@ -120,7 +120,7 @@ namespace era_engine
 		uint32 slices = 15;
 	};
 
-	struct arrow_mesh_desc
+	struct ERA_CORE_API arrow_mesh_desc
 	{
 		vec3 base = 0.f;
 		float shaftLength = 1.f;
@@ -131,7 +131,7 @@ namespace era_engine
 		uint32 slices = 15;
 	};
 
-	struct torus_mesh_desc
+	struct ERA_CORE_API torus_mesh_desc
 	{
 		vec3 center = 0.f;
 		float torusRadius = 1.f;
@@ -141,7 +141,7 @@ namespace era_engine
 		uint32 segments = 15;
 	};
 
-	struct mace_mesh_desc
+	struct ERA_CORE_API mace_mesh_desc
 	{
 		vec3 base = 0.f;
 		float shaftLength = 1.f;
@@ -163,7 +163,7 @@ namespace era_engine
 		return size;
 	}
 
-	struct mesh_builder
+	struct ERA_CORE_API mesh_builder
 	{
 		mesh_builder(uint32 vertexFlags = mesh_creation_flags_default, mesh_index_type indexType = mesh_index_uint16);
 		mesh_builder(const mesh_builder& mesh) = delete;
diff --git a/modules/core/src/rendering/ecs/private/render_system.cpp b/modules/core/src/rendering/ecs/private/render_system.cpp
index 3b41c164f..9667639ad 100644
--- a/modules/core/src/rendering/ecs/private/render_system.cpp
+++ b/modules/core/src/rendering/ecs/private/render_system.cpp
@@ -5,7 +5,6 @@
 #include "core/log.h"
 #include "core/string.h"
 #include "core/cpu_profiling.h"
-#include "core/ecs/input_root_component.h"
 #include "core/ecs/input_reciever_component.h"
 
 #include "rendering/mesh_shader.h"
@@ -46,9 +45,6 @@ namespace era_engine
 		renderer_holder_rc = world->add_root_component<RendererHolderRootComponent>();
 		ASSERT(renderer_holder_rc != nullptr);
 
-		input_rc = world->add_root_component<InputRootComponent>();
-		ASSERT(input_rc != nullptr);
-
 		if (dxContext.featureSupport.raytracing())
 		{
 			raytracingTLAS.initialize();
@@ -86,89 +82,6 @@ namespace era_engine
 		}
 
 		stackArena.initialize();
-
-
-
-
-
-
-		{
-			Entity camera_entity = world->create_entity("Entity1");
-			camera_entity.add_component<CameraHolderComponent>().add_component<InputRecieverComponent>();
-			camera_entity.get_component<CameraHolderComponent>().set_camera_type(CameraHolderComponent::FREE_CAMERA);
-			camera_entity.get_component<CameraHolderComponent>().set_render_camera(&renderer_holder_rc->camera);
-
-			Entity entity2 = world->create_entity("Entity2");
-
-			auto defaultmat = createPBRMaterialAsync({ "", "" });
-			defaultmat->shader = pbr_material_shader_double_sided;
-
-			mesh_builder builder;
-
-			auto sphereMesh = make_ref<multi_mesh>();
-			builder.pushSphere({ });
-			sphereMesh->submeshes.push_back({ builder.endSubmesh(), {}, trs::identity, defaultmat });
-
-			auto boxMesh = make_ref<multi_mesh>();
-			builder.pushBox({ vec3(0.f), vec3(1.f, 1.f, 2.f) });
-			boxMesh->submeshes.push_back({ builder.endSubmesh(), {}, trs::identity, defaultmat });
-
-			PbrMaterialDesc defaultPlaneMatDesc;
-			defaultPlaneMatDesc.albedo = get_asset_path("/resources/assets/uv.jpg");
-			defaultPlaneMatDesc.normal = "";
-			defaultPlaneMatDesc.roughness = "";
-			defaultPlaneMatDesc.uv_scale = 15.0f;
-			defaultPlaneMatDesc.metallic_override = 0.35f;
-			defaultPlaneMatDesc.roughness_override = 0.01f;
-
-			auto defaultPlaneMat = createPBRMaterialAsync(defaultPlaneMatDesc);
-
-			auto groundMesh = make_ref<multi_mesh>();
-			builder.pushBox({ vec3(0.f), vec3(30.f, 4.f, 30.f) });
-			groundMesh->submeshes.push_back({ builder.endSubmesh(), {}, trs::identity, defaultPlaneMat });
-
-			if (auto mesh = loadMeshFromFileAsync(get_asset_path("/resources/assets/Sponza/sponza.obj")))
-			{
-				auto& sponza = world->create_entity("Sponza")
-					.add_component<MeshComponent>(mesh);
-
-				TransformComponent& transform_component = sponza.get_component<TransformComponent>();
-				transform_component.transform.position = vec3(5.0f, -3.75f, 35.0f);
-				transform_component.transform.scale = vec3(0.01f);
-
-				addRaytracingComponentAsync(sponza, mesh);
-			}
-
-			if (auto mesh = loadAnimatedMeshFromFileAsync(get_asset_path("/resources/assets/veribot/source/VERIBOT_final.fbx")))
-			{
-				auto& en = world->create_entity("Veribot")
-					.add_component<animation::AnimationComponent>()
-					.add_component<animation::SkeletonComponent>()
-					.add_component<MeshComponent>(mesh);
-
-				TransformComponent& transform_component = en.get_component<TransformComponent>();
-				transform_component.type = TransformComponent::DYNAMIC;
-				transform_component.transform.position = vec3(5.0f);
-
-				initializeAnimationComponentAsync(en, mesh);
-				addRaytracingComponentAsync(en, mesh);
-			}
-
-			auto chainMesh = make_ref<multi_mesh>();
-
-			groundMesh->mesh =
-				boxMesh->mesh =
-				sphereMesh->mesh =
-				chainMesh->mesh =
-				builder.createDXMesh();
-
-#if 0
-			fireParticleSystem.initialize(10000, 50.f, getAssetPath("/resources/assets/particles/fire_explosion.png"), 6, 6, vec3(0, 1, 30));
-			smokeParticleSystem.initialize(10000, 500.f, getAssetPath("/resources/assets/particles/smoke1.tif"), 5, 5, vec3(0, 1, 15));
-			//boidParticleSystem.initialize(10000, 2000.f);
-			debrisParticleSystem.initialize(10000);
-#endif
-		}
 	}
 
 	RenderSystem::~RenderSystem()
@@ -254,7 +167,9 @@ namespace era_engine
 		renderer->setCamera(camera);
 
 		endFrameCommon();
-		renderer->endFrame(&input_rc->get_frame_input());
+
+		UserInput input{};
+		renderer->endFrame(&input);
 	}
 
 	void RenderSystem::load_custom_shaders()
diff --git a/modules/core/src/rendering/ecs/private/render_system.h b/modules/core/src/rendering/ecs/private/render_system.h
index 3fa42d730..6a6b11ec7 100644
--- a/modules/core/src/rendering/ecs/private/render_system.h
+++ b/modules/core/src/rendering/ecs/private/render_system.h
@@ -17,7 +17,6 @@
 namespace era_engine
 {
 	class RendererHolderRootComponent;
-	class InputRootComponent;
 
 	class RenderSystem final : public System
 	{
@@ -39,7 +38,6 @@ namespace era_engine
 
 	private:
 		RendererHolderRootComponent* renderer_holder_rc = nullptr;
-		InputRootComponent* input_rc = nullptr;
 
 		Allocator stackArena;
 
diff --git a/modules/core/src/rendering/ecs/renderer_holder_root_component.h b/modules/core/src/rendering/ecs/renderer_holder_root_component.h
index 695060522..60cfde22b 100644
--- a/modules/core/src/rendering/ecs/renderer_holder_root_component.h
+++ b/modules/core/src/rendering/ecs/renderer_holder_root_component.h
@@ -13,6 +13,7 @@
 
 namespace era_engine
 {
+	class UserInput;
 
 	class ERA_CORE_API RendererHolderRootComponent final : public Component
 	{
@@ -43,7 +44,10 @@ namespace era_engine
 	private:
 		main_renderer* renderer = nullptr;
 
+		UserInput* active_render_input = nullptr;
+
 		float timestep_scale = 1.0f;
+
 		friend class RenderSystem;
 		friend class InputSystem;
 	};
diff --git a/modules/core/src/rendering/pbr_material.cpp b/modules/core/src/rendering/pbr_material.cpp
index 2075daa92..de8602ad2 100644
--- a/modules/core/src/rendering/pbr_material.cpp
+++ b/modules/core/src/rendering/pbr_material.cpp
@@ -49,9 +49,9 @@ namespace era_engine
 	static std::unordered_map<PbrMaterialDesc, weakref<pbr_material>> materialCache;
 	static std::mutex mutex;
 
-	NODISCARD ref<pbr_material> createPBRMaterial(const PbrMaterialDesc& desc)
+	ref<pbr_material> createPBRMaterial(const PbrMaterialDesc& desc)
 	{
-		Lock lock{ mutex };
+		std::lock_guard lock{ mutex };
 
 		auto sp = materialCache[desc].lock();
 		if (!sp)
@@ -76,9 +76,9 @@ namespace era_engine
 		return sp;
 	}
 
-	NODISCARD ref<pbr_material> createPBRMaterialAsync(const PbrMaterialDesc& desc, JobHandle parentJob)
+	ref<pbr_material> createPBRMaterialAsync(const PbrMaterialDesc& desc, JobHandle parentJob)
 	{
-		Lock lock{ mutex };
+		std::lock_guard lock{ mutex };
 
 		auto sp = materialCache[desc].lock();
 		if (!sp)
@@ -103,7 +103,7 @@ namespace era_engine
 		return sp;
 	}
 
-	NODISCARD ref<pbr_material> getDefaultPBRMaterial()
+	ref<pbr_material> getDefaultPBRMaterial()
 	{
 		static ref<pbr_material> material = createPBRMaterial({});
 		return material;
diff --git a/modules/core/src/rendering/pbr_material.h b/modules/core/src/rendering/pbr_material.h
index dc83070b0..abb384c10 100644
--- a/modules/core/src/rendering/pbr_material.h
+++ b/modules/core/src/rendering/pbr_material.h
@@ -2,6 +2,7 @@
 
 #pragma once
 
+#include "core_api.h"
 #include "core/math.h"
 #include "core/job_system.h"
 
@@ -36,7 +37,7 @@ namespace era_engine
 		float translucency;
 	};
 
-	NODISCARD ref<pbr_material> createPBRMaterial(const PbrMaterialDesc& desc);
-	NODISCARD ref<pbr_material> createPBRMaterialAsync(const PbrMaterialDesc& desc, JobHandle parentJob = {});
-	NODISCARD ref<pbr_material> getDefaultPBRMaterial();
+	ERA_CORE_API ref<pbr_material> createPBRMaterial(const PbrMaterialDesc& desc);
+	ERA_CORE_API ref<pbr_material> createPBRMaterialAsync(const PbrMaterialDesc& desc, JobHandle parentJob = {});
+	ERA_CORE_API ref<pbr_material> getDefaultPBRMaterial();
 }
\ No newline at end of file
diff --git a/modules/physics/CMakeLists.txt b/modules/physics/CMakeLists.txt
index 92edf0148..0fcd0ba49 100644
--- a/modules/physics/CMakeLists.txt
+++ b/modules/physics/CMakeLists.txt
@@ -1,6 +1,11 @@
 include(${CMAKE_SOURCE_DIR}/cmake/common.cmake)
 
 era_begin(physics "MODULE")
+    require_thirdparty_module(physics EnTT)
+    require_thirdparty_module(physics yaml-cpp)
+    require_thirdparty_module(physics rttr_core)
+    require_thirdparty_module(physics DirectXTex)
+    require_module(physics base)
     require_module(physics core)
     require_physx(physics)
     target_compile_definitions(physics PRIVATE ERA_PHYSICS)
diff --git a/tools/assets_compiler/assets_compiler.py b/tools/assets_compiler/assets_compiler.py
index e69de29bb..13a39eae2 100644
--- a/tools/assets_compiler/assets_compiler.py
+++ b/tools/assets_compiler/assets_compiler.py
@@ -0,0 +1,17 @@
+import argparse
+import subprocess
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(prog='AssetsCompiler')
+    parser.add_argument('-p', '--path')
+    parser.add_argument('-v', '--verbose', action='store_true')
+    parser.add_argument('-c', '--compiler')
+    args = parser.parse_args()
+
+    startline = [f'{args.compiler}', f'--verbose={int(args.verbose)}', '--path', f'{args.path}']
+    proc = subprocess.Popen(startline, stdout=subprocess.PIPE)
+    proc.wait()
+    if proc.returncode == 0:
+        print("Compiled successfuly")
+    else:
+        print("Failed to compile asset!")
diff --git a/tools/python_requirements.txt b/tools/python_requirements.txt
index 7ca3f0c83..81209f02a 100644
--- a/tools/python_requirements.txt
+++ b/tools/python_requirements.txt
@@ -1,2 +1,3 @@
 pytest==8.3.4
-pytest-fixtures==0.1.0
\ No newline at end of file
+pytest-fixtures==0.1.0
+argparse=1.4.0
\ No newline at end of file