teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Remove dynamic_cast in GeomMorpherController

Browse source
This commit is contained in:
scrawl 2015-11-22 20:33:22 +01:00
parent 94e8560bf8
commit 28b20428b9
2 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
components/nifosg/controller.cpp
View file

@ -221,28 +221,25 @@ GeomMorpherController::GeomMorpherController(const Nif::NiMorphData *data)
void GeomMorpherController::update(osg::NodeVisitor *nv, osg::Drawable *drawable) void GeomMorpherController::update(osg::NodeVisitor *nv, osg::Drawable *drawable)
{ {
osgAnimation::MorphGeometry* morphGeom = dynamic_cast<osgAnimation::MorphGeometry*>(drawable); osgAnimation::MorphGeometry* morphGeom = static_cast<osgAnimation::MorphGeometry*>(drawable);
if (morphGeom) if (hasInput())
{ {
if (hasInput()) if (mKeyFrames.size() <= 1)
return;
float input = getInputValue(nv);
int i = 0;
for (std::vector<Nif::FloatKeyMapPtr>::iterator it = mKeyFrames.begin()+1; it != mKeyFrames.end(); ++it,++i)
{ {
if (mKeyFrames.size() <= 1) float val = 0;
return; if (!(*it)->mKeys.empty())
float input = getInputValue(nv); val = interpKey((*it)->mKeys, input);
int i = 0; val = std::max(0.f, std::min(1.f, val));
for (std::vector<Nif::FloatKeyMapPtr>::iterator it = mKeyFrames.begin()+1; it != mKeyFrames.end(); ++it,++i)
{
float val = 0;
if (!(*it)->mKeys.empty())
val = interpKey((*it)->mKeys, input);
val = std::max(0.f, std::min(1.f, val));
morphGeom->setWeight(i, val); morphGeom->setWeight(i, val);
}
} }
morphGeom->transformSoftwareMethod();
} }
morphGeom->transformSoftwareMethod();
} }
UVController::UVController() UVController::UVController()

1
components/nifosg/controller.hpp
View file

@ -97,6 +97,7 @@ namespace NifOsg
virtual float getMaximum() const; virtual float getMaximum() const;
}; };
/// Must be set on an osgAnimation::MorphGeometry.
class GeomMorpherController : public osg::Drawable::UpdateCallback, public SceneUtil::Controller, public ValueInterpolator class GeomMorpherController : public osg::Drawable::UpdateCallback, public SceneUtil::Controller, public ValueInterpolator
{ {
public: public: