From 5b0bc97db084ac759e9f2f791a3439a82b4e6342 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Thu, 14 Sep 2023 12:29:49 +0300
Subject: [PATCH] Refactor NiSwitchNode and NiLODNode

---
 components/nif/node.cpp         | 14 +++++++-------
 components/nif/node.hpp         | 12 ++++++------
 components/nifosg/nifloader.cpp | 10 +++++-----
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/components/nif/node.cpp b/components/nif/node.cpp
index b515f5038f..ef0ff18599 100644
--- a/components/nif/node.cpp
+++ b/components/nif/node.cpp
@@ -234,8 +234,8 @@ namespace Nif
         NiNode::read(nif);
 
         if (nif->getVersion() >= NIFStream::generateVersion(10, 1, 0, 0))
-            nif->read(switchFlags);
-        nif->read(initialIndex);
+            nif->read(mSwitchFlags);
+        nif->read(mInitialIndex);
     }
 
     void NiLODNode::read(NIFStream* nif)
@@ -249,13 +249,13 @@ namespace Nif
         }
 
         if (nif->getVersion() >= NIFFile::NIFVersion::VER_MW)
-            nif->read(lodCenter);
+            nif->read(mLODCenter);
 
-        lodLevels.resize(nif->get<uint32_t>());
-        for (LODRange& level : lodLevels)
+        mLODLevels.resize(nif->get<uint32_t>());
+        for (LODRange& level : mLODLevels)
         {
-            nif->read(level.minRange);
-            nif->read(level.maxRange);
+            nif->read(level.mMinRange);
+            nif->read(level.mMaxRange);
         }
     }
 
diff --git a/components/nif/node.hpp b/components/nif/node.hpp
index d837cbe3da..790a85d876 100644
--- a/components/nif/node.hpp
+++ b/components/nif/node.hpp
@@ -189,8 +189,8 @@ namespace Nif
     // A node used as the base to switch between child nodes, such as for LOD levels.
     struct NiSwitchNode : NiNode
     {
-        uint16_t switchFlags;
-        uint32_t initialIndex;
+        uint16_t mSwitchFlags;
+        uint32_t mInitialIndex;
 
         void read(NIFStream* nif) override;
     };
@@ -199,12 +199,12 @@ namespace Nif
     {
         struct LODRange
         {
-            float minRange;
-            float maxRange;
+            float mMinRange;
+            float mMaxRange;
         };
 
-        osg::Vec3f lodCenter;
-        std::vector<LODRange> lodLevels;
+        osg::Vec3f mLODCenter;
+        std::vector<LODRange> mLODLevels;
 
         void read(NIFStream* nif) override;
     };
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index e815dbd13c..23a86ba983 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -463,11 +463,11 @@ namespace NifOsg
             osg::ref_ptr<osg::LOD> lod(new osg::LOD);
             lod->setName(niLodNode->mName);
             lod->setCenterMode(osg::LOD::USER_DEFINED_CENTER);
-            lod->setCenter(niLodNode->lodCenter);
-            for (unsigned int i = 0; i < niLodNode->lodLevels.size(); ++i)
+            lod->setCenter(niLodNode->mLODCenter);
+            for (unsigned int i = 0; i < niLodNode->mLODLevels.size(); ++i)
             {
-                const Nif::NiLODNode::LODRange& range = niLodNode->lodLevels[i];
-                lod->setRange(i, range.minRange, range.maxRange);
+                const Nif::NiLODNode::LODRange& range = niLodNode->mLODLevels[i];
+                lod->setRange(i, range.mMinRange, range.mMaxRange);
             }
             lod->setRangeMode(osg::LOD::DISTANCE_FROM_EYE_POINT);
             return lod;
@@ -478,7 +478,7 @@ namespace NifOsg
             osg::ref_ptr<osg::Switch> switchNode(new osg::Switch);
             switchNode->setName(niSwitchNode->mName);
             switchNode->setNewChildDefaultValue(false);
-            switchNode->setSingleChildOn(niSwitchNode->initialIndex);
+            switchNode->setSingleChildOn(niSwitchNode->mInitialIndex);
             return switchNode;
         }