Merge branch 'nilightcolorcontroller' into 'master'

Give NiLightColorController its own struct See merge request OpenMW/openmw!4472
OpenMW · Dec 2, 2024 · c454675 · c454675
2 parents 23a46a1 + a923e31
commit c454675
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 3 deletions.
diff --git a/components/nif/controller.cpp b/components/nif/controller.cpp
@@ -231,12 +231,32 @@ namespace Nif
         mCollider.post(nif);
     }
 
+    void NiLightColorController::read(NIFStream* nif)
+    {
+        NiPoint3InterpController::read(nif);
+
+        if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
+            mMode = static_cast<Mode>(nif->get<uint16_t>());
+        else
+            mMode = static_cast<Mode>((mFlags >> 4) & 1);
+
+        if (nif->getVersion() <= NIFStream::generateVersion(10, 1, 0, 103))
+            mData.read(nif);
+    }
+
+    void NiLightColorController::post(Reader& nif)
+    {
+        NiPoint3InterpController::post(nif);
+
+        mData.post(nif);
+    }
+
     void NiMaterialColorController::read(NIFStream* nif)
     {
         NiPoint3InterpController::read(nif);
 
         if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
-            mTargetColor = static_cast<TargetColor>(nif->get<uint16_t>() & 3);
+            mTargetColor = static_cast<TargetColor>(nif->get<uint16_t>());
         else
             mTargetColor = static_cast<TargetColor>((mFlags >> 4) & 3);
 

diff --git a/components/nif/controller.hpp b/components/nif/controller.hpp
@@ -161,6 +161,21 @@ namespace Nif
     };
     using NiBSPArrayController = NiParticleSystemController;
 
+    struct NiLightColorController : public NiPoint3InterpController
+    {
+        enum class Mode
+        {
+            DiffuseSpecular = 0,
+            Ambient = 1,
+        };
+
+        NiPosDataPtr mData;
+        Mode mMode = Mode::DiffuseSpecular;
+
+        void read(NIFStream* nif) override;
+        void post(Reader& nif) override;
+    };
+
     struct NiMaterialColorController : public NiPoint3InterpController
     {
         enum class TargetColor

diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp
@@ -112,8 +112,7 @@ namespace Nif
             { "NiGeomMorpherController", &construct<NiGeomMorpherController, RC_NiGeomMorpherController> },
             { "NiKeyframeController", &construct<NiKeyframeController, RC_NiKeyframeController> },
             { "NiLookAtController", &construct<NiLookAtController, RC_NiLookAtController> },
-            // FIXME: NiLightColorController should have its own struct
-            { "NiLightColorController", &construct<NiMaterialColorController, RC_NiLightColorController> },
+            { "NiLightColorController", &construct<NiLightColorController, RC_NiLightColorController> },
             { "NiMaterialColorController", &construct<NiMaterialColorController, RC_NiMaterialColorController> },
             { "NiPathController", &construct<NiPathController, RC_NiPathController> },
             { "NiRollController", &construct<NiRollController, RC_NiRollController> },