From 3d2479698c4dc2932a43cc8182e3ad86e5c7522d Mon Sep 17 00:00:00 2001 From: Jan Date: Sat, 14 Aug 2021 11:35:31 +0200 Subject: [PATCH] Make XModelDumper context const if possible --- src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperXModel.cpp | 4 ++-- src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperXModel.h | 4 ++-- src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperXModel.cpp | 4 ++-- src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperXModel.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperXModel.cpp b/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperXModel.cpp index a4014a0b..b807a557 100644 --- a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperXModel.cpp +++ b/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperXModel.cpp @@ -140,7 +140,7 @@ void AssetDumperXModel::AddObjFaces(ObjWriter& writer, const XModelSurfs* modelS } } -void AssetDumperXModel::DumpObjMat(AssetDumpingContext& context, XAssetInfo* asset) +void AssetDumperXModel::DumpObjMat(const AssetDumpingContext& context, XAssetInfo* asset) { const auto* model = asset->Asset(); const auto matFile = context.OpenAssetFile("model_export/" + std::string(model->name) + ".mtl"); @@ -155,7 +155,7 @@ void AssetDumperXModel::DumpObjMat(AssetDumpingContext& context, XAssetInfo* asset, const unsigned lod) +void AssetDumperXModel::DumpObjLod(const AssetDumpingContext& context, XAssetInfo* asset, const unsigned lod) { const auto* model = asset->Asset(); const auto* modelSurfs = model->lodInfo[lod].modelSurfs; diff --git a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperXModel.h b/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperXModel.h index f8dab979..b73cc99e 100644 --- a/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperXModel.h +++ b/src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperXModel.h @@ -14,8 +14,8 @@ namespace IW4 static void AddObjObjects(ObjWriter& writer, const DistinctMapper& materialMapper, const XModelSurfs* modelSurfs, int baseSurfaceIndex); static void AddObjVertices(ObjWriter& writer, const XModelSurfs* modelSurfs); static void AddObjFaces(ObjWriter& writer, const XModelSurfs* modelSurfs); - static void DumpObjLod(AssetDumpingContext& context, XAssetInfo* asset, unsigned lod); - static void DumpObjMat(AssetDumpingContext& context, XAssetInfo* asset); + static void DumpObjLod(const AssetDumpingContext& context, XAssetInfo* asset, const unsigned lod); + static void DumpObjMat(const AssetDumpingContext& context, XAssetInfo* asset); static void DumpObj(AssetDumpingContext& context, XAssetInfo* asset); static void AddXModelBones(const AssetDumpingContext& context, AbstractXModelWriter& writer, const XModel* model); diff --git a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperXModel.cpp b/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperXModel.cpp index 690bb8db..891f2fd9 100644 --- a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperXModel.cpp +++ b/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperXModel.cpp @@ -140,7 +140,7 @@ void AssetDumperXModel::AddObjFaces(ObjWriter& writer, const XModelSurfs* modelS } } -void AssetDumperXModel::DumpObjMat(AssetDumpingContext& context, XAssetInfo* asset) +void AssetDumperXModel::DumpObjMat(const AssetDumpingContext& context, XAssetInfo* asset) { const auto* model = asset->Asset(); const auto matFile = context.OpenAssetFile("model_export/" + std::string(model->name) + ".mtl"); @@ -155,7 +155,7 @@ void AssetDumperXModel::DumpObjMat(AssetDumpingContext& context, XAssetInfo* asset, const unsigned lod) +void AssetDumperXModel::DumpObjLod(const AssetDumpingContext& context, XAssetInfo* asset, const unsigned lod) { const auto* model = asset->Asset(); const auto* modelSurfs = model->lodInfo[lod].modelSurfs; diff --git a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperXModel.h b/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperXModel.h index b67d52c5..664b3ab8 100644 --- a/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperXModel.h +++ b/src/ObjWriting/Game/IW5/AssetDumpers/AssetDumperXModel.h @@ -14,8 +14,8 @@ namespace IW5 static void AddObjObjects(ObjWriter& writer, const DistinctMapper& materialMapper, const XModelSurfs* modelSurfs, int baseSurfaceIndex); static void AddObjVertices(ObjWriter& writer, const XModelSurfs* modelSurfs); static void AddObjFaces(ObjWriter& writer, const XModelSurfs* modelSurfs); - static void DumpObjLod(AssetDumpingContext& context, XAssetInfo* asset, unsigned lod); - static void DumpObjMat(AssetDumpingContext& context, XAssetInfo* asset); + static void DumpObjLod(const AssetDumpingContext& context, XAssetInfo* asset, const unsigned lod); + static void DumpObjMat(const AssetDumpingContext& context, XAssetInfo* asset); static void DumpObj(AssetDumpingContext& context, XAssetInfo* asset); static void AddXModelBones(const AssetDumpingContext& context, AbstractXModelWriter& writer, const XModel* model);