mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-29 04:06:40 +00:00
Code Issues Releases Wiki Activity

Merge branch 'avpalette' into 'master'

Browse source 
Read NiDefaultAVObjectPalette

See merge request OpenMW/openmw!2698
This commit is contained in:
psi29a 2023-02-08 12:28:51 +00:00
commit 76dfb1b1b4
4 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
components/nif/niffile.cpp
View file

@ -174,6 +174,7 @@ namespace Nif
{ "NiAlphaAccumulator", &construct<NiAlphaAccumulator, RC_NiAlphaAccumulator> }, { "NiAlphaAccumulator", &construct<NiAlphaAccumulator, RC_NiAlphaAccumulator> },
{ "NiSequence", &construct<NiSequence, RC_NiSequence> }, { "NiSequence", &construct<NiSequence, RC_NiSequence> },
{ "NiControllerSequence", &construct<NiControllerSequence, RC_NiControllerSequence> }, { "NiControllerSequence", &construct<NiControllerSequence, RC_NiControllerSequence> },
{ "NiDefaultAVObjectPalette", &construct<NiDefaultAVObjectPalette, RC_NiDefaultAVObjectPalette> },
}; };
} }

15
components/nif/node.cpp
View file

@ -291,4 +291,19 @@ namespace Nif
else else
mMode = (flags >> 5) & 0x3; mMode = (flags >> 5) & 0x3;
} }
void NiDefaultAVObjectPalette::read(NIFStream* nif)
{
mScene.read(nif);
size_t numObjects = nif->getUInt();
for (size_t i = 0; i < numObjects; i++)
mObjects[nif->getSizedString()].read(nif);
}
void NiDefaultAVObjectPalette::post(Reader& nif)
{
mScene.post(nif);
for (auto& object : mObjects)
object.second.post(nif);
}
} }

11
components/nif/node.hpp
View file

@ -1,6 +1,8 @@
#ifndef OPENMW_COMPONENTS_NIF_NODE_HPP #ifndef OPENMW_COMPONENTS_NIF_NODE_HPP
#define OPENMW_COMPONENTS_NIF_NODE_HPP #define OPENMW_COMPONENTS_NIF_NODE_HPP
#include <unordered_map>
#include <osg/Plane> #include <osg/Plane>
#include "base.hpp" #include "base.hpp"
@ -273,5 +275,14 @@ namespace Nif
void read(NIFStream* nif) override; void read(NIFStream* nif) override;
}; };
struct NiDefaultAVObjectPalette : Record
{
NodePtr mScene;
std::unordered_map<std::string, NodePtr> mObjects;
void read(NIFStream* nif) override;
void post(Reader& nif) override;
};
} // Namespace } // Namespace
#endif #endif

1
components/nif/record.hpp
View file

@ -151,6 +151,7 @@ namespace Nif
RC_NiMultiTargetTransformController, RC_NiMultiTargetTransformController,
RC_NiSequence, RC_NiSequence,
RC_NiControllerSequence, RC_NiControllerSequence,
RC_NiDefaultAVObjectPalette,
}; };
/// Base class for all records /// Base class for all records