mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-30 15:15:31 +00:00
Code Issues Releases Wiki Activity

Fix skinning bug

Browse source
This commit is contained in:
scrawl 2015-04-15 22:38:43 +02:00
parent 5b8c28f641
commit c334a76a6f
3 changed files with 9 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/openmw/mwrender/sky.cpp
View file

@ -546,12 +546,10 @@ void SkyManager::create()
mCloudNode->accept(modClouds);
mCloudUpdater = new CloudUpdater;
//mCloudNode->addUpdateCallback(mCloudUpdater);
mCloudNode->addUpdateCallback(mCloudUpdater);
mCloudNode->getOrCreateStateSet()->setAttributeAndModes(createAlphaTrackingUnlitMaterial(), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
mCloudNode->setNodeMask(0);
osg::ref_ptr<osg::Depth> depth = new osg::Depth;
depth->setWriteMask(false);
mRootNode->getOrCreateStateSet()->setAttributeAndModes(depth, osg::StateAttribute::ON);
@ -568,8 +566,7 @@ SkyManager::~SkyManager()
int SkyManager::getMasserPhase() const
{
if (!mCreated) return 0;
return 0;
//return mMasser->getPhaseInt();
return mMasser->getPhaseInt();
}
int SkyManager::getSecundaPhase() const

21
components/nifosg/nifloader.cpp
View file

@ -222,21 +222,12 @@ namespace
// Callback method called by the NodeVisitor when visiting a node.
void operator()(osg::Node* node, osg::NodeVisitor* nv)
{
if (nv && nv->getVisitorType() == osg::NodeVisitor::UPDATE_VISITOR)
{
osgAnimation::Bone* b = dynamic_cast<osgAnimation::Bone*>(node);
if (!b)
{
OSG_WARN << "Warning: UpdateBone set on non-Bone object." << std::endl;
return;
}
osgAnimation::Bone* parent = b->getBoneParent();
if (parent)
b->setMatrixInSkeletonSpace(b->getMatrixInBoneSpace() * parent->getMatrixInSkeletonSpace());
else
b->setMatrixInSkeletonSpace(b->getMatrixInBoneSpace());
}
osgAnimation::Bone* b = static_cast<osgAnimation::Bone*>(node);
osgAnimation::Bone* parent = b->getBoneParent();
if (parent)
b->setMatrixInSkeletonSpace(b->getMatrixInBoneSpace() * parent->getMatrixInSkeletonSpace());
else
b->setMatrixInSkeletonSpace(b->getMatrixInBoneSpace());
traverse(node,nv);
}
};

1
components/sceneutil/attach.cpp
View file

@ -96,6 +96,7 @@ namespace SceneUtil
bone->addUpdateCallback(old);
}
}
traverse(node);
}
private: