From a2ce37b5b0de581dacde3ce189f7718cfb90f471 Mon Sep 17 00:00:00 2001 From: mpeco Date: Tue, 11 Oct 2022 01:14:17 -0300 Subject: [PATCH] clang-format --- apps/openmw/mwlua/types/armor.cpp | 48 ++++++++++++++++-------------- apps/openmw/mwlua/types/light.cpp | 26 ++++++++-------- apps/openmw/mwlua/types/static.cpp | 23 +++++++------- 3 files changed, 51 insertions(+), 46 deletions(-) diff --git a/apps/openmw/mwlua/types/armor.cpp b/apps/openmw/mwlua/types/armor.cpp index c154dfc29e..70205c7875 100644 --- a/apps/openmw/mwlua/types/armor.cpp +++ b/apps/openmw/mwlua/types/armor.cpp @@ -1,18 +1,20 @@ #include "types.hpp" #include +#include #include #include -#include -#include #include #include +#include namespace sol { template <> - struct is_automagical : std::false_type {}; + struct is_automagical : std::false_type + { + }; } namespace MWLua @@ -20,35 +22,34 @@ namespace MWLua void addArmorBindings(sol::table armor, const Context& context) { armor["TYPE"] = LuaUtil::makeStrictReadOnly(context.mLua->tableFromPairs({ - {"Helmet", ESM::Armor::Helmet}, - {"Cuirass", ESM::Armor::Cuirass}, - {"LPauldron", ESM::Armor::LPauldron}, - {"RPauldron", ESM::Armor::RPauldron}, - {"Greaves", ESM::Armor::Greaves}, - {"Boots", ESM::Armor::Boots}, - {"LGauntlet", ESM::Armor::LGauntlet}, - {"RGauntlet", ESM::Armor::RGauntlet}, - {"Shield", ESM::Armor::Shield}, - {"LBracer", ESM::Armor::LBracer}, - {"RBracer", ESM::Armor::RBracer}, + { "Helmet", ESM::Armor::Helmet }, + { "Cuirass", ESM::Armor::Cuirass }, + { "LPauldron", ESM::Armor::LPauldron }, + { "RPauldron", ESM::Armor::RPauldron }, + { "Greaves", ESM::Armor::Greaves }, + { "Boots", ESM::Armor::Boots }, + { "LGauntlet", ESM::Armor::LGauntlet }, + { "RGauntlet", ESM::Armor::RGauntlet }, + { "Shield", ESM::Armor::Shield }, + { "LBracer", ESM::Armor::LBracer }, + { "RBracer", ESM::Armor::RBracer }, })); auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS(); const MWWorld::Store* store = &MWBase::Environment::get().getWorld()->getStore().get(); - armor["record"] = sol::overload( - [](const Object& obj) -> const ESM::Armor* { return obj.ptr().get()->mBase; }, - [store](const std::string& recordId) -> const ESM::Armor* { return store->find(recordId); }); + armor["record"] + = sol::overload([](const Object& obj) -> const ESM::Armor* { return obj.ptr().get()->mBase; }, + [store](const std::string& recordId) -> const ESM::Armor* { return store->find(recordId); }); sol::usertype record = context.mLua->sol().new_usertype("ESM3_Armor"); - record[sol::meta_function::to_string] = [](const ESM::Armor& rec) -> std::string { return "ESM3_Armor[" + rec.mId + "]"; }; + record[sol::meta_function::to_string] + = [](const ESM::Armor& rec) -> std::string { return "ESM3_Armor[" + rec.mId + "]"; }; record["id"] = sol::readonly_property([](const ESM::Armor& rec) -> std::string { return rec.mId; }); record["name"] = sol::readonly_property([](const ESM::Armor& rec) -> std::string { return rec.mName; }); - record["model"] = sol::readonly_property([vfs](const ESM::Armor& rec) -> std::string - { + record["model"] = sol::readonly_property([vfs](const ESM::Armor& rec) -> std::string { return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs); }); - record["icon"] = sol::readonly_property([vfs](const ESM::Armor& rec) -> std::string - { + record["icon"] = sol::readonly_property([vfs](const ESM::Armor& rec) -> std::string { return Misc::ResourceHelpers::correctIconPath(rec.mIcon, vfs); }); record["enchant"] = sol::readonly_property([](const ESM::Armor& rec) -> std::string { return rec.mEnchant; }); @@ -58,6 +59,7 @@ namespace MWLua record["type"] = sol::readonly_property([](const ESM::Armor& rec) -> int { return rec.mData.mType; }); record["health"] = sol::readonly_property([](const ESM::Armor& rec) -> int { return rec.mData.mHealth; }); record["baseArmor"] = sol::readonly_property([](const ESM::Armor& rec) -> int { return rec.mData.mArmor; }); - record["enchantCapacity"] = sol::readonly_property([](const ESM::Armor& rec) -> float { return rec.mData.mEnchant * 0.1f; }); + record["enchantCapacity"] + = sol::readonly_property([](const ESM::Armor& rec) -> float { return rec.mData.mEnchant * 0.1f; }); } } diff --git a/apps/openmw/mwlua/types/light.cpp b/apps/openmw/mwlua/types/light.cpp index bd969be9bb..aab62f369b 100644 --- a/apps/openmw/mwlua/types/light.cpp +++ b/apps/openmw/mwlua/types/light.cpp @@ -1,18 +1,20 @@ #include "types.hpp" #include +#include #include #include -#include -#include #include #include +#include namespace sol { template <> - struct is_automagical : std::false_type {}; + struct is_automagical : std::false_type + { + }; } namespace MWLua @@ -22,23 +24,21 @@ namespace MWLua auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS(); const MWWorld::Store* store = &MWBase::Environment::get().getWorld()->getStore().get(); - light["record"] = sol::overload( - [](const Object& obj) -> const ESM::Light* { return obj.ptr().get()->mBase; }, - [store](const std::string& recordId) -> const ESM::Light* { return store->find(recordId); }); + light["record"] + = sol::overload([](const Object& obj) -> const ESM::Light* { return obj.ptr().get()->mBase; }, + [store](const std::string& recordId) -> const ESM::Light* { return store->find(recordId); }); sol::usertype record = context.mLua->sol().new_usertype("ESM3_Light"); - record[sol::meta_function::to_string] = [](const ESM::Light& rec) -> std::string { return "ESM3_Light[" + rec.mId + "]"; }; + record[sol::meta_function::to_string] + = [](const ESM::Light& rec) -> std::string { return "ESM3_Light[" + rec.mId + "]"; }; record["id"] = sol::readonly_property([](const ESM::Light& rec) -> std::string { return rec.mId; }); record["name"] = sol::readonly_property([](const ESM::Light& rec) -> std::string { return rec.mName; }); - record["model"] = sol::readonly_property([vfs](const ESM::Light& rec) -> std::string - { + record["model"] = sol::readonly_property([vfs](const ESM::Light& rec) -> std::string { return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs); }); - record["icon"] = sol::readonly_property([vfs](const ESM::Light& rec) -> std::string - { + record["icon"] = sol::readonly_property([vfs](const ESM::Light& rec) -> std::string { return Misc::ResourceHelpers::correctIconPath(rec.mIcon, vfs); }); - record["sound"] = sol::readonly_property([vfs](const ESM::Light& rec) -> std::string - { + record["sound"] = sol::readonly_property([vfs](const ESM::Light& rec) -> std::string { return Misc::ResourceHelpers::correctSoundPath(rec.mSound, vfs); }); record["mwscript"] = sol::readonly_property([](const ESM::Light& rec) -> std::string { return rec.mScript; }); diff --git a/apps/openmw/mwlua/types/static.cpp b/apps/openmw/mwlua/types/static.cpp index 78e9a5864e..d8648412ec 100644 --- a/apps/openmw/mwlua/types/static.cpp +++ b/apps/openmw/mwlua/types/static.cpp @@ -1,18 +1,20 @@ #include "types.hpp" #include +#include #include #include -#include -#include #include #include +#include namespace sol { template <> - struct is_automagical : std::false_type {}; + struct is_automagical : std::false_type + { + }; } namespace MWLua @@ -21,15 +23,16 @@ namespace MWLua { auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS(); - const MWWorld::Store* store = &MWBase::Environment::get().getWorld()->getStore().get(); - stat["record"] = sol::overload( - [](const Object& obj) -> const ESM::Static* { return obj.ptr().get()->mBase; }, - [store](const std::string& recordId) -> const ESM::Static* { return store->find(recordId); }); + const MWWorld::Store* store + = &MWBase::Environment::get().getWorld()->getStore().get(); + stat["record"] + = sol::overload([](const Object& obj) -> const ESM::Static* { return obj.ptr().get()->mBase; }, + [store](const std::string& recordId) -> const ESM::Static* { return store->find(recordId); }); sol::usertype record = context.mLua->sol().new_usertype("ESM3_Static"); - record[sol::meta_function::to_string] = [](const ESM::Static& rec) -> std::string { return "ESM3_Static[" + rec.mId + "]"; }; + record[sol::meta_function::to_string] + = [](const ESM::Static& rec) -> std::string { return "ESM3_Static[" + rec.mId + "]"; }; record["id"] = sol::readonly_property([](const ESM::Static& rec) -> std::string { return rec.mId; }); - record["model"] = sol::readonly_property([vfs](const ESM::Static& rec) -> std::string - { + record["model"] = sol::readonly_property([vfs](const ESM::Static& rec) -> std::string { return Misc::ResourceHelpers::correctMeshPath(rec.mModel, vfs); }); }