mirror
/
jak-project
mirror of https://github.com/open-goal/jak-project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

deps: update `fmt` to `11.1.4` (#3880) 

Fixes #3886
This commit is contained in:
Tyler Wilding 2025-04-12 15:59:13 -04:00 committed by GitHub
parent 5415c83def
commit 647282d896
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
384 changed files with 30620 additions and 24848 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/audio/audio_formats.cpp
View File

@ -3,7 +3,7 @@
#include "common/log/log.h" #include "common/log/log.h"
#include "common/util/BinaryWriter.h" #include "common/util/BinaryWriter.h"
#include "fmt/core.h" #include "fmt/format.h"
/*! /*!
* Write a wave file from a vector of samples. * Write a wave file from a vector of samples.

2
common/cross_os_debug/xdbg.cpp
View File

@ -11,7 +11,7 @@
#include "common/goal_constants.h" #include "common/goal_constants.h"
#include "common/util/Timer.h" #include "common/util/Timer.h"
#include "fmt/core.h" #include "fmt/format.h"
#ifdef __linux #ifdef __linux
#include <fcntl.h> #include <fcntl.h>

2
common/cross_sockets/XSocket.cpp
View File

@ -19,7 +19,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "fmt/core.h" #include "fmt/format.h"
#include "common/log/log.h" #include "common/log/log.h"
// clang-format on // clang-format on

2
common/cross_sockets/XSocketClient.cpp
View File

@ -5,7 +5,7 @@
#include "common/cross_sockets/XSocket.h" #include "common/cross_sockets/XSocket.h"
#include "common/log/log.h" #include "common/log/log.h"
#include "fmt/core.h" #include "fmt/format.h"
// clang-format off // clang-format off
#ifdef _WIN32 #ifdef _WIN32

2
common/cross_sockets/XSocketServer.cpp
View File

@ -4,7 +4,7 @@
#include "common/cross_sockets/XSocket.h" #include "common/cross_sockets/XSocket.h"
#include "common/common_types.h" #include "common/common_types.h"
#include "fmt/core.h" #include "fmt/format.h"
#ifdef _WIN32 #ifdef _WIN32
#define NOMINMAX #define NOMINMAX

2
common/dma/dma.cpp
View File

@ -2,7 +2,7 @@
#include "common/util/Assert.h" #include "common/util/Assert.h"
#include "fmt/core.h" #include "fmt/format.h"
std::string DmaTag::print() const { std::string DmaTag::print() const {
std::string result; std::string result;

2
common/dma/dma.h
View File

@ -11,7 +11,7 @@
#include "common/common_types.h" #include "common/common_types.h"
#include "common/util/Assert.h" #include "common/util/Assert.h"
#include "fmt/core.h" #include "fmt/format.h"
struct DmaStats { struct DmaStats {
double sync_time_ms = 0; double sync_time_ms = 0;

2
common/dma/dma_copy.cpp
View File

@ -6,7 +6,7 @@
#include "common/log/log.h" #include "common/log/log.h"
#include "common/util/Timer.h" #include "common/util/Timer.h"
#include "fmt/core.h" #include "fmt/format.h"
/*! /*!
* Convert a DMA chain to an array of bytes that can be directly fed to VIF. * Convert a DMA chain to an array of bytes that can be directly fed to VIF.

1
common/dma/gs.cpp
View File

@ -2,7 +2,6 @@
#include "common/util/Assert.h" #include "common/util/Assert.h"
#include "fmt/core.h"
#include "fmt/format.h" #include "fmt/format.h"
std::string reg_descriptor_name(GifTag::RegisterDescriptor reg) { std::string reg_descriptor_name(GifTag::RegisterDescriptor reg) {

4
common/formatter/formatter.cpp
View File

@ -6,12 +6,12 @@
#include "common/formatter/rules/rule_config.h" #include "common/formatter/rules/rule_config.h"
#include "common/log/log.h" #include "common/log/log.h"
#include "common/util/FileUtil.h" #include "common/util/FileUtil.h"
#include "common/util/ast_util.h"
#include "common/util/string_util.h" #include "common/util/string_util.h"
#include "tree_sitter/api.h" #include "tree_sitter/api.h"
#include "fmt/core.h" #include "fmt/format.h"
#include "fmt/ranges.h"
// Declare the `tree_sitter_opengoal` function, which is // Declare the `tree_sitter_opengoal` function, which is
// implemented by the `tree-sitter-opengoal` library. // implemented by the `tree-sitter-opengoal` library.

2
common/formatter/formatter_tree.cpp
View File

@ -2,7 +2,7 @@
#include "common/util/string_util.h" #include "common/util/string_util.h"
#include "fmt/core.h" #include "fmt/format.h"
std::string get_source_code(const std::string& source, const TSNode& node) { std::string get_source_code(const std::string& source, const TSNode& node) {
uint32_t start = ts_node_start_byte(node); uint32_t start = ts_node_start_byte(node);

2
common/formatter/rules/formatting_rules.cpp
View File

@ -4,7 +4,7 @@
#include "common/util/string_util.h" #include "common/util/string_util.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace formatter_rules { namespace formatter_rules {

2
common/global_profiler/GlobalProfiler.cpp
View File

@ -9,7 +9,7 @@
#include "common/util/FileUtil.h" #include "common/util/FileUtil.h"
#include "common/common_types.h" #include "common/common_types.h"
#include "fmt/core.h" #include "fmt/format.h"
#include "third-party/json.hpp" #include "third-party/json.hpp"
#ifdef OS_POSIX #ifdef OS_POSIX

22
common/goos/Interpreter.cpp
View File

@ -16,7 +16,9 @@
#include "common/util/string_util.h" #include "common/util/string_util.h"
#include "common/util/unicode_util.h" #include "common/util/unicode_util.h"
#include "fmt/core.h" #include "fmt/args.h"
#include "fmt/base.h"
#include "fmt/format.h"
namespace goos { namespace goos {
Interpreter::Interpreter(const std::string& username) { Interpreter::Interpreter(const std::string& username) {
@ -1769,26 +1771,16 @@ Object Interpreter::eval_format(const Object& form,
throw_eval_error(form, "format string must be a string"); throw_eval_error(form, "format string must be a string");
} }
// Note: this might be relying on internal implementation details of libfmt to work properly fmt::dynamic_format_arg_store<fmt::format_context> arg_store;
// and isn't a great solution.
std::vector<fmt::basic_format_arg<fmt::format_context>> args2;
std::vector<std::string> strings;
for (size_t i = 2; i < args.unnamed.size(); i++) { for (size_t i = 2; i < args.unnamed.size(); i++) {
if (args.unnamed.at(i).is_string()) { if (args.unnamed.at(i).is_string()) {
strings.push_back(args.unnamed.at(i).as_string()->data); arg_store.push_back(args.unnamed.at(i).as_string()->data);
} else { } else {
strings.push_back(args.unnamed.at(i).print()); arg_store.push_back(args.unnamed.at(i).print());
} }
} }
for (auto& x : strings) { auto formatted = fmt::vformat(format_str.as_string()->data, arg_store);
args2.push_back(fmt::detail::make_arg<fmt::format_context>(x));
}
auto formatted =
fmt::vformat(format_str.as_string()->data,
fmt::format_args(args2.data(), static_cast<unsigned>(args2.size())));
if (truthy(dest)) { if (truthy(dest)) {
lg::print("{}", formatted.c_str()); lg::print("{}", formatted.c_str());
} }

2
common/goos/Object.cpp
View File

@ -47,7 +47,7 @@
#include "common/util/crc32.h" #include "common/util/crc32.h"
#include "common/util/print_float.h" #include "common/util/print_float.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace goos { namespace goos {

2
common/goos/Object.h
View File

@ -57,7 +57,7 @@
#include "common/util/Assert.h" #include "common/util/Assert.h"
#include "common/util/crc32.h" #include "common/util/crc32.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace goos { namespace goos {

2
common/goos/ParseHelpers.cpp
View File

@ -1,6 +1,6 @@
#include "ParseHelpers.h" #include "ParseHelpers.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace goos { namespace goos {

2
common/goos/PrettyPrinter.cpp
View File

@ -15,7 +15,7 @@
#include "common/goos/PrettyPrinter2.h" #include "common/goos/PrettyPrinter2.h"
#include "common/util/Assert.h" #include "common/util/Assert.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace pretty_print { namespace pretty_print {

1
common/goos/PrettyPrinter2.cpp
View File

@ -3,7 +3,6 @@
#include "common/common_types.h" #include "common/common_types.h"
#include "common/util/Assert.h" #include "common/util/Assert.h"
#include "fmt/core.h"
#include "fmt/format.h" #include "fmt/format.h"
namespace pretty_print { namespace pretty_print {

2
common/goos/Printer.cpp
View File

@ -6,7 +6,7 @@
#include "common/goos/Object.h" #include "common/goos/Object.h"
#include "common/util/print_float.h" #include "common/util/print_float.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace pretty_print { namespace pretty_print {
namespace { namespace {

3
common/goos/Reader.cpp
View File

@ -15,7 +15,8 @@
#include "common/util/FileUtil.h" #include "common/util/FileUtil.h"
#include "common/util/FontUtils.h" #include "common/util/FontUtils.h"
#include "fmt/core.h" #include "fmt/format.h"
#include "fmt/ranges.h"
namespace goos { namespace goos {

2
common/goos/TextDB.cpp
View File

@ -15,7 +15,7 @@
#include "common/util/FileUtil.h" #include "common/util/FileUtil.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace goos { namespace goos {

4
common/log/log.h
View File

@ -8,7 +8,7 @@
#include <string> #include <string>
#include "fmt/color.h" #include "fmt/color.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace lg { namespace lg {
@ -72,7 +72,7 @@ void print(const std::string& format, Args&&... args) {
} }
template <typename... Args> template <typename... Args>
void print(const fmt::text_style& ts, const std::string& format, Args&&... args) { void print(const fmt::text_style& ts, const std::string& format, Args&&... args) {
std::string formatted_message = fmt::format(ts, format, std::forward<Args>(args)...); std::string formatted_message = fmt::vformat(ts, format, fmt::make_format_args(args...));
internal::log_print(formatted_message.c_str()); internal::log_print(formatted_message.c_str());
} }

2
common/math/Vector.h
View File

@ -2,7 +2,7 @@
#include <cmath> #include <cmath>
#include "fmt/core.h" #include "fmt/format.h"
namespace math { namespace math {

2
common/repl/config.cpp
View File

@ -2,7 +2,7 @@
#include "common/versions/versions.h" #include "common/versions/versions.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace REPL { namespace REPL {
void to_json(json& j, const Config& obj) { void to_json(json& j, const Config& obj) {

2
common/repl/nrepl/ReplClient.cpp
View File

@ -4,7 +4,7 @@
#include "common/cross_sockets/XSocket.h" #include "common/cross_sockets/XSocket.h"
#include "common/versions/versions.h" #include "common/versions/versions.h"
#include "fmt/core.h" #include "fmt/format.h"
#ifdef _WIN32 #ifdef _WIN32
#define NOMINMAX #define NOMINMAX

2
common/repl/nrepl/ReplServer.cpp
View File

@ -4,7 +4,7 @@
#include "common/cross_sockets/XSocket.h" #include "common/cross_sockets/XSocket.h"
#include "common/versions/versions.h" #include "common/versions/versions.h"
#include "fmt/core.h" #include "fmt/format.h"
#ifdef _WIN32 #ifdef _WIN32
#define NOMINMAX #define NOMINMAX

9
common/repl/repl_wrapper.cpp
View File

@ -6,7 +6,8 @@
#include "common/versions/versions.h" #include "common/versions/versions.h"
#include "fmt/color.h" #include "fmt/color.h"
#include "fmt/core.h" #include "fmt/format.h"
#include "fmt/ranges.h"
#include "third-party/replxx/include/replxx.hxx" #include "third-party/replxx/include/replxx.hxx"
namespace REPL { namespace REPL {
@ -41,7 +42,7 @@ void Wrapper::print_welcome_message(const std::vector<std::string>& loaded_proje
message += fmt::format(fmt::emphasis::bold | fg(fmt::color::orange), " . --- ."); message += fmt::format(fmt::emphasis::bold | fg(fmt::color::orange), " . --- .");
message += message +=
fmt::format(" Project Path: {}\n", fmt::format(" Project Path: {}\n",
fmt::format(fg(fmt::color::gray), file_util::get_jak_project_dir().string())); fmt::styled(file_util::get_jak_project_dir().string(), fg(fmt::color::gray)));
message += fmt::format(fmt::emphasis::bold | fg(fmt::color::orange), " - :===: -"); message += fmt::format(fmt::emphasis::bold | fg(fmt::color::orange), " - :===: -");
std::string effective_iso_path; std::string effective_iso_path;
if (repl_config.iso_path.empty()) { if (repl_config.iso_path.empty()) {
@ -50,7 +51,7 @@ void Wrapper::print_welcome_message(const std::vector<std::string>& loaded_proje
effective_iso_path = repl_config.iso_path; effective_iso_path = repl_config.iso_path;
} }
message += message +=
fmt::format(" ISO Data Path: {}\n", fmt::format(fg(fmt::color::gray), effective_iso_path)); fmt::format(" ISO Data Path: {}\n", fmt::styled(effective_iso_path, fg(fmt::color::gray)));
message += fmt::format(fmt::emphasis::bold | fg(fmt::color::orange), " --. .--: :--. .--"); message += fmt::format(fmt::emphasis::bold | fg(fmt::color::orange), " --. .--: :--. .--");
message += " nREPL:"; message += " nREPL:";
if (!nrepl_alive) { if (!nrepl_alive) {
@ -63,7 +64,7 @@ void Wrapper::print_welcome_message(const std::vector<std::string>& loaded_proje
message += " Source File Search Dirs: "; message += " Source File Search Dirs: ";
const auto search_dir_string = const auto search_dir_string =
fmt::format("{}", fmt::join(repl_config.asm_file_search_dirs, ",")); fmt::format("{}", fmt::join(repl_config.asm_file_search_dirs, ","));
message += fmt::format("[{}]\n", fmt::format(fg(fmt::color::gray), search_dir_string)); message += fmt::format("[{}]\n", fmt::styled(search_dir_string, fg(fmt::color::gray)));
message += fmt::format(fmt::emphasis::bold | fg(fmt::color::orange), " .-=====-. .-=====-"); message += fmt::format(fmt::emphasis::bold | fg(fmt::color::orange), " .-=====-. .-=====-");
message += fmt::format(" {} or {} for basic help and usage\n", message += fmt::format(" {} or {} for basic help and usage\n",
fmt::format(fg(fmt::color::cyan), "(repl-help)"), fmt::format(fg(fmt::color::cyan), "(repl-help)"),

2
common/serialization/subtitles/subtitles.cpp
View File

@ -5,7 +5,7 @@
#include "common/util/FileUtil.h" #include "common/util/FileUtil.h"
#include "common/util/json_util.h" #include "common/util/json_util.h"
#include "fmt/core.h" #include "fmt/format.h"
void open_subtitle_project(const std::string& project_kind, void open_subtitle_project(const std::string& project_kind,
const std::string& file_path, const std::string& file_path,

2
common/serialization/subtitles/subtitles_v1.cpp
View File

@ -5,7 +5,7 @@
#include "subtitles_v2.h" #include "subtitles_v2.h"
#include "fmt/core.h" #include "fmt/format.h"
void to_json(json& j, const SubtitleCutsceneLineMetadataV1& obj) { void to_json(json& j, const SubtitleCutsceneLineMetadataV1& obj) {
json_serialize(frame_start); json_serialize(frame_start);

2
common/serialization/subtitles/subtitles_v2.cpp
View File

@ -5,7 +5,7 @@
#include "subtitles_v1.h" #include "subtitles_v1.h"
#include "fmt/core.h" #include "fmt/format.h"
void to_json(json& j, const SubtitleLineMetadata& obj) { void to_json(json& j, const SubtitleLineMetadata& obj) {
json_serialize(frame_start); json_serialize(frame_start);

2
common/type_system/Type.cpp
View File

@ -10,7 +10,7 @@
#include "common/log/log.h" #include "common/log/log.h"
#include "common/util/Assert.h" #include "common/util/Assert.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace { namespace {
std::string reg_kind_to_string(RegClass kind) { std::string reg_kind_to_string(RegClass kind) {

2
common/type_system/TypeFieldLookup.cpp
View File

@ -9,7 +9,7 @@
#include "common/log/log.h" #include "common/log/log.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace { namespace {
// debug prints for the reverse lookup // debug prints for the reverse lookup

2
common/type_system/TypeSpec.cpp
View File

@ -7,7 +7,7 @@
#include <stdexcept> #include <stdexcept>
#include "fmt/core.h" #include "fmt/format.h"
bool TypeTag::operator==(const TypeTag& other) const { bool TypeTag::operator==(const TypeTag& other) const {
return name == other.name && value == other.value; return name == other.name && value == other.value;

2
common/type_system/TypeSystem.cpp
View File

@ -15,7 +15,7 @@
#include "common/util/math_util.h" #include "common/util/math_util.h"
#include "fmt/color.h" #include "fmt/color.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace { namespace {
template <typename... Args> template <typename... Args>

2
common/type_system/defenum.cpp
View File

@ -13,7 +13,7 @@
#include "common/util/BitUtils.h" #include "common/util/BitUtils.h"
#include "common/util/string_util.h" #include "common/util/string_util.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace { namespace {
const goos::Object& car(const goos::Object* x) { const goos::Object& car(const goos::Object* x) {

2
common/type_system/deftype.cpp
View File

@ -13,7 +13,7 @@
#include "common/type_system/state.h" #include "common/type_system/state.h"
#include "common/util/string_util.h" #include "common/util/string_util.h"
#include "fmt/core.h" #include "fmt/format.h"
/*! /*!
* Missing Features * Missing Features

2
common/util/FileUtil.cpp
View File

@ -22,7 +22,7 @@
// This disables the use of PCLMULQDQ which is probably ok, but let's just be safe and disable it // This disables the use of PCLMULQDQ which is probably ok, but let's just be safe and disable it
// because nobody will care if png compression is 10% slower. // because nobody will care if png compression is 10% slower.
#define FPNG_NO_SSE 1 #define FPNG_NO_SSE 1
#include "fmt/core.h" #include "fmt/format.h"
#include "third-party/fpng/fpng.cpp" #include "third-party/fpng/fpng.cpp"
#include "third-party/fpng/fpng.h" #include "third-party/fpng/fpng.h"
#include "third-party/lzokay/lzokay.hpp" #include "third-party/lzokay/lzokay.hpp"

1
common/util/FontUtils.cpp
View File

@ -16,7 +16,6 @@
#include "common/util/Assert.h" #include "common/util/Assert.h"
#include "fmt/core.h"
#include "fmt/format.h" #include "fmt/format.h"
const std::unordered_map<std::string, GameTextVersion> sTextVerEnumMap = { const std::unordered_map<std::string, GameTextVersion> sTextVerEnumMap = {

2
common/util/compress.cpp
View File

@ -5,7 +5,7 @@
#include "common/util/Assert.h" #include "common/util/Assert.h"
#include "fmt/core.h" #include "fmt/format.h"
#include "third-party/zstd/lib/zstd.h" #include "third-party/zstd/lib/zstd.h"
namespace compression { namespace compression {

2
common/util/dgo_util.cpp
View File

@ -5,7 +5,7 @@
#include "common/util/Assert.h" #include "common/util/Assert.h"
#include "common/versions/versions.h" #include "common/versions/versions.h"
#include "fmt/core.h" #include "fmt/format.h"
/*! /*!
* Assert false if the char[] has non-null data after the null terminated string. * Assert false if the char[] has non-null data after the null terminated string.

2
common/util/print_float.cpp
View File

@ -5,7 +5,7 @@
#include "common/goal_constants.h" #include "common/goal_constants.h"
#include "common/util/Assert.h" #include "common/util/Assert.h"
#include "fmt/core.h" #include "fmt/format.h"
#include "third-party/dragonbox.h" #include "third-party/dragonbox.h"
/*! /*!

1
common/versions/versions.cpp
View File

@ -3,7 +3,6 @@
#include "common/util/Assert.h" #include "common/util/Assert.h"
#include "common/versions/revision.h" #include "common/versions/revision.h"
#include "fmt/core.h"
#include "fmt/format.h" #include "fmt/format.h"
GameVersion game_name_to_version(const std::string& name) { GameVersion game_name_to_version(const std::string& name) {

2
decompiler/Disasm/Instruction.cpp
View File

@ -10,7 +10,7 @@
#include "decompiler/ObjectFile/LinkedObjectFile.h" #include "decompiler/ObjectFile/LinkedObjectFile.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace decompiler { namespace decompiler {
/*! /*!

2
decompiler/Disasm/InstructionDecode.cpp
View File

@ -10,7 +10,7 @@
#include "decompiler/ObjectFile/LinkedObjectFile.h" #include "decompiler/ObjectFile/LinkedObjectFile.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace decompiler { namespace decompiler {
// utility class to extract fields of an opcode. // utility class to extract fields of an opcode.

2
decompiler/Disasm/InstructionParser.cpp
View File

@ -7,7 +7,7 @@
#include "common/common_types.h" #include "common/common_types.h"
#include "common/util/Assert.h" #include "common/util/Assert.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace decompiler { namespace decompiler {
InstructionParser::InstructionParser() { InstructionParser::InstructionParser() {

2
decompiler/Function/Warnings.h
View File

@ -7,7 +7,7 @@
#include "common/util/Assert.h" #include "common/util/Assert.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace decompiler { namespace decompiler {
class DecompWarnings { class DecompWarnings {

2
decompiler/IR2/AtomicOp.cpp
View File

@ -12,7 +12,7 @@
#include "decompiler/ObjectFile/LinkedObjectFile.h" #include "decompiler/ObjectFile/LinkedObjectFile.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace decompiler { namespace decompiler {
///////////////////////////// /////////////////////////////

2
decompiler/IR2/AtomicOpTypeAnalysis.cpp
View File

@ -10,7 +10,7 @@
#include "decompiler/util/TP_Type.h" #include "decompiler/util/TP_Type.h"
#include "decompiler/util/type_utils.h" #include "decompiler/util/type_utils.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace decompiler { namespace decompiler {

2
decompiler/IR2/IR2_common.h
View File

@ -8,7 +8,7 @@
#include "decompiler/Function/Warnings.h" #include "decompiler/Function/Warnings.h"
#include "decompiler/util/TP_Type.h" #include "decompiler/util/TP_Type.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace decompiler { namespace decompiler {
enum class AccessMode : u8 { enum class AccessMode : u8 {

2
decompiler/IR2/LabelDB.cpp
View File

@ -1,6 +1,6 @@
#include "LabelDB.h" #include "LabelDB.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace decompiler { namespace decompiler {

2
decompiler/ObjectFile/LinkedObjectFile.cpp
View File

@ -16,7 +16,7 @@
#include "decompiler/Disasm/InstructionDecode.h" #include "decompiler/Disasm/InstructionDecode.h"
#include "decompiler/config.h" #include "decompiler/config.h"
#include "fmt/core.h" #include "fmt/format.h"
#include "third-party/json.hpp" #include "third-party/json.hpp"
namespace decompiler { namespace decompiler {

2
decompiler/ObjectFile/ObjectFileDB.h
View File

@ -21,7 +21,7 @@
#include "decompiler/data/TextureDB.h" #include "decompiler/data/TextureDB.h"
#include "decompiler/util/DecompilerTypeSystem.h" #include "decompiler/util/DecompilerTypeSystem.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace decompiler { namespace decompiler {
/*! /*!

2
decompiler/VuDisasm/VuDisassembler.cpp
View File

@ -7,7 +7,7 @@
#include "common/util/Assert.h" #include "common/util/Assert.h"
#include "common/util/print_float.h" #include "common/util/print_float.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace decompiler { namespace decompiler {

2
decompiler/VuDisasm/VuInstruction.cpp
View File

@ -2,7 +2,7 @@
#include "common/util/Assert.h" #include "common/util/Assert.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace decompiler { namespace decompiler {
VuInstructionAtom VuInstructionAtom::make_vf(int idx) { VuInstructionAtom VuInstructionAtom::make_vf(int idx) {

2
decompiler/analysis/stack_spill.cpp
View File

@ -4,7 +4,7 @@
#include "decompiler/Disasm/DecompilerLabel.h" #include "decompiler/Disasm/DecompilerLabel.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace decompiler { namespace decompiler {

2
decompiler/analysis/variable_naming.cpp
View File

@ -10,7 +10,7 @@
#include "decompiler/IR2/Env.h" #include "decompiler/IR2/Env.h"
#include "decompiler/util/DecompilerTypeSystem.h" #include "decompiler/util/DecompilerTypeSystem.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace decompiler { namespace decompiler {

2
decompiler/config.cpp
View File

@ -6,7 +6,7 @@
#include "decompiler/util/config_parsers.h" #include "decompiler/util/config_parsers.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace decompiler { namespace decompiler {

2
decompiler/data/TextureDB.cpp
View File

@ -3,7 +3,7 @@
#include "common/log/log.h" #include "common/log/log.h"
#include "common/util/Assert.h" #include "common/util/Assert.h"
#include "fmt/core.h" #include "fmt/format.h"
#define STBI_WINDOWS_UTF8 #define STBI_WINDOWS_UTF8
#include "third-party/stb_image/stb_image.h" #include "third-party/stb_image/stb_image.h"

2
decompiler/data/dir_tpages.cpp
View File

@ -2,7 +2,7 @@
#include "decompiler/ObjectFile/ObjectFileDB.h" #include "decompiler/ObjectFile/ObjectFileDB.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace decompiler { namespace decompiler {
std::string DirTpageResult::to_source() const { std::string DirTpageResult::to_source() const {

2
decompiler/data/game_count.cpp
View File

@ -4,7 +4,7 @@
#include "decompiler/ObjectFile/ObjectFileDB.h" #include "decompiler/ObjectFile/ObjectFileDB.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace decompiler { namespace decompiler {
GameCountResult process_game_count(ObjectFileData& data) { GameCountResult process_game_count(ObjectFileData& data) {

2
decompiler/data/game_text.cpp
View File

@ -14,7 +14,7 @@
#include "decompiler/ObjectFile/ObjectFileDB.h" #include "decompiler/ObjectFile/ObjectFileDB.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace decompiler { namespace decompiler {
namespace { namespace {

2
decompiler/data/streamed_audio.cpp
View File

@ -7,7 +7,7 @@
#include "common/util/FileUtil.h" #include "common/util/FileUtil.h"
#include "common/util/string_util.h" #include "common/util/string_util.h"
#include "fmt/core.h" #include "fmt/format.h"
#include "third-party/json.hpp" #include "third-party/json.hpp"
namespace decompiler { namespace decompiler {

2
decompiler/data/tpage.cpp
View File

@ -23,7 +23,7 @@
#include "decompiler/ObjectFile/ObjectFileDB.h" #include "decompiler/ObjectFile/ObjectFileDB.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace decompiler { namespace decompiler {
namespace { namespace {

2
decompiler/level_extractor/MercData.cpp
View File

@ -6,7 +6,7 @@
#include "decompiler/ObjectFile/LinkedObjectFile.h" #include "decompiler/ObjectFile/LinkedObjectFile.h"
#include "decompiler/util/DecompilerTypeSystem.h" #include "decompiler/util/DecompilerTypeSystem.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace decompiler { namespace decompiler {

2
decompiler/level_extractor/extract_actors.cpp
View File

@ -2,7 +2,7 @@
#include "common/goos/PrettyPrinter2.h" #include "common/goos/PrettyPrinter2.h"
#include "fmt/core.h" #include "fmt/format.h"
#include "third-party/json.hpp" #include "third-party/json.hpp"
namespace decompiler { namespace decompiler {

2
decompiler/util/DataParser.cpp
View File

@ -5,7 +5,7 @@
#include "common/util/Assert.h" #include "common/util/Assert.h"
#include "fmt/core.h" #include "fmt/format.h"
/* /*
* Allowable lines: * Allowable lines:

2
decompiler/util/Error.h
View File

@ -2,7 +2,7 @@
#include <stdexcept> #include <stdexcept>
#include "fmt/core.h" #include "fmt/format.h"
class Error : public std::runtime_error { class Error : public std::runtime_error {
public: public:

2
decompiler/util/TP_Type.cpp
View File

@ -1,6 +1,6 @@
#include "TP_Type.h" #include "TP_Type.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace decompiler { namespace decompiler {
u32 regs_to_gpr_mask(const std::vector<Register>& regs) { u32 regs_to_gpr_mask(const std::vector<Register>& regs) {

2
decompiler/util/data_decompile.cpp
View File

@ -13,7 +13,7 @@
#include "decompiler/ObjectFile/LinkedObjectFile.h" #include "decompiler/ObjectFile/LinkedObjectFile.h"
#include "decompiler/analysis/final_output.h" #include "decompiler/analysis/final_output.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace decompiler { namespace decompiler {

2
game/graphics/opengl_renderer/BucketRenderer.cpp
View File

@ -1,6 +1,6 @@
#include "BucketRenderer.h" #include "BucketRenderer.h"
#include "fmt/core.h" #include "fmt/format.h"
#include "third-party/imgui/imgui.h" #include "third-party/imgui/imgui.h"
std::string BucketRenderer::name() const { std::string BucketRenderer::name() const {

2
game/graphics/opengl_renderer/DepthCue.cpp
View File

@ -2,7 +2,7 @@
#include "game/graphics/opengl_renderer/dma_helpers.h" #include "game/graphics/opengl_renderer/dma_helpers.h"
#include "fmt/core.h" #include "fmt/format.h"
#include "third-party/imgui/imgui.h" #include "third-party/imgui/imgui.h"
namespace { namespace {

2
game/graphics/opengl_renderer/DirectRenderer.cpp
View File

@ -6,7 +6,7 @@
#include "game/graphics/pipelines/opengl.h" #include "game/graphics/pipelines/opengl.h"
#include "fmt/core.h" #include "fmt/format.h"
#include "third-party/imgui/imgui.h" #include "third-party/imgui/imgui.h"
DirectRenderer::ScissorState DirectRenderer::m_scissor; DirectRenderer::ScissorState DirectRenderer::m_scissor;

2
game/graphics/opengl_renderer/Profiler.cpp
View File

@ -5,7 +5,7 @@
#include "common/log/log.h" #include "common/log/log.h"
#include "common/util/colors.h" #include "common/util/colors.h"
#include "fmt/core.h" #include "fmt/format.h"
#include "third-party/imgui/imgui.h" #include "third-party/imgui/imgui.h"
ProfilerNode::ProfilerNode(const std::string& name) : m_name(name) {} ProfilerNode::ProfilerNode(const std::string& name) : m_name(name) {}

2
game/graphics/opengl_renderer/TextureUploadHandler.cpp
View File

@ -6,7 +6,7 @@
#include "game/graphics/opengl_renderer/EyeRenderer.h" #include "game/graphics/opengl_renderer/EyeRenderer.h"
#include "game/graphics/pipelines/opengl.h" #include "game/graphics/pipelines/opengl.h"
#include "fmt/core.h" #include "fmt/format.h"
#include "third-party/imgui/imgui.h" #include "third-party/imgui/imgui.h"
TextureUploadHandler::TextureUploadHandler(const std::string& name, TextureUploadHandler::TextureUploadHandler(const std::string& name,

2
game/graphics/opengl_renderer/debug_gui.cpp
View File

@ -9,7 +9,7 @@
#include "game/overlord/jak3/dma.h" #include "game/overlord/jak3/dma.h"
#include "game/system/hid/sdl_util.h" #include "game/system/hid/sdl_util.h"
#include "fmt/core.h" #include "fmt/format.h"
#include "third-party/imgui/imgui.h" #include "third-party/imgui/imgui.h"
#include "third-party/imgui/imgui_style.h" #include "third-party/imgui/imgui_style.h"

2
game/graphics/opengl_renderer/sprite/Sprite3.cpp
View File

@ -5,7 +5,7 @@
#include "game/graphics/opengl_renderer/background/background_common.h" #include "game/graphics/opengl_renderer/background/background_common.h"
#include "game/graphics/opengl_renderer/dma_helpers.h" #include "game/graphics/opengl_renderer/dma_helpers.h"
#include "fmt/core.h" #include "fmt/format.h"
#include "third-party/imgui/imgui.h" #include "third-party/imgui/imgui.h"
namespace { namespace {

2
game/graphics/pipelines/opengl.cpp
View File

@ -30,7 +30,7 @@
#include "game/system/hid/input_manager.h" #include "game/system/hid/input_manager.h"
#include "game/system/hid/sdl_util.h" #include "game/system/hid/sdl_util.h"
#include "fmt/core.h" #include "fmt/format.h"
#include "third-party/SDL/include/SDL3/SDL.h" #include "third-party/SDL/include/SDL3/SDL.h"
#include "third-party/SDL/include/SDL3/SDL_hints.h" #include "third-party/SDL/include/SDL3/SDL_hints.h"
#include "third-party/SDL/include/SDL3/SDL_version.h" #include "third-party/SDL/include/SDL3/SDL_version.h"

2
game/graphics/texture/TextureConverter.cpp
View File

@ -4,7 +4,7 @@
#include "common/util/Assert.h" #include "common/util/Assert.h"
#include "common/util/FileUtil.h" #include "common/util/FileUtil.h"
#include "fmt/core.h" #include "fmt/format.h"
TextureConverter::TextureConverter() { TextureConverter::TextureConverter() {
m_vram.resize(4 * 1024 * 1024); m_vram.resize(4 * 1024 * 1024);

2
game/graphics/texture/TexturePool.cpp
View File

@ -12,7 +12,7 @@
#include "game/graphics/texture/jak2_tpage_dir.h" #include "game/graphics/texture/jak2_tpage_dir.h"
#include "game/graphics/texture/jak3_tpage_dir.h" #include "game/graphics/texture/jak3_tpage_dir.h"
#include "fmt/core.h" #include "fmt/format.h"
#include "third-party/imgui/imgui.h" #include "third-party/imgui/imgui.h"
namespace { namespace {

2
game/kernel/common/klink.cpp
View File

@ -6,7 +6,7 @@
#include "game/kernel/common/fileio.h" #include "game/kernel/common/fileio.h"
#include "game/kernel/common/kscheme.h" #include "game/kernel/common/kscheme.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace { namespace {
// turn on printf's for debugging linking issues. // turn on printf's for debugging linking issues.

2
game/kernel/common/kmemcard.cpp
View File

@ -19,7 +19,7 @@
#include "game/sce/sif_ee.h" #include "game/sce/sif_ee.h"
#include "game/sce/sif_ee_memcard.h" #include "game/sce/sif_ee_memcard.h"
#include "fmt/core.h" #include "fmt/format.h"
static constexpr bool memcard_debug = false; static constexpr bool memcard_debug = false;

2
game/kernel/jak1/klink.cpp
View File

@ -12,7 +12,7 @@
#include "game/kernel/jak1/kscheme.h" #include "game/kernel/jak1/kscheme.h"
#include "game/mips2c/mips2c_table.h" #include "game/mips2c/mips2c_table.h"
#include "fmt/core.h" #include "fmt/format.h"
static constexpr bool link_debug_printfs = false; static constexpr bool link_debug_printfs = false;
/*! /*!

2
game/kernel/jak2/klink.cpp
View File

@ -13,7 +13,7 @@
#include "game/kernel/jak2/kscheme.h" #include "game/kernel/jak2/kscheme.h"
#include "game/mips2c/mips2c_table.h" #include "game/mips2c/mips2c_table.h"
#include "fmt/core.h" #include "fmt/format.h"
static constexpr bool link_debug_printfs = false; static constexpr bool link_debug_printfs = false;

2
game/kernel/jak3/klink.cpp
View File

@ -12,7 +12,7 @@
#include "game/kernel/jak3/kscheme.h" #include "game/kernel/jak3/kscheme.h"
#include "game/mips2c/mips2c_table.h" #include "game/mips2c/mips2c_table.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace { namespace {
bool is_opengoal_object(void* data) { bool is_opengoal_object(void* data) {

2
game/mips2c/mips2c_private.h
View File

@ -12,7 +12,7 @@
#include "game/common/vu.h" #include "game/common/vu.h"
#include "game/mips2c/mips2c_table.h" #include "game/mips2c/mips2c_table.h"
#include "fmt/core.h" #include "fmt/format.h"
// This file contains utility functions for code generated by the mips2c pass. // This file contains utility functions for code generated by the mips2c pass.
// This is only useful for // This is only useful for

2
game/overlord/jak1/srpc.cpp
View File

@ -24,7 +24,7 @@
#include "game/sce/iop.h" #include "game/sce/iop.h"
#include "game/sound/sndshim.h" #include "game/sound/sndshim.h"
#include "fmt/core.h" #include "fmt/format.h"
#include "third-party/magic_enum.hpp" #include "third-party/magic_enum.hpp"
using namespace iop; using namespace iop;

3
game/overlord/jak3/pagemanager.cpp
View File

@ -2,6 +2,7 @@
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>
#include <memory>
#include "common/log/log.h" #include "common/log/log.h"
#include "common/util/Assert.h" #include "common/util/Assert.h"
@ -849,4 +850,4 @@ void CPageManager::GarbageCollectPageList(jak3::CPageList* list) {
} }
} }
} // namespace jak3 } // namespace jak3

2
game/sound/989snd/loader.cpp
View File

@ -12,7 +12,7 @@
#include "game/sound/989snd/musicbank.h" #include "game/sound/989snd/musicbank.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace snd { namespace snd {

2
game/sound/989snd/midi_handler.cpp
View File

@ -8,7 +8,7 @@
#include "game/sound/989snd/util.h" #include "game/sound/989snd/util.h"
#include "fmt/core.h" #include "fmt/format.h"
namespace snd { namespace snd {
/* /*

2
game/sound/989snd/player.cpp
View File

@ -6,7 +6,7 @@
#include "sfxblock.h" #include "sfxblock.h"
#include "fmt/core.h" #include "fmt/format.h"
#ifdef _WIN32 #ifdef _WIN32
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN

2
game/sound/sdshim.cpp
View File

@ -7,7 +7,7 @@
#include "game/sound/common/voice.h" #include "game/sound/common/voice.h"
#include "fmt/core.h" #include "fmt/format.h"
std::shared_ptr<snd::Voice> voices[kNVoices]; std::shared_ptr<snd::Voice> voices[kNVoices];
u8 spu_memory[0x15160 * 10]; u8 spu_memory[0x15160 * 10];

2
game/system/Deci2Server.cpp
View File

@ -12,7 +12,7 @@
#include "common/listener_common.h" #include "common/listener_common.h"
#include "common/util/Assert.h" #include "common/util/Assert.h"
#include "fmt/core.h" #include "fmt/format.h"
#ifdef _WIN32 #ifdef _WIN32
#define NOMINMAX #define NOMINMAX

2
game/system/hid/devices/game_controller.cpp
View File

@ -7,7 +7,7 @@
#include "game/system/hid/sdl_util.h" #include "game/system/hid/sdl_util.h"
#include "fmt/core.h" #include "fmt/format.h"
GameController::GameController(int sdl_device_id, GameController::GameController(int sdl_device_id,
std::shared_ptr<game_settings::InputSettings> settings) std::shared_ptr<game_settings::InputSettings> settings)

1
game/system/hid/display_manager.cpp
View File

@ -4,7 +4,6 @@
#include "common/global_profiler/GlobalProfiler.h" #include "common/global_profiler/GlobalProfiler.h"
#include "fmt/core.h"
#include "fmt/format.h" #include "fmt/format.h"
DisplayManager::DisplayManager(SDL_Window* window) : m_window(window) { DisplayManager::DisplayManager(SDL_Window* window) : m_window(window) {

1
game/system/hid/sdl_util.cpp
View File

@ -2,6 +2,7 @@
#include "common/log/log.h" #include "common/log/log.h"
#include "fmt/ranges.h"
#include "third-party/SDL/include/SDL3/SDL.h" #include "third-party/SDL/include/SDL3/SDL.h"
namespace sdl_util { namespace sdl_util {

2
game/tools/filter_menu/filter_menu.cpp
View File

@ -2,7 +2,7 @@
#include "game/graphics/gfx.h" #include "game/graphics/gfx.h"
#include "fmt/core.h" #include "fmt/format.h"
#include "third-party/imgui/imgui.h" #include "third-party/imgui/imgui.h"
#include "third-party/imgui/imgui_stdlib.h" #include "third-party/imgui/imgui_stdlib.h"

2
game/tools/subtitle_editor/subtitle_editor.cpp
View File

@ -10,7 +10,7 @@
#include "game/runtime.h" #include "game/runtime.h"
#include "fmt/core.h" #include "fmt/format.h"
#include "third-party/imgui/imgui.h" #include "third-party/imgui/imgui.h"
#include "third-party/imgui/imgui_stdlib.h" #include "third-party/imgui/imgui_stdlib.h"

2
game/tools/subtitle_editor/subtitle_editor_db.cpp
View File

@ -5,7 +5,7 @@
#include "game/runtime.h" #include "game/runtime.h"
#include "fmt/core.h" #include "fmt/format.h"
void Jak1SubtitleEditorDB::update() { void Jak1SubtitleEditorDB::update() {
if (g_game_version != GameVersion::Jak1) { if (g_game_version != GameVersion::Jak1) {

2
game/tools/subtitle_editor/subtitle_editor_repl_client.cpp
View File

@ -4,7 +4,7 @@
#include "game/runtime.h" #include "game/runtime.h"
#include "fmt/core.h" #include "fmt/format.h"
SubtitleEditorReplClient::SubtitleEditorReplClient() { SubtitleEditorReplClient::SubtitleEditorReplClient() {
int port = 8181; int port = 8181;

Some files were not shown because too many files have changed in this diff Show More