mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-28 19:21:04 +00:00
Code Issues Projects Releases Wiki Activity

Add NiTriBasedGeomData abstraction

Browse Source
This commit is contained in:
Alexei Kotov 2023-02-10 23:06:56 +03:00
parent 5eba755174
commit d39127cc3d
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/nif/data.cpp
View File

@ -118,14 +118,18 @@ namespace Nif
nif->skip(4); // Additional data nif->skip(4); // Additional data
} }
void NiTriShapeData::read(NIFStream* nif) void NiTriBasedGeomData::read(NIFStream* nif)
{ {
NiGeometryData::read(nif); NiGeometryData::read(nif);
mNumTriangles = nif->getUShort();
}
/*int tris =*/nif->getUShort(); void NiTriShapeData::read(NIFStream* nif)
{
NiTriBasedGeomData::read(nif);
// We have three times as many vertices as triangles, so this // We have three times as many vertices as triangles, so this
// is always equal to tris*3. // is always equal to mNumTriangles * 3.
int cnt = nif->getInt(); int cnt = nif->getInt();
bool hasTriangles = true; bool hasTriangles = true;
if (nif->getVersion() > NIFFile::NIFVersion::VER_OB_OLD) if (nif->getVersion() > NIFFile::NIFVersion::VER_OB_OLD)
@ -147,9 +151,7 @@ namespace Nif
void NiTriStripsData::read(NIFStream* nif) void NiTriStripsData::read(NIFStream* nif)
{ {
NiGeometryData::read(nif); NiTriBasedGeomData::read(nif);
mNumTriangles = nif->getUShort();
// Number of triangle strips // Number of triangle strips
int numStrips = nif->getUShort(); int numStrips = nif->getUShort();

14
components/nif/data.hpp
View File

@ -43,7 +43,15 @@ namespace Nif
void read(NIFStream* nif) override; void read(NIFStream* nif) override;
}; };
struct NiTriShapeData : public NiGeometryData // Abstract
struct NiTriBasedGeomData : public NiGeometryData
{
size_t mNumTriangles;
void read(NIFStream* nif) override;
};
struct NiTriShapeData : public NiTriBasedGeomData
{ {
// Triangles, three vertex indices per triangle // Triangles, three vertex indices per triangle
std::vector<unsigned short> triangles; std::vector<unsigned short> triangles;
@ -51,10 +59,8 @@ namespace Nif
void read(NIFStream* nif) override; void read(NIFStream* nif) override;
}; };
struct NiTriStripsData : public NiGeometryData struct NiTriStripsData : public NiTriBasedGeomData
{ {
size_t mNumTriangles;
// Triangle strips, series of vertex indices. // Triangle strips, series of vertex indices.
std::vector<std::vector<unsigned short>> strips; std::vector<std::vector<unsigned short>> strips;