Replace uses of fmt as far as possible with std::format

Also adds helpers like join and toUnderlying to replace currently missing format capabilities

Author: Nostritius

CMakeLists.txt

@@ -334,7 +334,7 @@ include_directories(
 target_link_libraries(imgui_platform glfw)
 
 add_definitions(-DGLM_ENABLE_EXPERIMENTAL)
-add_definitions(-DSPDLOG_FMT_EXTERNAL)
+add_definitions(-DSPDLOG_USE_STD_FORMAT)
 
 # ------------------------------------
 # Libraries for awe

src/awe/binfolfile.cpp

@@ -19,6 +19,9 @@
  */
 
 #include <memory>
+#include <format>
+
+#include "src/common/exception.h"
 
 #include "src/awe/path.h"
 #include "src/awe/binfolfile.h"
@@ -29,7 +32,7 @@ BINFOLFile::BINFOLFile(Common::ReadStream &binfol) {
 
 	const auto version = binfol.readUint32LE();
 	if (version != 19)
-		throw std::runtime_error(fmt::format("Unsupported version {}. Expected 19", version));
+		throw Common::SourceException("Unsupported version {}. Expected 19", version);
 
 	const auto meshDataSize = binfol.readUint32LE();
 	std::unique_ptr<Common::ReadStream> binmshStream(binfol.readStream(meshDataSize));

src/awe/binmshfile.cpp

@@ -39,7 +39,7 @@ void BINMSHFile::load(Common::ReadStream &binmsh) {
 	const uint32_t version = binmsh.readUint32LE();
 
 	if (version != 21 && version != 20 && version != 19)
-		throw std::runtime_error(fmt::format("Unsupported version {}", version));
+		throw std::runtime_error(std::format("Unsupported version {}", version));
 
 	const uint32_t vertexBufferSize = binmsh.readUint32LE();
 	const uint32_t indicesCount     = binmsh.readUint32LE();

src/awe/foliagedatafile.cpp

@@ -21,16 +21,16 @@
 #include <stdexcept>
 #include <regex>
 
-#include <fmt/format.h>
+#include "src/common/exception.h"
 
-#include "foliagedatafile.h"
+#include "src/awe/foliagedatafile.h"
 
 namespace AWE {
 
 FoliageDataFile::FoliageDataFile(Common::ReadStream &foliageData) {
 	const uint32_t version = foliageData.readUint32LE();
 	if (version != 9)
-		throw std::runtime_error(fmt::format("Unsupported version, expected 9, got {}", version));
+		throw Common::SourceException("Unsupported version, expected 9, got {}", version);
 
 	const uint32_t numFoliages = foliageData.readUint32LE();
 	_foliages.resize(numFoliages);

src/awe/havokfile.cpp

@@ -24,7 +24,6 @@
 #include <map>
 
 #include <glm/glm.hpp>
-#include <fmt/format.h>
 #include <spdlog/spdlog.h>
 
 #include "src/common/exception.h"
@@ -1370,7 +1369,7 @@ void HavokFile::setHeader(std::string headerVersion) {
 	else if (headerVersion == "hk_2010.2.0-r1")
 		_version = kHavok2010_2_0_r1;
 	else
-		throw std::runtime_error(fmt::format("Unsupported havok version {}", headerVersion));
+		throw std::runtime_error(std::format("Unsupported havok version {}", headerVersion));
 
 }
 

src/awe/objectxmlwritestream.cpp

@@ -18,7 +18,6 @@
  * along with OpenAWE. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <fmt/format.h>
 #include <glm/gtx/string_cast.hpp>
 #include <utility>
 
@@ -110,7 +109,7 @@ void ObjectXMLWriteStream::variable(const std::string &name, GID &value) {
 	auto &typeNode = newVariableNode.addNewNode("type");
 	typeNode.content = std::to_string(value.type);
 	auto &hashNode = newVariableNode.addNewNode("hash");
-	hashNode.content = fmt::format("0x{:x}", value.id);
+	hashNode.content = std::format("0x{:x}", value.id);
 }
 
 void ObjectXMLWriteStream::variable(const std::string &name, ObjectID &value) {
@@ -120,7 +119,7 @@ void ObjectXMLWriteStream::variable(const std::string &name, ObjectID &value) {
 	auto &typeNode = newVariableNode.addNewNode("type");
 	typeNode.content = std::to_string(value.getType());
 	auto &hashNode = newVariableNode.addNewNode("id");
-	hashNode.content = fmt::format("0x{:x}", value.getID());
+	hashNode.content = std::format("0x{:x}", value.getID());
 }
 
 void ObjectXMLWriteStream::variable(const std::string &name, std::vector<bool> &value, size_t fixedSize) {
@@ -182,7 +181,7 @@ void ObjectXMLWriteStream::variable(const std::string &name, std::vector<rid_t>
 
 	for (const auto &item: value) {
 		auto &itemNode = newVariableNode.addNewNode("item");
-		itemNode.content = fmt::format("{:x}", item);
+		itemNode.content = std::format("{:x}", item);
 	}
 }
 
@@ -236,7 +235,7 @@ void ObjectXMLWriteStream::variable(const std::string &name, std::vector<GID> &v
 		typeNode.content = std::to_string(gid.type);
 
 		auto &idNode = itemNode.addNewNode("id");
-		idNode.content = fmt::format("{:x}", gid.id);
+		idNode.content = std::format("{:x}", gid.id);
 	}
 }
 

src/awe/resman.cpp

@@ -114,7 +114,7 @@ Common::ReadStream *RessourceManager::getResource(const std::string &path) {
 		return new Common::ReadFile(_rootPath + "/" + path);
 
 	for (const auto &dirPath: _paths) {
-		const auto fullPath = fmt::format("{}/{}", dirPath, path);
+		const auto fullPath = std::format("{}/{}", dirPath, path);
 		if (std::filesystem::is_regular_file(fullPath))
 			return new Common::ReadFile(fullPath);
 	}

src/awe/rmdblobarchive.cpp

@@ -98,7 +98,7 @@ RMDBlobArchive::RMDBlobArchive(Common::ReadStream &rmdtoc, const std::string &pa
 			std::make_unique<Common::ReadFile>(
 				path.empty()
 					? std::filesystem::path(blobPath).filename().string()
-					: fmt::format("{}/{}", path, std::filesystem::path(blobPath).filename().string())
+					: std::format("{}/{}", path, std::filesystem::path(blobPath).filename().string())
 			)
 		);
 	}
@@ -135,8 +135,6 @@ RMDBlobArchive::RMDBlobArchive(Common::ReadStream &rmdtoc, const std::string &pa
 		for (size_t j = 0; j < fileCount; ++j) {
 			_files[j + fileIndex].directory = i;
 		}
-
-		fmt::print("{}\n", name);
 	}
 
 	for (unsigned int i = 0; i < fileTableCount; ++i) {

src/awe/rmdparchive.cpp

@@ -26,8 +26,6 @@
 #include <vector>
 #include <mutex>
 
-#include <fmt/format.h>
-
 #include "src/common/endianreadstream.h"
 #include "src/common/strutil.h"
 #include "src/common/memreadstream.h"

src/awe/script/bytecode.cpp

@@ -21,7 +21,6 @@
 #include <stdexcept>
 
 #include <spdlog/spdlog.h>
-#include <fmt/format.h>
 
 #include "src/common/exception.h"