teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 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); mCloudNode->accept(modClouds);
mCloudUpdater = new CloudUpdater; mCloudUpdater = new CloudUpdater;
//mCloudNode->addUpdateCallback(mCloudUpdater); mCloudNode->addUpdateCallback(mCloudUpdater);
mCloudNode->getOrCreateStateSet()->setAttributeAndModes(createAlphaTrackingUnlitMaterial(), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE); mCloudNode->getOrCreateStateSet()->setAttributeAndModes(createAlphaTrackingUnlitMaterial(), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
mCloudNode->setNodeMask(0);
osg::ref_ptr<osg::Depth> depth = new osg::Depth; osg::ref_ptr<osg::Depth> depth = new osg::Depth;
depth->setWriteMask(false); depth->setWriteMask(false);
mRootNode->getOrCreateStateSet()->setAttributeAndModes(depth, osg::StateAttribute::ON); mRootNode->getOrCreateStateSet()->setAttributeAndModes(depth, osg::StateAttribute::ON);
@ -568,8 +566,7 @@ SkyManager::~SkyManager()
int SkyManager::getMasserPhase() const int SkyManager::getMasserPhase() const
{ {
if (!mCreated) return 0; if (!mCreated) return 0;
return 0; return mMasser->getPhaseInt();
//return mMasser->getPhaseInt();
} }
int SkyManager::getSecundaPhase() const 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. // Callback method called by the NodeVisitor when visiting a node.
void operator()(osg::Node* node, osg::NodeVisitor* nv) void operator()(osg::Node* node, osg::NodeVisitor* nv)
{ {
if (nv && nv->getVisitorType() == osg::NodeVisitor::UPDATE_VISITOR) osgAnimation::Bone* b = static_cast<osgAnimation::Bone*>(node);
{ osgAnimation::Bone* parent = b->getBoneParent();
osgAnimation::Bone* b = dynamic_cast<osgAnimation::Bone*>(node); if (parent)
if (!b) b->setMatrixInSkeletonSpace(b->getMatrixInBoneSpace() * parent->getMatrixInSkeletonSpace());
{ else
OSG_WARN << "Warning: UpdateBone set on non-Bone object." << std::endl; b->setMatrixInSkeletonSpace(b->getMatrixInBoneSpace());
return;
}
osgAnimation::Bone* parent = b->getBoneParent();
if (parent)
b->setMatrixInSkeletonSpace(b->getMatrixInBoneSpace() * parent->getMatrixInSkeletonSpace());
else
b->setMatrixInSkeletonSpace(b->getMatrixInBoneSpace());
}
traverse(node,nv); traverse(node,nv);
} }
}; };

1
components/sceneutil/attach.cpp
View file

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