mirror of
https://github.com/OpenMW/openmw.git
synced 2025-10-16 01:46:40 +00:00
Undo changes to nifkey.hpp
This commit is contained in:
parent
a085036a92
commit
a30b4ad615
1 changed files with 3 additions and 7 deletions
|
@ -174,12 +174,8 @@ namespace Nif
|
||||||
const float y = (1.f - curr.mTension) * (1.f + curr.mContinuity) * (1.f - curr.mBias);
|
const float y = (1.f - curr.mTension) * (1.f + curr.mContinuity) * (1.f - curr.mBias);
|
||||||
const float z = (1.f - curr.mTension) * (1.f + curr.mContinuity) * (1.f + curr.mBias);
|
const float z = (1.f - curr.mTension) * (1.f + curr.mContinuity) * (1.f + curr.mBias);
|
||||||
const float w = (1.f - curr.mTension) * (1.f - curr.mContinuity) * (1.f - curr.mBias);
|
const float w = (1.f - curr.mTension) * (1.f - curr.mContinuity) * (1.f - curr.mBias);
|
||||||
const U prevDelta = prev != nullptr ? curr.mValue - prev->mValue
|
const U prevDelta = prev != nullptr ? curr.mValue - prev->mValue : next->mValue - curr.mValue;
|
||||||
: next != nullptr ? next->mValue - curr.mValue
|
const U nextDelta = next != nullptr ? next->mValue - curr.mValue : curr.mValue - prev->mValue;
|
||||||
: U{};
|
|
||||||
const U nextDelta = next != nullptr ? next->mValue - curr.mValue
|
|
||||||
: prev != nullptr ? curr.mValue - prev->mValue
|
|
||||||
: U{};
|
|
||||||
curr.mInTan = (prevDelta * x + nextDelta * y) * prevLen / (prevLen + nextLen);
|
curr.mInTan = (prevDelta * x + nextDelta * y) * prevLen / (prevLen + nextLen);
|
||||||
curr.mOutTan = (prevDelta * z + nextDelta * w) * nextLen / (prevLen + nextLen);
|
curr.mOutTan = (prevDelta * z + nextDelta * w) * nextLen / (prevLen + nextLen);
|
||||||
}
|
}
|
||||||
|
@ -209,4 +205,4 @@ namespace Nif
|
||||||
using BoolKeyMapPtr = std::shared_ptr<BoolKeyMap>;
|
using BoolKeyMapPtr = std::shared_ptr<BoolKeyMap>;
|
||||||
|
|
||||||
} // Namespace
|
} // Namespace
|
||||||
#endif // #ifndef OPENMW_COMPONENTS_NIF_NIFKEY_HPP
|
#endif //#ifndef OPENMW_COMPONENTS_NIF_NIFKEY_HPP
|
||||||
|
|
Loading…
Reference in a new issue