riyyi/inferno
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Meta: Assets in separate CMakeLists.txt

Browse Source
This commit is contained in:
Riyyi
2023-12-18 21:50:10 +01:00
parent 649d196577
commit 2b0635ed69
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitmodules
+1 -1
View File
@@ -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
CMakeLists.txt
+1 -4
View File
@@ -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
assets/CMakeLists.txt
+4
View File
@@ -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)
src/inferno/scene/scene.cpp
+2 -1
View File
@@ -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);