mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-05-13 21:41:29 +00:00
Code Issues Releases Wiki Activity

Handle NiGeomMorpherController interpolator list

Browse source
This commit is contained in:
Alexei Dobrohotov 2020-11-10 23:23:11 +03:00
parent f3f5dcb016
commit a46699fb1e
4 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
components/nif/controller.cpp
View file

@ -216,6 +216,7 @@ namespace Nif
} }
else else
{ {
// TODO: handle weighted interpolators
unsigned int numInterps = nif->getUInt(); unsigned int numInterps = nif->getUInt();
nif->skip(8 * numInterps); nif->skip(8 * numInterps);
} }

21
components/nifosg/controller.cpp
View file

@ -197,10 +197,25 @@ GeomMorpherController::GeomMorpherController(const GeomMorpherController &copy,
{ {
} }
GeomMorpherController::GeomMorpherController(const Nif::NiMorphData *data) GeomMorpherController::GeomMorpherController(const Nif::NiGeomMorpherController* ctrl)
{ {
for (unsigned int i=0; i<data->mMorphs.size(); ++i) if (ctrl->interpolators.length() == 0)
mKeyFrames.emplace_back(data->mMorphs[i].mKeyFrames); {
if (ctrl->data.empty())
return;
for (const auto& morph : ctrl->data->mMorphs)
mKeyFrames.emplace_back(morph.mKeyFrames);
}
else
{
for (size_t i = 0; i < ctrl->interpolators.length(); ++i)
{
if (!ctrl->interpolators[i].empty())
mKeyFrames.emplace_back(ctrl->interpolators[i].getPtr());
else
mKeyFrames.emplace_back();
}
}
} }
void GeomMorpherController::update(osg::NodeVisitor *nv, osg::Drawable *drawable) void GeomMorpherController::update(osg::NodeVisitor *nv, osg::Drawable *drawable)

2
components/nifosg/controller.hpp
View file

@ -218,7 +218,7 @@ namespace NifOsg
class GeomMorpherController : public osg::Drawable::UpdateCallback, public SceneUtil::Controller class GeomMorpherController : public osg::Drawable::UpdateCallback, public SceneUtil::Controller
{ {
public: public:
GeomMorpherController(const Nif::NiMorphData* data); GeomMorpherController(const Nif::NiGeomMorpherController* ctrl);
GeomMorpherController(); GeomMorpherController();
GeomMorpherController(const GeomMorpherController& copy, const osg::CopyOp& copyop); GeomMorpherController(const GeomMorpherController& copy, const osg::CopyOp& copyop);

2
components/nifosg/nifloader.cpp
View file

@ -1244,7 +1244,7 @@ namespace NifOsg
continue; continue;
drawable = handleMorphGeometry(nimorphctrl, geom, parentNode, composite, boundTextures, animflags); drawable = handleMorphGeometry(nimorphctrl, geom, parentNode, composite, boundTextures, animflags);
osg::ref_ptr<GeomMorpherController> morphctrl = new GeomMorpherController(nimorphctrl->data.getPtr()); osg::ref_ptr<GeomMorpherController> morphctrl = new GeomMorpherController(nimorphctrl);
setupController(ctrl.getPtr(), morphctrl, animflags); setupController(ctrl.getPtr(), morphctrl, animflags);
drawable->setUpdateCallback(morphctrl); drawable->setUpdateCallback(morphctrl);
break; break;