Formatting

apps/niftest/niftest.cpp

@@ -89,7 +89,6 @@ void readNIF(
     }
 }
 
-
 void readMaterial(
     const std::filesystem::path& source, const std::filesystem::path& path, const VFS::Manager* vfs, bool quiet)
 {

components/bgsm/stream.hpp

@@ -3,9 +3,9 @@
 
 #include <array>
 #include <cassert>
+#include <cstdint>
 #include <istream>
 #include <stdexcept>
-#include <cstdint>
 #include <string>
 #include <type_traits>
 #include <vector>
@@ -58,8 +58,7 @@ namespace Bgsm
         Files::IStreamPtr mStream;
 
     public:
-        explicit BGSMStream(
+        explicit BGSMStream(const Reader& reader, Files::IStreamPtr&& stream)
-            const Reader& reader, Files::IStreamPtr&& stream)
             : mReader(reader)
             , mStream(std::move(stream))
         {

components/nifosg/nifloader.cpp

@@ -240,7 +240,8 @@ namespace NifOsg
     {
     public:
         /// @param filename used for warning messages.
-        LoaderImpl(const std::filesystem::path& filename, unsigned int ver, unsigned int userver, unsigned int bethver, Resource::BgsmFileManager* materialMgr)
+        LoaderImpl(const std::filesystem::path& filename, unsigned int ver, unsigned int userver, unsigned int bethver,
+            Resource::BgsmFileManager* materialMgr)
             : mFilename(filename)
             , mVersion(ver)
             , mUserVersion(userver)
@@ -783,7 +784,8 @@ namespace NifOsg
                 else
                 {
                     if (args.mHasMarkers)
-                        skip = Misc::StringUtils::ciStartsWith(nifNode->mName, "EditorMarker") || Misc::StringUtils::ciStartsWith(nifNode->mName, "VisibilityEditorMarker");
+                        skip = Misc::StringUtils::ciStartsWith(nifNode->mName, "EditorMarker")
+                            || Misc::StringUtils::ciStartsWith(nifNode->mName, "VisibilityEditorMarker");
                 }
                 if (!skip)
                 {
@@ -2162,8 +2164,8 @@ namespace NifOsg
             handleTextureControllers(texprop, composite, imageManager, stateset, animflags);
         }
 
-        void handleShaderMaterial(const std::string& path, osg::StateSet* stateset, Resource::ImageManager* imageManager,
+        void handleShaderMaterial(const std::string& path, osg::StateSet* stateset,
-            std::vector<unsigned int>& boundTextures)
+            Resource::ImageManager* imageManager, std::vector<unsigned int>& boundTextures)
         {
             if (!mMaterialMgr)
                 return;
@@ -2229,8 +2231,8 @@ namespace NifOsg
                             stateset->setTextureMode(i, GL_TEXTURE_2D, osg::StateAttribute::OFF);
                         boundTextures.clear();
                     }
-                    std::string filename = Misc::ResourceHelpers::correctTexturePath(
+                    std::string filename
-                        bgem->mBaseMap, imageManager->getVFS());
+                        = Misc::ResourceHelpers::correctTexturePath(bgem->mBaseMap, imageManager->getVFS());
                     osg::ref_ptr<osg::Image> image = imageManager->getImage(filename);
                     osg::ref_ptr<osg::Texture2D> texture2d = new osg::Texture2D(image);
                     texture2d->setName("diffuseMap");
@@ -2976,9 +2978,11 @@ namespace NifOsg
         }
     };
 
-    osg::ref_ptr<osg::Node> Loader::load(Nif::FileView file, Resource::ImageManager* imageManager, Resource::BgsmFileManager* materialMgr)
+    osg::ref_ptr<osg::Node> Loader::load(
+        Nif::FileView file, Resource::ImageManager* imageManager, Resource::BgsmFileManager* materialMgr)
     {
-        LoaderImpl impl(file.getFilename(), file.getVersion(), file.getUserVersion(), file.getBethVersion(), materialMgr);
+        LoaderImpl impl(
+            file.getFilename(), file.getVersion(), file.getUserVersion(), file.getBethVersion(), materialMgr);
         return impl.load(file, imageManager);
     }
 

components/nifosg/nifloader.hpp

@@ -31,7 +31,8 @@ namespace NifOsg
     public:
         /// Create a scene graph for the given NIF. Auto-detects when skinning is used and wraps the graph in a Skeleton
         /// if so.
-        static osg::ref_ptr<osg::Node> load(Nif::FileView file, Resource::ImageManager* imageManager, Resource::BgsmFileManager* materialManager);
+        static osg::ref_ptr<osg::Node> load(
+            Nif::FileView file, Resource::ImageManager* imageManager, Resource::BgsmFileManager* materialManager);
 
         /// Load keyframe controllers from the given kf file.
         static void loadKf(Nif::FileView kf, SceneUtil::KeyframeHolder& target);

components/resource/resourcesystem.cpp

@@ -18,7 +18,8 @@ namespace Resource
         mNifFileManager = std::make_unique<NifFileManager>(vfs, encoder);
         mBgsmFileManager = std::make_unique<BgsmFileManager>(vfs, expiryDelay);
         mImageManager = std::make_unique<ImageManager>(vfs, expiryDelay);
-        mSceneManager = std::make_unique<SceneManager>(vfs, mImageManager.get(), mNifFileManager.get(), mBgsmFileManager.get(), expiryDelay);
+        mSceneManager = std::make_unique<SceneManager>(
+            vfs, mImageManager.get(), mNifFileManager.get(), mBgsmFileManager.get(), expiryDelay);
         mKeyframeManager = std::make_unique<KeyframeManager>(vfs, mSceneManager.get(), expiryDelay, encoder);
 
         addResourceManager(mNifFileManager.get());

components/resource/scenemanager.cpp

@@ -797,7 +797,8 @@ namespace Resource
     }
 
     osg::ref_ptr<osg::Node> load(VFS::Path::NormalizedView normalizedFilename, const VFS::Manager* vfs,
-        Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager, Resource::BgsmFileManager* materialMgr)
+        Resource::ImageManager* imageManager, Resource::NifFileManager* nifFileManager,
+        Resource::BgsmFileManager* materialMgr)
     {
         const std::string_view ext = Misc::getFileExtension(normalizedFilename.value());
         if (ext == "nif")