mirror of
https://github.com/OpenMW/openmw.git
synced 2025-10-31 14:56:38 +00:00
clang-format
This commit is contained in:
mpeco
parent
e10b7e5c82
commit
a2ce37b5b0
3 changed files with 51 additions and 46 deletions
|
|
@ -1,18 +1,20 @@
|
|||
#include "types.hpp"
|
||||
|
||||
#include <components/esm3/loadarmo.hpp>
|
||||
#include <components/lua/luastate.hpp>
|
||||
#include <components/misc/resourcehelpers.hpp>
|
||||
#include <components/resource/resourcesystem.hpp>
|
||||
#include <components/lua/luastate.hpp>
|
||||
|
||||
#include <apps/openmw/mwworld/esmstore.hpp>
|
||||
#include <apps/openmw/mwbase/environment.hpp>
|
||||
#include <apps/openmw/mwbase/world.hpp>
|
||||
#include <apps/openmw/mwworld/esmstore.hpp>
|
||||
|
||||
namespace sol
|
||||
{
|
||||
template <>
|
||||
struct is_automagical<ESM::Armor> : std::false_type {};
|
||||
struct is_automagical<ESM::Armor> : 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<std::string_view, int>({
|
||||
{"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<ESM::Armor>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Armor>();
|
||||
armor["record"] = sol::overload(
|
||||
[](const Object& obj) -> const ESM::Armor* { return obj.ptr().get<ESM::Armor>()->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<ESM::Armor>()->mBase; },
|
||||
[store](const std::string& recordId) -> const ESM::Armor* { return store->find(recordId); });
|
||||
sol::usertype<ESM::Armor> record = context.mLua->sol().new_usertype<ESM::Armor>("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; });
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +1,20 @@
|
|||
#include "types.hpp"
|
||||
|
||||
#include <components/esm3/loadligh.hpp>
|
||||
#include <components/lua/luastate.hpp>
|
||||
#include <components/misc/resourcehelpers.hpp>
|
||||
#include <components/resource/resourcesystem.hpp>
|
||||
#include <components/lua/luastate.hpp>
|
||||
|
||||
#include <apps/openmw/mwworld/esmstore.hpp>
|
||||
#include <apps/openmw/mwbase/environment.hpp>
|
||||
#include <apps/openmw/mwbase/world.hpp>
|
||||
#include <apps/openmw/mwworld/esmstore.hpp>
|
||||
|
||||
namespace sol
|
||||
{
|
||||
template <>
|
||||
struct is_automagical<ESM::Light> : std::false_type {};
|
||||
struct is_automagical<ESM::Light> : std::false_type
|
||||
{
|
||||
};
|
||||
}
|
||||
|
||||
namespace MWLua
|
||||
|
|
@ -22,23 +24,21 @@ namespace MWLua
|
|||
auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
|
||||
|
||||
const MWWorld::Store<ESM::Light>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Light>();
|
||||
light["record"] = sol::overload(
|
||||
[](const Object& obj) -> const ESM::Light* { return obj.ptr().get<ESM::Light>()->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<ESM::Light>()->mBase; },
|
||||
[store](const std::string& recordId) -> const ESM::Light* { return store->find(recordId); });
|
||||
sol::usertype<ESM::Light> record = context.mLua->sol().new_usertype<ESM::Light>("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; });
|
||||
|
|
|
|||
|
|
@ -1,18 +1,20 @@
|
|||
#include "types.hpp"
|
||||
|
||||
#include <components/esm3/loadstat.hpp>
|
||||
#include <components/lua/luastate.hpp>
|
||||
#include <components/misc/resourcehelpers.hpp>
|
||||
#include <components/resource/resourcesystem.hpp>
|
||||
#include <components/lua/luastate.hpp>
|
||||
|
||||
#include <apps/openmw/mwworld/esmstore.hpp>
|
||||
#include <apps/openmw/mwbase/environment.hpp>
|
||||
#include <apps/openmw/mwbase/world.hpp>
|
||||
#include <apps/openmw/mwworld/esmstore.hpp>
|
||||
|
||||
namespace sol
|
||||
{
|
||||
template <>
|
||||
struct is_automagical<ESM::Static> : std::false_type {};
|
||||
struct is_automagical<ESM::Static> : std::false_type
|
||||
{
|
||||
};
|
||||
}
|
||||
|
||||
namespace MWLua
|
||||
|
|
@ -21,15 +23,16 @@ namespace MWLua
|
|||
{
|
||||
auto vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
|
||||
|
||||
const MWWorld::Store<ESM::Static>* store = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>();
|
||||
stat["record"] = sol::overload(
|
||||
[](const Object& obj) -> const ESM::Static* { return obj.ptr().get<ESM::Static>()->mBase; },
|
||||
[store](const std::string& recordId) -> const ESM::Static* { return store->find(recordId); });
|
||||
const MWWorld::Store<ESM::Static>* store
|
||||
= &MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>();
|
||||
stat["record"]
|
||||
= sol::overload([](const Object& obj) -> const ESM::Static* { return obj.ptr().get<ESM::Static>()->mBase; },
|
||||
[store](const std::string& recordId) -> const ESM::Static* { return store->find(recordId); });
|
||||
sol::usertype<ESM::Static> record = context.mLua->sol().new_usertype<ESM::Static>("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);
|
||||
});
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue