mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-21 06:16:39 +00:00
Code Issues Releases Wiki Activity

Fix compilation after master merge

Browse source
This commit is contained in:
Sam Hellawell 2024-07-04 03:48:59 +01:00
parent 277c179fe9
commit 380d357d02
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/openmw/mwrender/animblendcontroller.cpp
View file

@ -326,7 +326,16 @@ namespace MWRender
{ {
const osg::Quat rotate = rotateController->getRotate(); const osg::Quat rotate = rotateController->getRotate();
const osg::Vec3f offset = rotateController->getOffset(); const osg::Vec3f offset = rotateController->getOffset();
const osg::Quat worldOrient = rotateController->getWorldOrientation(node) * rotate.inverse();
osg::NodePathList nodepaths = node->getParentalNodePaths(rotateController->getRelativeTo());
osg::Quat worldOrient;
if (!nodepaths.empty())
{
osg::Matrixf worldMat = osg::computeLocalToWorld(nodepaths[0]);
worldOrient = worldMat.getRotate();
}
worldOrient = worldOrient * rotate.inverse();
const osg::Quat worldOrientInverse = worldOrient.inverse(); const osg::Quat worldOrientInverse = worldOrient.inverse();
mBlendStartTrans -= worldOrientInverse * offset; mBlendStartTrans -= worldOrientInverse * offset;

4
apps/openmw/mwrender/rotatecontroller.hpp
View file

@ -20,8 +20,6 @@ namespace MWRender
public: public:
RotateController(osg::Node* relativeTo); RotateController(osg::Node* relativeTo);
osg::Quat getWorldOrientation(osg::Node* node);
void setEnabled(bool enabled); void setEnabled(bool enabled);
void setOffset(const osg::Vec3f& offset); void setOffset(const osg::Vec3f& offset);
void setRotate(const osg::Quat& rotate); void setRotate(const osg::Quat& rotate);
@ -30,6 +28,8 @@ namespace MWRender
const osg::Quat getRotate() const { return mRotate; } const osg::Quat getRotate() const { return mRotate; }
osg::Node* getRelativeTo() const { return mRelativeTo; }
void operator()(osg::MatrixTransform* node, osg::NodeVisitor* nv); void operator()(osg::MatrixTransform* node, osg::NodeVisitor* nv);
protected: protected: