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

Merge branch 'itsakindoftemplatemagic' into 'master'

Browse source 
Fix MSVC2017 builds

See merge request OpenMW/openmw!404
This commit is contained in:
AnyOldName3 2020-11-13 17:22:22 +00:00
commit 981fffe590
1 changed files with 26 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
components/nifosg/controller.hpp
View file

@ -10,6 +10,7 @@
#include <components/sceneutil/statesetupdater.hpp>
#include <set>
#include <type_traits>
#include <osg/Texture2D>
@ -58,8 +59,31 @@ namespace NifOsg
using ValueT = typename MapT::ValueType;
ValueInterpolator() = default;
ValueInterpolator(const Nif::NiFloatInterpolator* interpolator) = delete;
ValueInterpolator(const Nif::NiPoint3Interpolator* interpolator) = delete;
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<decltype(T::defaultVal), ValueT>
>,
T
>
>
ValueInterpolator(const T* interpolator) : mDefaultVal(interpolator->defaultVal)
{
if (interpolator->data.empty())
return;
mKeys = interpolator->data->mKeyList;
if (mKeys)
{
mLastLowKey = mKeys->mKeys.end();
mLastHighKey = mKeys->mKeys.end();
}
};
ValueInterpolator(std::shared_ptr<const MapT> keys, ValueT defaultVal = ValueT())
: mKeys(keys)
@ -163,34 +187,6 @@ namespace NifOsg
using Vec3Interpolator = ValueInterpolator<Nif::Vector3KeyMap>;
using Vec4Interpolator = ValueInterpolator<Nif::Vector4KeyMap>;
template<>
inline FloatInterpolator::ValueInterpolator(const Nif::NiFloatInterpolator* interpolator)
: mDefaultVal(interpolator->defaultVal)
{
if (interpolator->data.empty())
return;
mKeys = interpolator->data->mKeyList;
if (mKeys)
{
mLastLowKey = mKeys->mKeys.end();
mLastHighKey = mKeys->mKeys.end();
}
}
template<>
inline Vec3Interpolator::ValueInterpolator(const Nif::NiPoint3Interpolator* interpolator)
: mDefaultVal(interpolator->defaultVal)
{
if (interpolator->data.empty())
return;
mKeys = interpolator->data->mKeyList;
if (mKeys)
{
mLastLowKey = mKeys->mKeys.end();
mLastHighKey = mKeys->mKeys.end();
}
}
class ControllerFunction : public SceneUtil::ControllerFunction
{
private: