diff --git a/src/ImageConverter/ImageConverterArgs.cpp b/src/ImageConverter/ImageConverterArgs.cpp index 653f4625..79ac8ad4 100644 --- a/src/ImageConverter/ImageConverterArgs.cpp +++ b/src/ImageConverter/ImageConverterArgs.cpp @@ -79,8 +79,7 @@ const CommandLineOption* const COMMAND_LINE_OPTIONS[]{ }; ImageConverterArgs::ImageConverterArgs() - : m_verbose(false), - m_game_to_convert_to(image_converter::Game::UNKNOWN), + : m_game_to_convert_to(image_converter::Game::UNKNOWN), m_argument_parser(COMMAND_LINE_OPTIONS, std::extent_v) { } @@ -105,11 +104,6 @@ void ImageConverterArgs::PrintVersion() con::info("OpenAssetTools ImageConverter {}", GIT_VERSION); } -void ImageConverterArgs::SetVerbose(const bool isVerbose) -{ - m_verbose = isVerbose; -} - bool ImageConverterArgs::ParseArgs(const int argc, const char** argv, bool& shouldContinue) { shouldContinue = true; @@ -144,7 +138,10 @@ bool ImageConverterArgs::ParseArgs(const int argc, const char** argv, bool& shou } // -v; --verbose - SetVerbose(m_argument_parser.IsOptionSpecified(OPTION_VERBOSE)); + if (m_argument_parser.IsOptionSpecified(OPTION_VERBOSE)) + con::globalLogLevel = con::LogLevel::DEBUG; + else + con::globalLogLevel = con::LogLevel::INFO; return true; } diff --git a/src/ImageConverter/ImageConverterArgs.h b/src/ImageConverter/ImageConverterArgs.h index 6d39a8a4..2a221523 100644 --- a/src/ImageConverter/ImageConverterArgs.h +++ b/src/ImageConverter/ImageConverterArgs.h @@ -25,7 +25,6 @@ public: ImageConverterArgs(); bool ParseArgs(int argc, const char** argv, bool& shouldContinue); - bool m_verbose; std::vector m_files_to_convert; image_converter::Game m_game_to_convert_to; @@ -36,7 +35,5 @@ private: static void PrintUsage(); static void PrintVersion(); - void SetVerbose(bool isVerbose); - ArgumentParser m_argument_parser; }; diff --git a/src/Linker/LinkerArgs.cpp b/src/Linker/LinkerArgs.cpp index 76abd41b..80f9134d 100644 --- a/src/Linker/LinkerArgs.cpp +++ b/src/Linker/LinkerArgs.cpp @@ -129,8 +129,7 @@ const CommandLineOption* const COMMAND_LINE_OPTIONS[]{ }; LinkerArgs::LinkerArgs() - : m_verbose(false), - m_argument_parser(COMMAND_LINE_OPTIONS, std::extent_v) + : m_argument_parser(COMMAND_LINE_OPTIONS, std::extent_v) { } @@ -160,13 +159,6 @@ void LinkerArgs::SetBinFolder() m_bin_folder = path.parent_path().string(); } -void LinkerArgs::SetVerbose(const bool isVerbose) -{ - m_verbose = isVerbose; - ObjLoading::Configuration.Verbose = isVerbose; - ObjWriting::Configuration.Verbose = isVerbose; -} - bool LinkerArgs::ParseArgs(const int argc, const char** argv, bool& shouldContinue) { shouldContinue = true; @@ -203,7 +195,10 @@ bool LinkerArgs::ParseArgs(const int argc, const char** argv, bool& shouldContin } // -v; --verbose - SetVerbose(m_argument_parser.IsOptionSpecified(OPTION_VERBOSE)); + if (m_argument_parser.IsOptionSpecified(OPTION_VERBOSE)) + con::globalLogLevel = con::LogLevel::DEBUG; + else + con::globalLogLevel = con::LogLevel::INFO; // b; --base-folder if (m_argument_parser.IsOptionSpecified(OPTION_BASE_FOLDER)) diff --git a/src/Linker/LinkerArgs.h b/src/Linker/LinkerArgs.h index 4f779117..e9c93c15 100644 --- a/src/Linker/LinkerArgs.h +++ b/src/Linker/LinkerArgs.h @@ -17,8 +17,6 @@ public: LinkerArgs(); bool ParseArgs(int argc, const char** argv, bool& shouldContinue); - bool m_verbose; - std::vector m_zones_to_load; std::vector m_project_specifiers_to_build; @@ -38,7 +36,6 @@ private: static void PrintVersion(); void SetBinFolder(); - void SetVerbose(bool isVerbose); ArgumentParser m_argument_parser; }; diff --git a/src/ObjLoading/ObjLoading.h b/src/ObjLoading/ObjLoading.h index 08d9a319..1ae2883a 100644 --- a/src/ObjLoading/ObjLoading.h +++ b/src/ObjLoading/ObjLoading.h @@ -6,7 +6,6 @@ public: static class Configuration_t { public: - bool Verbose = false; bool MenuPermissiveParsing = false; bool MenuNoOptimization = false; } Configuration; diff --git a/src/ObjWriting/Material/AbstractMaterialConstantZoneState.cpp b/src/ObjWriting/Material/AbstractMaterialConstantZoneState.cpp index 3a87d05a..c986878a 100644 --- a/src/ObjWriting/Material/AbstractMaterialConstantZoneState.cpp +++ b/src/ObjWriting/Material/AbstractMaterialConstantZoneState.cpp @@ -26,14 +26,11 @@ void AbstractMaterialConstantZoneState::ExtractNamesFromZone() const auto end = std::chrono::high_resolution_clock::now(); - if (ObjWriting::Configuration.Verbose) - { - const auto durationInMs = std::chrono::duration_cast(end - begin); - con::debug("Built material constant name lookup in {}ms: {} constant names; {} texture def names", - durationInMs.count(), - m_constant_names_from_shaders.size(), - m_texture_def_names_from_shaders.size()); - } + const auto durationInMs = std::chrono::duration_cast(end - begin); + con::debug("Built material constant name lookup in {}ms: {} constant names; {} texture def names", + durationInMs.count(), + m_constant_names_from_shaders.size(), + m_texture_def_names_from_shaders.size()); } bool AbstractMaterialConstantZoneState::GetConstantName(const unsigned hash, std::string& constantName) const diff --git a/src/ObjWriting/ObjWriting.h b/src/ObjWriting/ObjWriting.h index 0fe1ec93..200ddab7 100644 --- a/src/ObjWriting/ObjWriting.h +++ b/src/ObjWriting/ObjWriting.h @@ -26,7 +26,6 @@ public: GLB }; - bool Verbose = false; std::vector AssetTypesToHandleBitfield; ImageOutputFormat_e ImageOutputFormat = ImageOutputFormat_e::DDS; diff --git a/src/RawTemplater/RawTemplaterArguments.cpp b/src/RawTemplater/RawTemplaterArguments.cpp index 5b2eaf56..f36af8de 100644 --- a/src/RawTemplater/RawTemplaterArguments.cpp +++ b/src/RawTemplater/RawTemplaterArguments.cpp @@ -65,8 +65,7 @@ const CommandLineOption* const COMMAND_LINE_OPTIONS[]{ }; RawTemplaterArguments::RawTemplaterArguments() - : m_argument_parser(COMMAND_LINE_OPTIONS, std::extent_v), - m_verbose(false) + : m_argument_parser(COMMAND_LINE_OPTIONS, std::extent_v) { } @@ -120,7 +119,10 @@ bool RawTemplaterArguments::ParseArgs(const int argc, const char** argv, bool& s } // -v; --verbose - m_verbose = m_argument_parser.IsOptionSpecified(OPTION_VERBOSE); + if (m_argument_parser.IsOptionSpecified(OPTION_VERBOSE)) + con::globalLogLevel = con::LogLevel::DEBUG; + else + con::globalLogLevel = con::LogLevel::INFO; // -o; --output if (m_argument_parser.IsOptionSpecified(OPTION_OUTPUT_FOLDER)) diff --git a/src/RawTemplater/RawTemplaterArguments.h b/src/RawTemplater/RawTemplaterArguments.h index cfaac7b3..a0b2696d 100644 --- a/src/RawTemplater/RawTemplaterArguments.h +++ b/src/RawTemplater/RawTemplaterArguments.h @@ -17,8 +17,6 @@ class RawTemplaterArguments static void PrintVersion(); public: - bool m_verbose; - std::vector m_input_files; std::string m_output_directory; diff --git a/src/Unlinker/UnlinkerArgs.cpp b/src/Unlinker/UnlinkerArgs.cpp index 4b6b8087..4b3d81d5 100644 --- a/src/Unlinker/UnlinkerArgs.cpp +++ b/src/Unlinker/UnlinkerArgs.cpp @@ -146,8 +146,7 @@ UnlinkerArgs::UnlinkerArgs() m_minimal_zone_def(false), m_asset_type_handling(AssetTypeHandling::EXCLUDE), m_skip_obj(false), - m_use_gdt(false), - m_verbose(false) + m_use_gdt(false) { } @@ -171,13 +170,6 @@ void UnlinkerArgs::PrintVersion() con::info("OpenAssetTools Unlinker {}", GIT_VERSION); } -void UnlinkerArgs::SetVerbose(const bool isVerbose) -{ - m_verbose = isVerbose; - ObjLoading::Configuration.Verbose = isVerbose; - ObjWriting::Configuration.Verbose = isVerbose; -} - bool UnlinkerArgs::SetImageDumpingMode() const { auto specifiedValue = m_argument_parser.GetValueForOption(OPTION_IMAGE_FORMAT); @@ -303,7 +295,10 @@ bool UnlinkerArgs::ParseArgs(const int argc, const char** argv, bool& shouldCont } // -v; --verbose - SetVerbose(m_argument_parser.IsOptionSpecified(OPTION_VERBOSE)); + if (m_argument_parser.IsOptionSpecified(OPTION_VERBOSE)) + con::globalLogLevel = con::LogLevel::DEBUG; + else + con::globalLogLevel = con::LogLevel::INFO; // -min; --minimal-zone m_minimal_zone_def = m_argument_parser.IsOptionSpecified(OPTION_MINIMAL_ZONE_FILE); diff --git a/src/Unlinker/UnlinkerArgs.h b/src/Unlinker/UnlinkerArgs.h index 0e07dd2b..459cbc60 100644 --- a/src/Unlinker/UnlinkerArgs.h +++ b/src/Unlinker/UnlinkerArgs.h @@ -24,8 +24,6 @@ private: */ void PrintUsage() const; static void PrintVersion(); - - void SetVerbose(bool isVerbose); bool SetImageDumpingMode() const; bool SetModelDumpingMode() const; @@ -60,8 +58,6 @@ public: bool m_skip_obj; bool m_use_gdt; - bool m_verbose; - UnlinkerArgs(); bool ParseArgs(int argc, const char** argv, bool& shouldContinue); diff --git a/src/ZoneCodeGeneratorLib/ZoneCodeGeneratorArguments.cpp b/src/ZoneCodeGeneratorLib/ZoneCodeGeneratorArguments.cpp index 81a8161e..9e4d51ff 100644 --- a/src/ZoneCodeGeneratorLib/ZoneCodeGeneratorArguments.cpp +++ b/src/ZoneCodeGeneratorLib/ZoneCodeGeneratorArguments.cpp @@ -122,7 +122,6 @@ ZoneCodeGeneratorArguments::ZoneCodeGeneratorArguments() : m_argument_parser(COMMAND_LINE_OPTIONS, std::extent_v), m_task_flags(0u) { - m_verbose = false; } void ZoneCodeGeneratorArguments::PrintUsage() const @@ -166,7 +165,10 @@ bool ZoneCodeGeneratorArguments::ParseArgs(const int argc, const char** argv, bo } // -v; --verbose - m_verbose = m_argument_parser.IsOptionSpecified(OPTION_VERBOSE); + if (m_argument_parser.IsOptionSpecified(OPTION_VERBOSE)) + con::globalLogLevel = con::LogLevel::DEBUG; + else + con::globalLogLevel = con::LogLevel::INFO; // -p; --print if (m_argument_parser.IsOptionSpecified(OPTION_PRINT)) diff --git a/src/ZoneCodeGeneratorLib/ZoneCodeGeneratorArguments.h b/src/ZoneCodeGeneratorLib/ZoneCodeGeneratorArguments.h index 601a7042..fa93a7f2 100644 --- a/src/ZoneCodeGeneratorLib/ZoneCodeGeneratorArguments.h +++ b/src/ZoneCodeGeneratorLib/ZoneCodeGeneratorArguments.h @@ -26,8 +26,6 @@ public: [[nodiscard]] bool ShouldGenerate() const; [[nodiscard]] bool ShouldPrint() const; - bool m_verbose; - std::vector m_header_paths; std::vector m_command_paths; std::string m_output_directory;