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

Compare commits

base: riyyi/inferno:3d22334be9cf1cae1c3ed49a7887007aa3c26490
Branches Tags
riyyi/inferno:master
...
compare: riyyi/inferno:6972128ad2ebfe26af4ea0290832e661f461b766
Branches Tags
riyyi/inferno:master
2 Commits
3d22334be9 ... 6972128ad2
Author SHA1 Message Date
Riyyi 6972128ad2 Assets: Remove font from test scene, as font assets aren't added yet 2022-09-27 13:12:13 +02:00
Riyyi c858ef3b1d CMake: Always copy assets to build directory, fixes example: $ make run 2022-09-27 13:10:33 +02:00
2 changed files with 2 additions and 11 deletions
Expand all files Collapse all files
CMakeLists.txt
+2 -1
View File
@@ -69,9 +69,10 @@ add_subdirectory("src")
# ------------------------------------------ # ------------------------------------------
# Assets target # Assets target
add_custom_target(${ENGINE}-assets ALL add_custom_target(${ENGINE}-assets
COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/copy-assets.cmake COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/copy-assets.cmake
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
add_dependencies(${ENGINE} ${ENGINE}-assets)
# ------------------------------------------ # ------------------------------------------
# Examples target # Examples target
assets/scene/scene1.json
-10
View File
@@ -36,15 +36,5 @@
"color": [ 1.0, 1.0, 1.0, 1.0 ], "color": [ 1.0, 1.0, 1.0, 1.0 ],
"texture": "assets/gfx/test-inverted.png" "texture": "assets/gfx/test-inverted.png"
} }
],
"text": [
{
"name": "Text",
"content": "HelloWorld!",
"font": "assets/fnt/dejavu-sans",
"font-size": 0,
"width": 150,
"lines": 3
}
] ]
} }