Move Skyrim shader property controllers to controllers

components/nif/controller.cpp

@@ -428,6 +428,18 @@ namespace Nif
         nif->getUInt(); // Zero
     }
 
+    void BSEffectShaderPropertyFloatController::read(NIFStream* nif)
+    {
+        NiFloatInterpController::read(nif);
+        nif->read(mControlledVariable);
+    }
+
+    void BSEffectShaderPropertyColorController::read(NIFStream* nif)
+    {
+        NiPoint3InterpController::read(nif);
+        nif->read(mControlledColor);
+    }
+
     void NiControllerManager::read(NIFStream* nif)
     {
         Controller::read(nif);
@@ -637,16 +649,4 @@ namespace Nif
                 mScaleValue = 1.f;
         }
     }
-
-    void BSEffectShaderPropertyFloatController::read(NIFStream* nif)
-    {
-        NiFloatInterpController::read(nif);
-        nif->read(mControlledVariable);
-    }
-
-    void BSEffectShaderPropertyColorController::read(NIFStream* nif)
-    {
-        NiPoint3InterpController::read(nif);
-        nif->read(mControlledColor);
-    }
 }

components/nif/controller.hpp

@@ -293,6 +293,20 @@ namespace Nif
         void read(NIFStream* nif) override;
     };
 
+    struct BSEffectShaderPropertyFloatController : public NiFloatInterpController
+    {
+        unsigned int mControlledVariable;
+
+        void read(NIFStream* nif) override;
+    };
+
+    struct BSEffectShaderPropertyColorController : public NiPoint3InterpController
+    {
+        unsigned int mControlledColor;
+
+        void read(NIFStream* nif) override;
+    };
+
     struct NiControllerManager : public Controller
     {
         bool mCumulative;
@@ -406,18 +420,5 @@ namespace Nif
         void read(NIFStream* nif) override;
     };
 
-    struct BSEffectShaderPropertyFloatController : public NiFloatInterpController
-    {
-        unsigned int mControlledVariable;
-
-        void read(NIFStream* nif) override;
-    };
-
-    struct BSEffectShaderPropertyColorController : public NiPoint3InterpController
-    {
-        unsigned int mControlledColor;
-
-        void read(NIFStream* nif) override;
-    };
 } // Namespace
 #endif