drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 5 Pull Requests Actions Releases 8 Activity

[nostalgia] Use requireTypeNameModel in place of getTypeNameModel where it makes sense

Browse Source
This commit is contained in:
Gary Talent 2021-12-01 02:30:03 -06:00
parent 7aead742eb
commit e0364925a3
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nostalgia/core/assetmanager.hpp
View File

@ -170,7 +170,7 @@ class AssetManager {
template<typename T> template<typename T>
AssetTypeManager<T> *getTypeManager() noexcept { AssetTypeManager<T> *getTypeManager() noexcept {
constexpr auto typeName = ox::ModelTypeName_v<T>; constexpr auto typeName = ox::requireModelTypeName<T>();
static_assert(ox_strcmp(typeName, "") != 0, "Types must have TypeName to use AssetManager"); static_assert(ox_strcmp(typeName, "") != 0, "Types must have TypeName to use AssetManager");
auto &am = m_assetTypeManagers[typeName]; auto &am = m_assetTypeManagers[typeName];
if (!am) { if (!am) {

14
src/nostalgia/studio/lib/configio.hpp
View File

@ -40,7 +40,7 @@ constexpr auto ConfigDir = [] {
}(); }();
template<typename T> template<typename T>
ox::Result<T> readConfig(core::Context *ctx, const ox::String &name = ox::getModelTypeName<T>()) noexcept { ox::Result<T> readConfig(core::Context *ctx, const ox::String &name) noexcept {
oxAssert(name != "", "Config type has no TypeName"); oxAssert(name != "", "Config type has no TypeName");
const auto homeDir = std::getenv("HOME"); const auto homeDir = std::getenv("HOME");
const auto configPath = ox::sfmt(ConfigDir, homeDir, ctx->appName).toStdString(); const auto configPath = ox::sfmt(ConfigDir, homeDir, ctx->appName).toStdString();
@ -62,6 +62,12 @@ ox::Result<T> readConfig(core::Context *ctx, const ox::String &name = ox::getMod
} }
} }
template<typename T>
ox::Result<T> readConfig(core::Context *ctx) noexcept {
constexpr auto TypeName = ox::requireModelTypeName<T>();
return readConfig<T>(ctx, TypeName);
}
template<typename T> template<typename T>
ox::Error writeConfig(core::Context *ctx, const ox::String &name, T *data) noexcept { ox::Error writeConfig(core::Context *ctx, const ox::String &name, T *data) noexcept {
oxAssert(name != "", "Config type has no TypeName"); oxAssert(name != "", "Config type has no TypeName");
@ -91,7 +97,7 @@ ox::Error writeConfig(core::Context *ctx, const ox::String &name, T *data) noexc
template<typename T> template<typename T>
ox::Error writeConfig(core::Context *ctx, T *data) noexcept { ox::Error writeConfig(core::Context *ctx, T *data) noexcept {
const auto TypeName = ox::getModelTypeName<T>(); constexpr auto TypeName = ox::requireModelTypeName<T>();
return writeConfig(ctx, TypeName, data); return writeConfig(ctx, TypeName, data);
} }
@ -104,7 +110,7 @@ void openConfig(core::Context *ctx, const ox::String &name, Func f) noexcept {
template<typename T, typename Func> template<typename T, typename Func>
void openConfig(core::Context *ctx, Func f) noexcept { void openConfig(core::Context *ctx, Func f) noexcept {
const auto TypeName = ox::getModelTypeName<T>(); constexpr auto TypeName = ox::requireModelTypeName<T>();
openConfig<T>(ctx, TypeName, f); openConfig<T>(ctx, TypeName, f);
} }
@ -118,7 +124,7 @@ void editConfig(core::Context *ctx, const ox::String &name, Func f) noexcept {
template<typename T, typename Func> template<typename T, typename Func>
void editConfig(core::Context *ctx, Func f) noexcept { void editConfig(core::Context *ctx, Func f) noexcept {
const auto TypeName = ox::getModelTypeName<T>(); constexpr auto TypeName = ox::requireModelTypeName<T>();
editConfig<T>(ctx, TypeName, f); editConfig<T>(ctx, TypeName, f);
} }