From df1014303d5c2a2e2006f5f0753602bae3df0ee1 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Tue, 6 Oct 2020 20:52:21 +0300
Subject: [PATCH] Add more generic extra data NIF types

---
 components/nif/extra.cpp   | 50 ++++++++++++++++++++++++++++++++++++++
 components/nif/extra.hpp   | 49 +++++++++++++++++++++++++++++++++++++
 components/nif/niffile.cpp |  8 ++++++
 components/nif/record.hpp  | 10 +++++++-
 4 files changed, 116 insertions(+), 1 deletion(-)

diff --git a/components/nif/extra.cpp b/components/nif/extra.cpp
index cb654d5a0..d08e5d738 100644
--- a/components/nif/extra.cpp
+++ b/components/nif/extra.cpp
@@ -29,6 +29,56 @@ void NiVertWeightsExtraData::read(NIFStream *nif)
     nif->skip(nif->getUShort() * sizeof(float)); // vertex weights I guess
 }
 
+void NiIntegerExtraData::read(NIFStream *nif)
+{
+    Extra::read(nif);
+
+    data = nif->getUInt();
+}
+
+void NiIntegersExtraData::read(NIFStream *nif)
+{
+    Extra::read(nif);
+
+    unsigned int num = nif->getUInt();
+    if (num)
+        nif->getUInts(data, num);
+}
+
+void NiBinaryExtraData::read(NIFStream *nif)
+{
+    Extra::read(nif);
+    unsigned int size = nif->getUInt();
+    if (size)
+        nif->getChars(data, size);
+}
+
+void NiBooleanExtraData::read(NIFStream *nif)
+{
+    Extra::read(nif);
+    data = nif->getBoolean();
+}
+
+void NiVectorExtraData::read(NIFStream *nif)
+{
+    Extra::read(nif);
+    data = nif->getVector4();
+}
+
+void NiFloatExtraData::read(NIFStream *nif)
+{
+    Extra::read(nif);
+
+    data = nif->getFloat();
+}
+
+void NiFloatsExtraData::read(NIFStream *nif)
+{
+    Extra::read(nif);
+    unsigned int num = nif->getUInt();
+    if (num)
+        nif->getFloats(data, num);
+}
 
 
 }
diff --git a/components/nif/extra.hpp b/components/nif/extra.hpp
index d935add55..0e8cc16bf 100644
--- a/components/nif/extra.hpp
+++ b/components/nif/extra.hpp
@@ -60,5 +60,54 @@ public:
     void read(NIFStream *nif);
 };
 
+struct NiIntegerExtraData : public Extra
+{
+    unsigned int data;
+
+    void read(NIFStream *nif);
+};
+
+struct NiIntegersExtraData : public Extra
+{
+    std::vector<unsigned int> data;
+
+    void read(NIFStream *nif);
+};
+
+struct NiBinaryExtraData : public Extra
+{
+    std::vector<char> data;
+
+    void read(NIFStream *nif);
+};
+
+struct NiBooleanExtraData : public Extra
+{
+    bool data;
+
+    void read(NIFStream *nif);
+};
+
+struct NiVectorExtraData : public Extra
+{
+    osg::Vec4f data;
+
+    void read(NIFStream *nif);
+};
+
+struct NiFloatExtraData : public Extra
+{
+    float data;
+
+    void read(NIFStream *nif);
+};
+
+struct NiFloatsExtraData : public Extra
+{
+    std::vector<float> data;
+
+    void read(NIFStream *nif);
+};
+
 } // Namespace
 #endif
diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
index 550b5fafc..8d65753d2 100644
--- a/components/nif/niffile.cpp
+++ b/components/nif/niffile.cpp
@@ -105,6 +105,14 @@ static std::map<std::string,RecordFactoryEntry> makeFactory()
     factory["NiSkinInstance"]               = {&construct <NiSkinInstance>              , RC_NiSkinInstance             };
     factory["NiLookAtController"]           = {&construct <NiLookAtController>          , RC_NiLookAtController         };
     factory["NiPalette"]                    = {&construct <NiPalette>                   , RC_NiPalette                  };
+    factory["NiIntegerExtraData"]           = {&construct <NiIntegerExtraData>          , RC_NiIntegerExtraData         };
+    factory["NiIntegersExtraData"]          = {&construct <NiIntegersExtraData>         , RC_NiIntegersExtraData        };
+    factory["NiBinaryExtraData"]            = {&construct <NiBinaryExtraData>           , RC_NiBinaryExtraData          };
+    factory["NiBooleanExtraData"]           = {&construct <NiBooleanExtraData>          , RC_NiBooleanExtraData         };
+    factory["NiVectorExtraData"]            = {&construct <NiVectorExtraData>           , RC_NiVectorExtraData          };
+    factory["NiColorExtraData"]             = {&construct <NiVectorExtraData>           , RC_NiColorExtraData           };
+    factory["NiFloatExtraData"]             = {&construct <NiFloatExtraData>            , RC_NiFloatExtraData           };
+    factory["NiFloatsExtraData"]            = {&construct <NiFloatsExtraData>           , RC_NiFloatsExtraData          };
     return factory;
 }
 
diff --git a/components/nif/record.hpp b/components/nif/record.hpp
index 67202d2fe..f9bb613a0 100644
--- a/components/nif/record.hpp
+++ b/components/nif/record.hpp
@@ -101,7 +101,15 @@ enum RecordType
   RC_RootCollisionNode,
   RC_NiSphericalCollider,
   RC_NiLookAtController,
-  RC_NiPalette
+  RC_NiPalette,
+  RC_NiIntegerExtraData,
+  RC_NiIntegersExtraData,
+  RC_NiBinaryExtraData,
+  RC_NiBooleanExtraData,
+  RC_NiVectorExtraData,
+  RC_NiColorExtraData,
+  RC_NiFloatExtraData,
+  RC_NiFloatsExtraData
 };
 
 /// Base class for all records