From dc62387318f4ec1fb899b79fa9f997f901096671 Mon Sep 17 00:00:00 2001 From: JezuzLizard Date: Wed, 13 Dec 2023 12:40:56 -0800 Subject: [PATCH] Use clang-format. --- src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderRawFile.cpp | 4 ++-- src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderRawFile.h | 1 + src/ObjWriting/Game/T6/AssetDumpers/AssetDumperRawFile.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderRawFile.cpp b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderRawFile.cpp index 3d987908e..a4e97edd2 100644 --- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderRawFile.cpp +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderRawFile.cpp @@ -3,9 +3,9 @@ #include "Game/T6/T6.h" #include "Pool/GlobalAssetPool.h" -#include -#include #include +#include +#include #include #include diff --git a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderRawFile.h b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderRawFile.h index 7e4c6f931..4b7e0f059 100644 --- a/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderRawFile.h +++ b/src/ObjLoading/Game/T6/AssetLoaders/AssetLoaderRawFile.h @@ -14,6 +14,7 @@ namespace T6 const SearchPathOpenFile& file, const std::string& assetName, ISearchPath* searchPath, MemoryManager* memory, IAssetLoadingManager* manager); static bool LoadDefault( const SearchPathOpenFile& file, const std::string& assetName, ISearchPath* searchPath, MemoryManager* memory, IAssetLoadingManager* manager); + public: _NODISCARD void* CreateEmptyAsset(const std::string& assetName, MemoryManager* memory) override; _NODISCARD bool CanLoadFromRaw() const override; diff --git a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperRawFile.h b/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperRawFile.h index fcffaee68..1f9f033f1 100644 --- a/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperRawFile.h +++ b/src/ObjWriting/Game/T6/AssetDumpers/AssetDumperRawFile.h @@ -10,6 +10,7 @@ namespace T6 constexpr static size_t ANIMTREE_MAX_SIZE = 0xC000000; void DumpAnimtree(AssetDumpingContext& context, XAssetInfo* asset, std::ostream& stream); + protected: bool ShouldDump(XAssetInfo* asset) override; void DumpAsset(AssetDumpingContext& context, XAssetInfo* asset) override;