From 2b0635ed69fd947343aec3a2d3927cbd231328b5 Mon Sep 17 00:00:00 2001
From: Riyyi <riyyi3@gmail.com>
Date: Mon, 18 Dec 2023 21:50:10 +0100
Subject: [PATCH] Meta: Assets in separate CMakeLists.txt

---
 .gitmodules                 | 2 +-
 CMakeLists.txt              | 5 +----
 assets/CMakeLists.txt       | 4 ++++
 src/inferno/scene/scene.cpp | 3 ++-
 4 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 assets/CMakeLists.txt

diff --git a/.gitmodules b/.gitmodules
index 41d9d2f..8661ac7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,6 +16,6 @@
 [submodule "inferno/vendor/stb/stb"]
 	path = vendor/stb/stb
 	url = https://github.com/nothings/stb
-[submodule "vendor/ruc"]
+[submodule "inferno/vendor/ruc"]
 	path = vendor/ruc
 	url = https://github.com/Riyyi/ruc
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b803e60..fec9518 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,10 +69,7 @@ add_subdirectory("src")
 # ------------------------------------------
 # Assets target
 
-add_custom_target(${ENGINE}-assets
-	COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/copy-assets.cmake
-	WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-add_dependencies(${ENGINE} ${ENGINE}-assets)
+add_subdirectory("assets")
 
 # ------------------------------------------
 # Examples target
diff --git a/assets/CMakeLists.txt b/assets/CMakeLists.txt
new file mode 100644
index 0000000..6e793f3
--- /dev/null
+++ b/assets/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_custom_target(${ENGINE}-assets
+	COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/copy-assets.cmake
+	WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+add_dependencies(${ENGINE} ${ENGINE}-assets)
diff --git a/src/inferno/scene/scene.cpp b/src/inferno/scene/scene.cpp
index 6e67240..559f326 100644
--- a/src/inferno/scene/scene.cpp
+++ b/src/inferno/scene/scene.cpp
@@ -64,8 +64,9 @@ void Scene::initialize()
 	if (cameraJson.exists("script")) {
 		auto& cameraScript = cameraJson.at("script");
 		if (cameraScript.exists("type") && cameraScript.exists("name")) {
+			auto name = cameraScript.at("name").get<std::string>();
 			if (cameraScript.at("type").get<std::string>() == "lua") {
-				addComponent<LuaScriptComponent>(camera, cameraScript.at("name").get<std::string>());
+				addComponent<LuaScriptComponent>(camera, name);
 			}
 			else {
 				addComponent<NativeScriptComponent>(camera, name);