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

Merge branch 'billboard' into 'master'

Browse source 
Load NiBillboardNode mode field

See merge request OpenMW/openmw!2355
This commit is contained in:
psi29a 2022-08-31 21:16:41 +00:00
commit 9f5ab540cf
3 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/nif/niffile.cpp
View file

@ -51,7 +51,7 @@ static std::map<std::string, CreateRecord> makeFactory()
{"NiCollisionSwitch" , &construct <NiNode , RC_NiCollisionSwitch >},
{"NiBSParticleNode" , &construct <NiNode , RC_NiBSParticleNode >},
{"NiBSAnimationNode" , &construct <NiNode , RC_NiBSAnimationNode >},
{"NiBillboardNode" , &construct <NiNode , RC_NiBillboardNode >},
{"NiBillboardNode" , &construct <NiBillboardNode , RC_NiBillboardNode >},
{"NiTriShape" , &construct <NiTriShape , RC_NiTriShape >},
{"NiTriStrips" , &construct <NiTriStrips , RC_NiTriStrips >},
{"NiLines" , &construct <NiLines , RC_NiLines >},

9
components/nif/node.cpp
View file

@ -272,4 +272,13 @@ namespace Nif
NiNode::post(nif);
mSubSorter.post(nif);
}
void NiBillboardNode::read(NIFStream *nif)
{
NiNode::read(nif);
if (nif->getVersion() >= NIFStream::generateVersion(10,1,0,0))
mMode = nif->getUShort() & 0x7;
else
mMode = (flags >> 5) & 0x3;
}
}

7
components/nif/node.hpp
View file

@ -251,5 +251,12 @@ struct NiSortAdjustNode : NiNode
void post(NIFFile *nif) override;
};
struct NiBillboardNode : NiNode
{
int mMode{0};
void read(NIFStream *nif) override;
};
} // Namespace
#endif