mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-12 00:40:23 +00:00
Code Issues Projects 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
{
T mDefaultValue;
@ -346,10 +346,7 @@ namespace Nif
mData.read(nif);
}
void post(Reader& nif) override
{
mData.post(nif);
}
void post(Reader& nif) override { mData.post(nif); }
};
using NiPoint3Interpolator = TypedNiInterpolator<osg::Vec3f, NiPosDataPtr>;

1
components/nifosg/controller.cpp
View File

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

9
components/nifosg/controller.hpp
View File

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

11
components/nifosg/nifloader.cpp
View File

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