sdaveb/elemental-game
sdaveb/elemental-game
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects 1 Releases Wiki Activity

[WIP] Add TOML Support in IOCOre along with convenience macros
Some checks failed
buildbot/elemental-game-macos-builder Build done.
Details
buildbot/elemental-game-linux-builder Build done.
Details
buildbot/elemental-game-freebsd-builder Build done.
Details

Browse Source
This commit is contained in:
S David 2024-06-16 23:15:02 -04:00
parent 7e6173c515
commit fceff7a5fa
6 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@ -1,8 +1,8 @@
[submodule "third_party/QJsonModel"]
path = Modules/third_party/QJsonModel
path = Modules/External/QJsonModel
url = https://gitea.beniquez.me/sdaveb/QJsonModel.git
[submodule "third_party/IOCore"]
path = Modules/third_party/IOCore
path = Modules/External/IOCore
url = https://gitea.beniquez.me/sdaveb/IOCore.git
[submodule "CMake"]
path = CMake

3
Apps/Demos/phong/GameSettings.hpp
View File

@ -11,6 +11,8 @@
#include "types/rendering.hpp"
#include "IOCore/util/toml.hpp"
#include <nlohmann/json.hpp>
namespace elemental {
@ -18,6 +20,7 @@ namespace elemental {
struct GameSettings {
RendererSettings renderer_settings;
// DEFINE_TOML_FIELDS(renderer_settings);
NLOHMANN_DEFINE_TYPE_INTRUSIVE(GameSettings, renderer_settings);
};

10
Modules/CMakeLists.txt
View File

@ -1,9 +1,11 @@
add_subdirectory(third_party/IOCore)
add_subdirectory(third_party/QJsonModel)
SET(MODULES_EXTERNAL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/External)
# Add third_party modules to the C++ include search path
include_directories(third_party)
add_subdirectory(${MODULES_EXTERNAL_DIR}/IOCore)
add_subdirectory(${MODULES_EXTERNAL_DIR}/QJsonModel)
# Add ${MODULES_EXTERNAL_DIR} modules to the C++ include search path
include_directories(${MODULES_EXTERNAL_DIR})
add_subdirectory(elemental)
add_subdirectory(EditorWidgets)

1
Modules/External/IOCore vendored Submodule

@ -0,0 +1 @@
Subproject commit a6ed27cd0dc2ddc103ebb176601a58de3f704fb9

0
Modules/third_party/QJsonModel → Modules/External/QJsonModel vendored
View File

1
Modules/third_party/IOCore vendored

@ -1 +0,0 @@
Subproject commit 94bf8d49872e1e4051dfccde6f03afc9041f01e1