Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-28 21:07:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 40

Don't mess with A/B hardcoding in constraints

Browse source
This commit is contained in:
Alexei Kotov 2023-07-15 06:59:22 +03:00
parent eb3e762c50
commit ed8fd81714
3 changed files with 24 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

36
components/nif/physics.cpp
View file

@ -190,16 +190,16 @@ namespace Nif
void bhkConstraintCInfo::read(NIFStream* nif)
{
nif->get<unsigned int>(); // Number of entities, unused
mEntities.resize(2); // Hardcoded
for (auto& entity : mEntities)
entity.read(nif);
mEntityA.read(nif);
mEntityB.read(nif);
mPriority = static_cast<ConstraintPriority>(nif->get<uint32_t>());
}
void bhkConstraintCInfo::post(Reader& nif)
{
postRecordList(nif, mEntities);
mEntityA.post(nif);
mEntityB.post(nif);
}
void bhkPositionConstraintMotor::read(NIFStream* nif)
@ -254,25 +254,25 @@ namespace Nif
void bhkRagdollConstraintCInfo::read(NIFStream* nif)
{
mEntityData.resize(2); // Hardcoded by the format
if (nif->getBethVersion() <= 16)
{
for (EntityData& data: mEntityData)
{
nif->read(data.mPivot);
nif->read(data.mPlane);
nif->read(data.mTwist);
}
nif->read(mDataA.mPivot);
nif->read(mDataA.mPlane);
nif->read(mDataA.mTwist);
nif->read(mDataB.mPivot);
nif->read(mDataB.mPlane);
nif->read(mDataB.mTwist);
}
else
{
for (EntityData& data: mEntityData)
{
nif->read(data.mTwist);
nif->read(data.mPlane);
nif->read(data.mMotor);
nif->read(data.mPivot);
}
nif->read(mDataA.mTwist);
nif->read(mDataA.mPlane);
nif->read(mDataA.mMotor);
nif->read(mDataA.mPivot);
nif->read(mDataB.mTwist);
nif->read(mDataB.mPlane);
nif->read(mDataB.mMotor);
nif->read(mDataB.mPivot);
}
nif->read(mConeMaxAngle);
nif->read(mPlaneMinAngle);