mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-22 12:39:59 +00:00
Code Issues Projects Releases Wiki Activity

Use std::variant in CachedStat

Browse Source
This commit is contained in:
Evil Eye 2023-06-06 18:34:25 +02:00
parent 65b22975c9
commit 15a5fa84f6
2 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/openmw/mwlua/localscripts.hpp
View File

@ -4,6 +4,7 @@
#include <memory> #include <memory>
#include <set> #include <set>
#include <string> #include <string>
#include <utility>
#include <components/lua/luastate.hpp> #include <components/lua/luastate.hpp>
#include <components/lua/scriptscontainer.hpp> #include <components/lua/scriptscontainer.hpp>
@ -21,11 +22,12 @@ namespace MWLua
class CachedStat class CachedStat
{ {
public: public:
using Setter = void (*)(int, std::string_view, const MWWorld::Ptr&, const sol::object&); using Index = std::variant<int, ESM::RefId>;
using Setter = void (*)(const Index&, std::string_view, const MWWorld::Ptr&, const sol::object&);
CachedStat(Setter setter, int index, std::string_view prop) CachedStat(Setter setter, Index index, std::string_view prop)
: mSetter(setter) : mSetter(setter)
, mIndex(index) , mIndex(std::move(index))
, mProp(std::move(prop)) , mProp(std::move(prop))
{ {
} }
@ -42,7 +44,7 @@ namespace MWLua
private: private:
Setter mSetter; // Function that updates a stat's property Setter mSetter; // Function that updates a stat's property
int mIndex; // Optional index to disambiguate the stat Index mIndex; // Optional index to disambiguate the stat
std::string_view mProp; // Name of the stat's property std::string_view mProp; // Name of the stat's property
}; };

47
apps/openmw/mwlua/stats.cpp
View File

@ -24,9 +24,10 @@ namespace
{ {
using SelfObject = MWLua::SelfObject; using SelfObject = MWLua::SelfObject;
using ObjectVariant = MWLua::ObjectVariant; using ObjectVariant = MWLua::ObjectVariant;
using Index = const SelfObject::CachedStat::Index&;
template <class T, class I> template <class T>
auto addIndexedAccessor(I index) auto addIndexedAccessor(Index index)
{ {
return [index](const sol::object& o) { return T::create(ObjectVariant(o), index); }; return [index](const sol::object& o) { return T::create(ObjectVariant(o), index); };
} }
@ -40,7 +41,7 @@ namespace
template <class G> template <class G>
sol::object getValue(const MWLua::Context& context, const ObjectVariant& obj, SelfObject::CachedStat::Setter setter, sol::object getValue(const MWLua::Context& context, const ObjectVariant& obj, SelfObject::CachedStat::Setter setter,
int index, std::string_view prop, G getter) Index index, std::string_view prop, G getter)
{ {
if (obj.isSelfObject()) if (obj.isSelfObject())
{ {
@ -99,14 +100,14 @@ namespace MWLua
return sol::make_object(context.mLua->sol(), ptr.getClass().getNpcStats(ptr).getLevelProgress()); return sol::make_object(context.mLua->sol(), ptr.getClass().getNpcStats(ptr).getLevelProgress());
} }
static std::optional<LevelStat> create(ObjectVariant object, int index) static std::optional<LevelStat> create(ObjectVariant object, Index)
{ {
if (!object.ptr().getClass().isActor()) if (!object.ptr().getClass().isActor())
return {}; return {};
return LevelStat{ std::move(object) }; return LevelStat{ std::move(object) };
} }
static void setValue(int, std::string_view prop, const MWWorld::Ptr& ptr, const sol::object& value) static void setValue(Index, std::string_view prop, const MWWorld::Ptr& ptr, const sol::object& value)
{ {
auto& stats = ptr.getClass().getCreatureStats(ptr); auto& stats = ptr.getClass().getCreatureStats(ptr);
if (prop == "current") if (prop == "current")
@ -135,10 +136,11 @@ namespace MWLua
}); });
} }
static std::optional<DynamicStat> create(ObjectVariant object, int index) static std::optional<DynamicStat> create(ObjectVariant object, Index i)
{ {
if (!object.ptr().getClass().isActor()) if (!object.ptr().getClass().isActor())
return {}; return {};
int index = std::get<int>(i);
return DynamicStat{ std::move(object), index }; return DynamicStat{ std::move(object), index };
} }
@ -149,8 +151,9 @@ namespace MWLua
obj->mStatsCache[SelfObject::CachedStat{ &DynamicStat::setValue, mIndex, prop }] = value; obj->mStatsCache[SelfObject::CachedStat{ &DynamicStat::setValue, mIndex, prop }] = value;
} }
static void setValue(int index, std::string_view prop, const MWWorld::Ptr& ptr, const sol::object& value) static void setValue(Index i, std::string_view prop, const MWWorld::Ptr& ptr, const sol::object& value)
{ {
int index = std::get<int>(i);
auto& stats = ptr.getClass().getCreatureStats(ptr); auto& stats = ptr.getClass().getCreatureStats(ptr);
auto stat = stats.getDynamic(index); auto stat = stats.getDynamic(index);
float floatValue = LuaUtil::cast<float>(value); float floatValue = LuaUtil::cast<float>(value);
@ -193,10 +196,11 @@ namespace MWLua
return std::max(0.f, base - damage + modifier); // Should match AttributeValue::getModified return std::max(0.f, base - damage + modifier); // Should match AttributeValue::getModified
} }
static std::optional<AttributeStat> create(ObjectVariant object, int index) static std::optional<AttributeStat> create(ObjectVariant object, Index i)
{ {
if (!object.ptr().getClass().isActor()) if (!object.ptr().getClass().isActor())
return {}; return {};
int index = std::get<int>(i);
return AttributeStat{ std::move(object), index }; return AttributeStat{ std::move(object), index };
} }
@ -207,8 +211,9 @@ namespace MWLua
obj->mStatsCache[SelfObject::CachedStat{ &AttributeStat::setValue, mIndex, prop }] = value; obj->mStatsCache[SelfObject::CachedStat{ &AttributeStat::setValue, mIndex, prop }] = value;
} }
static void setValue(int index, std::string_view prop, const MWWorld::Ptr& ptr, const sol::object& value) static void setValue(Index i, std::string_view prop, const MWWorld::Ptr& ptr, const sol::object& value)
{ {
int index = std::get<int>(i);
auto& stats = ptr.getClass().getCreatureStats(ptr); auto& stats = ptr.getClass().getCreatureStats(ptr);
auto stat = stats.getAttribute(index); auto stat = stats.getAttribute(index);
float floatValue = LuaUtil::cast<float>(value); float floatValue = LuaUtil::cast<float>(value);
@ -255,9 +260,9 @@ namespace MWLua
template <class G> template <class G>
sol::object get(const Context& context, std::string_view prop, G getter) const sol::object get(const Context& context, std::string_view prop, G getter) const
{ {
return getValue(context, mObject, &SkillStat::setValue, mId.getIf<ESM::IndexRefId>()->getValue(), prop, return getValue(context, mObject, &SkillStat::setValue, mId, prop, [this, getter](const MWWorld::Ptr& ptr) {
[this, getter]( return (ptr.getClass().getNpcStats(ptr).getSkill(mId).*getter)();
const MWWorld::Ptr& ptr) { return (ptr.getClass().getNpcStats(ptr).getSkill(mId).*getter)(); }); });
} }
float getModified(const Context& context) const float getModified(const Context& context) const
@ -270,16 +275,16 @@ namespace MWLua
sol::object getProgress(const Context& context) const sol::object getProgress(const Context& context) const
{ {
return getValue(context, mObject, &SkillStat::setValue, mId.getIf<ESM::IndexRefId>()->getValue(), return getValue(context, mObject, &SkillStat::setValue, mId, "progress", [this](const MWWorld::Ptr& ptr) {
"progress", [this](const MWWorld::Ptr& ptr) { return getProgress(ptr, mId, ptr.getClass().getNpcStats(ptr).getSkill(mId));
return getProgress(ptr, mId, ptr.getClass().getNpcStats(ptr).getSkill(mId)); });
});
} }
static std::optional<SkillStat> create(ObjectVariant object, ESM::RefId id) static std::optional<SkillStat> create(ObjectVariant object, Index index)
{ {
if (!object.ptr().getClass().isNpc()) if (!object.ptr().getClass().isNpc())
return {}; return {};
ESM::RefId id = std::get<ESM::RefId>(index);
return SkillStat{ std::move(object), id }; return SkillStat{ std::move(object), id };
} }
@ -287,14 +292,12 @@ namespace MWLua
{ {
SelfObject* obj = mObject.asSelfObject(); SelfObject* obj = mObject.asSelfObject();
addStatUpdateAction(context.mLuaManager, *obj); addStatUpdateAction(context.mLuaManager, *obj);
obj->mStatsCache[SelfObject::CachedStat{ obj->mStatsCache[SelfObject::CachedStat{ &SkillStat::setValue, mId, prop }] = value;
&SkillStat::setValue, int(mId.getIf<ESM::IndexRefId>()->getValue()), prop }]
= value;
} }
static void setValue(int index, std::string_view prop, const MWWorld::Ptr& ptr, const sol::object& value) static void setValue(Index index, std::string_view prop, const MWWorld::Ptr& ptr, const sol::object& value)
{ {
ESM::RefId id = ESM::Skill::indexToRefId(index); ESM::RefId id = std::get<ESM::RefId>(index);
auto& stats = ptr.getClass().getNpcStats(ptr); auto& stats = ptr.getClass().getNpcStats(ptr);
auto stat = stats.getSkill(id); auto stat = stats.getSkill(id);
float floatValue = LuaUtil::cast<float>(value); float floatValue = LuaUtil::cast<float>(value);