mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-14 15:40:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'loadBsInvMarker' into 'master'

Browse Source 
Load BSInvMarker NIF nodes

See merge request OpenMW/openmw!3092
This commit is contained in:
psi29a 2023-06-02 07:36:53 +00:00
commit cc213fb437
4 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/nif/extra.cpp
View File

@ -128,4 +128,14 @@ namespace Nif
} }
} }
void BSInvMarker::read(NIFStream* nif)
{
Extra::read(nif);
float rotX = nif->getUShort() / 1000.0;
float rotY = nif->getUShort() / 1000.0;
float rotZ = nif->getUShort() / 1000.0;
mScale = nif->getFloat();
mRotation = osg::Quat(rotX, osg::X_AXIS, rotY, osg::Y_AXIS, rotZ, osg::Z_AXIS);
}
} }

8
components/nif/extra.hpp
View File

@ -146,5 +146,13 @@ namespace Nif
void read(NIFStream* nif) override; void read(NIFStream* nif) override;
}; };
struct BSInvMarker : public Extra
{
osg::Quat mRotation;
float mScale = 1.0f;
void read(NIFStream* nif) override;
};
} // Namespace } // Namespace
#endif #endif

1
components/nif/niffile.cpp
View File

@ -190,6 +190,7 @@ namespace Nif
{ "BSMultiBound", &construct<BSMultiBound, RC_BSMultiBound> }, { "BSMultiBound", &construct<BSMultiBound, RC_BSMultiBound> },
{ "BSMultiBoundOBB", &construct<BSMultiBoundOBB, RC_BSMultiBoundOBB> }, { "BSMultiBoundOBB", &construct<BSMultiBoundOBB, RC_BSMultiBoundOBB> },
{ "BSMultiBoundSphere", &construct<BSMultiBoundSphere, RC_BSMultiBoundSphere> }, { "BSMultiBoundSphere", &construct<BSMultiBoundSphere, RC_BSMultiBoundSphere> },
{ "BSInvMarker", &construct<BSInvMarker, RC_BSInvMarker> },
}; };
} }

1
components/nif/record.hpp
View File

@ -162,6 +162,7 @@ namespace Nif
RC_BSMultiBound, RC_BSMultiBound,
RC_BSMultiBoundOBB, RC_BSMultiBoundOBB,
RC_BSMultiBoundSphere, RC_BSMultiBoundSphere,
RC_BSInvMarker,
}; };
/// Base class for all records /// Base class for all records