mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-02 00:36:40 +00:00
Code Issues Releases Wiki Activity

Fix formatting

Browse source
This commit is contained in:
Alexei Kotov 2023-09-14 05:11:40 +03:00
parent 8856dff3db
commit f271c4305a
4 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
components/nif/controller.hpp
View file

@ -334,7 +334,7 @@ namespace Nif
{ {
}; };
template<class T, class DataPtr> template <class T, class DataPtr>
struct TypedNiInterpolator : public NiInterpolator struct TypedNiInterpolator : public NiInterpolator
{ {
T mDefaultValue; T mDefaultValue;
@ -346,10 +346,7 @@ namespace Nif
mData.read(nif); mData.read(nif);
} }
void post(Reader& nif) override void post(Reader& nif) override { mData.post(nif); }
{
mData.post(nif);
}
}; };
using NiPoint3Interpolator = TypedNiInterpolator<osg::Vec3f, NiPosDataPtr>; using NiPoint3Interpolator = TypedNiInterpolator<osg::Vec3f, NiPosDataPtr>;

1
components/nifosg/controller.cpp
View file

@ -185,7 +185,6 @@ namespace NifOsg
if (!mScales.empty()) if (!mScales.empty())
node->setScale(mScales.interpKey(time)); node->setScale(mScales.interpKey(time));
} }
traverse(node, nv); traverse(node, nv);

9
components/nifosg/controller.hpp
View file

@ -63,11 +63,10 @@ namespace NifOsg
ValueInterpolator() = default; ValueInterpolator() = default;
template <class T, template <class T,
typename typename = std::enable_if_t<
= std::enable_if_t<std::conjunction_v<std::disjunction<std::is_same<ValueT, float>, std::conjunction_v<std::disjunction<std::is_same<ValueT, float>, std::is_same<ValueT, osg::Vec3f>,
std::is_same<ValueT, osg::Vec3f>, std::is_same<ValueT, bool>, std::is_same<ValueT, bool>, std::is_same<ValueT, osg::Vec4f>>,
std::is_same<ValueT, osg::Vec4f>>, std::is_same<decltype(T::mDefaultValue), ValueT>>,
std::is_same<decltype(T::mDefaultValue), ValueT>>,
T>> T>>
ValueInterpolator(const T* interpolator) ValueInterpolator(const T* interpolator)
: mDefaultVal(interpolator->mDefaultValue) : mDefaultVal(interpolator->mDefaultValue)

11
components/nifosg/nifloader.cpp
View file

@ -995,9 +995,8 @@ namespace NifOsg
continue; continue;
if (!interp.empty() && interp->recType != Nif::RC_NiPoint3Interpolator) if (!interp.empty() && interp->recType != Nif::RC_NiPoint3Interpolator)
{ {
Log(Debug::Error) Log(Debug::Error) << "Unsupported interpolator type for NiMaterialColorController "
<< "Unsupported interpolator type for NiMaterialColorController " << matctrl->recIndex << matctrl->recIndex << " in " << mFilename << ": " << interp->recName;
<< " in " << mFilename << ": " << interp->recName;
continue; continue;
} }
osg::ref_ptr<MaterialColorController> osgctrl = new MaterialColorController(matctrl, baseMaterial); osg::ref_ptr<MaterialColorController> osgctrl = new MaterialColorController(matctrl, baseMaterial);
@ -1280,8 +1279,10 @@ namespace NifOsg
handleParticleInitialState(nifNode, partsys, partctrl); handleParticleInitialState(nifNode, partsys, partctrl);
partsys->getDefaultParticleTemplate().setSizeRange(osgParticle::rangef(partctrl->mInitialSize, partctrl->mInitialSize)); partsys->getDefaultParticleTemplate().setSizeRange(
partsys->getDefaultParticleTemplate().setColorRange(osgParticle::rangev4(partctrl->mInitialColor, partctrl->mInitialColor)); osgParticle::rangef(partctrl->mInitialSize, partctrl->mInitialSize));
partsys->getDefaultParticleTemplate().setColorRange(
osgParticle::rangev4(partctrl->mInitialColor, partctrl->mInitialColor));
partsys->getDefaultParticleTemplate().setAlphaRange(osgParticle::rangef(1.f, 1.f)); partsys->getDefaultParticleTemplate().setAlphaRange(osgParticle::rangef(1.f, 1.f));
if (!partctrl->mEmitter.empty()) if (!partctrl->mEmitter.empty())