mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-14 01:19:59 +00:00
Code Issues Projects Releases Wiki Activity

Changed to global for testing. Since it a getter - probably should change to regular object.

Browse Source
This commit is contained in:
MaxYari 2025-03-07 21:09:16 +01:00
parent 5750be2ad1
commit c0f733cdce
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apps/openmw/mwlua/types/actor.cpp
View File

@ -223,26 +223,27 @@ namespace MWLua
{ "CarriedRight", MWWorld::InventoryStore::Slot_CarriedRight },
{ "CarriedLeft", MWWorld::InventoryStore::Slot_CarriedLeft },
{ "Ammunition", MWWorld::InventoryStore::Slot_Ammunition } }));
actor["getBonePosition"] = [](const SelfObject& self, std::string_view boneName) -> sol::optional<osg::Vec3d> {
const MWWorld::Class& cls = self.ptr().getClass();
if (!cls.isActor())
throw std::runtime_error("Actor expected");
actor["getBonePosition"] = [](const GObject& o, std::string_view boneName) -> sol::optional<osg::Vec3f> {
const MWWorld::Class& cls = o.ptr().getClass();
// Need to accept self OR a global object
/*if (!cls.isActor())
throw std::runtime_error("Actor expected");*/
std::optional<osg::Matrix> boneTransform
= findBoneWorldTransform(self.ptr().getRefData().getBaseNode(), boneName);
= findBoneWorldTransform(o.ptr().getRefData().getBaseNode(), boneName);
if (!boneTransform.has_value())
return sol::nullopt;
return boneTransform.value().getTrans();
return static_cast<osg::Vec3f>(boneTransform.value().getTrans());
};
actor["getBoneRotation"] = [](const SelfObject& self, std::string_view boneName) -> sol::optional<osg::Quat> {
const MWWorld::Class& cls = self.ptr().getClass();
actor["getBoneRotation"] = [](const GObject& o, std::string_view boneName) -> sol::optional<osg::Quat> {
const MWWorld::Class& cls = o.ptr().getClass();
if (!cls.isActor())
throw std::runtime_error("Actor expected");
std::optional<osg::Matrix> boneTransform
= findBoneWorldTransform(self.ptr().getRefData().getBaseNode(), boneName);
= findBoneWorldTransform(o.ptr().getRefData().getBaseNode(), boneName);
if (!boneTransform.has_value())
return sol::nullopt;