zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-11-23 05:12:05 +00:00
Code Activity

chore: use std::format instead of string concat

Browse Source
This commit is contained in:
Jan Laupetin
2025-11-09 23:30:43 +01:00
parent a55146a9de
commit 5e06df6286
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ObjLoading/Game/T6/BSP/BSPCreator.cpp
View File

@@ -2,6 +2,7 @@
#include "BSPUtil.h" #include "BSPUtil.h"
#include <format>
#include <ufbx.h> #include <ufbx.h>
using namespace BSP; using namespace BSP;
@@ -262,7 +263,7 @@ namespace BSP
auto bsp = std::make_unique<BSPData>(); auto bsp = std::make_unique<BSPData>();
bsp->name = mapName; bsp->name = mapName;
bsp->bspName = "maps/mp/" + mapName + ".d3dbsp"; bsp->bspName = std::format("maps/mp/{}.d3dbsp", mapName);
loadWorldData(*gfxScene, *bsp, true); loadWorldData(*gfxScene, *bsp, true);
loadWorldData(*colScene, *bsp, false); loadWorldData(*colScene, *bsp, false);

14
src/ObjLoading/Game/T6/BSP/Linker/BSPLinker.cpp
View File

@@ -7,6 +7,8 @@
#include "MapEntsLinker.h" #include "MapEntsLinker.h"
#include "SkinnedVertsLinker.h" #include "SkinnedVertsLinker.h"
#include <format>
using namespace T6; using namespace T6;
namespace BSP namespace BSP
@@ -25,18 +27,18 @@ namespace BSP
bool BSPLinker::addDefaultRequiredAssets(const BSPData& bsp) const bool BSPLinker::addDefaultRequiredAssets(const BSPData& bsp) const
{ {
if (m_context.LoadDependency<AssetScript>("maps/mp/" + bsp.name + ".gsc") == nullptr) if (m_context.LoadDependency<AssetScript>(std::format("maps/mp/{}.gsc", bsp.name)) == nullptr)
return false; return false;
if (m_context.LoadDependency<AssetScript>("maps/mp/" + bsp.name + "_amb.gsc") == nullptr) if (m_context.LoadDependency<AssetScript>(std::format("maps/mp/{}_amb.gsc", bsp.name)) == nullptr)
return false; return false;
if (m_context.LoadDependency<AssetScript>("maps/mp/" + bsp.name + "_fx.gsc") == nullptr) if (m_context.LoadDependency<AssetScript>(std::format("maps/mp/{}_fx.gsc", bsp.name)) == nullptr)
return false; return false;
if (m_context.LoadDependency<AssetScript>("clientscripts/mp/" + bsp.name + ".csc") == nullptr) if (m_context.LoadDependency<AssetScript>(std::format("clientscripts/mp/{}.csc", bsp.name)) == nullptr)
return false; return false;
if (m_context.LoadDependency<AssetScript>("clientscripts/mp/" + bsp.name + "_amb.csc") == nullptr) if (m_context.LoadDependency<AssetScript>(std::format("clientscripts/mp/{}_amb.csc", bsp.name)) == nullptr)
return false; return false;
if (m_context.LoadDependency<AssetScript>("clientscripts/mp/" + bsp.name + "_fx.csc") == nullptr) if (m_context.LoadDependency<AssetScript>(std::format("clientscripts/mp/{}_fx.csc", bsp.name)) == nullptr)
return false; return false;
addEmptyFootstepTableAsset("default_1st_person"); addEmptyFootstepTableAsset("default_1st_person");

3
src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp
View File

@@ -5,6 +5,7 @@
#include "Utils/Pack.h" #include "Utils/Pack.h"
#include <cassert> #include <cassert>
#include <format>
using namespace T6; using namespace T6;
@@ -648,7 +649,7 @@ namespace BSP
void GfxWorldLinker::loadSkyBox(const BSPData& projInfo, GfxWorld& gfxWorld) const void GfxWorldLinker::loadSkyBox(const BSPData& projInfo, GfxWorld& gfxWorld) const
{ {
const std::string skyBoxName = "skybox_" + projInfo.name; const auto skyBoxName = std::format("skybox_{}", projInfo.name);
gfxWorld.skyBoxModel = m_memory.Dup(skyBoxName.c_str()); gfxWorld.skyBoxModel = m_memory.Dup(skyBoxName.c_str());
if (m_context.LoadDependency<AssetXModel>(skyBoxName) == nullptr) if (m_context.LoadDependency<AssetXModel>(skyBoxName) == nullptr)