zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-02-10 17:43:03 +00:00
Code Activity

chore: update all logging to use centralized logging component

Browse Source
This commit is contained in:
Jan Laupetin
2025-09-10 19:52:42 +02:00
parent 1bf4033f41
commit 02f20f09b6
161 changed files with 824 additions and 664 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ObjLoading/StateMap/StateMapHandler.cpp
View File

@@ -1,5 +1,7 @@
#include "StateMapHandler.h"
#include "Utils/Logging/Log.h"
#include <algorithm>
#include <cassert>
#include <iostream>
@@ -76,7 +78,7 @@ StateMapVars StateMapHandler::BuildVars(const uint32_t* baseStateBits) const
if (matchingValue != var.m_values.end())
result.AddValue(var.m_name, matchingValue->m_name);
else
std::cerr << "Could not find base value for state map var \"" << var.m_name << "\"\n";
con::error("Could not find base value for state map var \"{}\"", var.m_name);
}
return result;

9
src/ObjLoading/StateMap/StateMapReader.cpp
View File

@@ -4,6 +4,7 @@
#include "Parsing/Impl/ParserSingleInputStream.h"
#include "Parsing/Matcher/StateMapExpressionMatchers.h"
#include "Parsing/StateMapParser.h"
#include "Utils/Logging/Log.h"
#include <iostream>
@@ -22,13 +23,13 @@ bool StateMapReader::IsValidEndState(const StateMapParserState* state) const
{
if (state->m_current_rule)
{
std::cerr << "In \"" << m_file_name << "\": Unclosed rule at end of file!\n";
con::error("In \"{}\": Unclosed rule at end of file!", m_file_name);
return false;
}
if (state->m_in_entry)
{
std::cerr << "In \"" << m_file_name << "\": Unclosed entry at end of file!\n";
con::error("In \"{}\": Unclosed entry at end of file!", m_file_name);
return false;
}
@@ -36,7 +37,7 @@ bool StateMapReader::IsValidEndState(const StateMapParserState* state) const
{
if (state->m_definition->m_state_map_entries[i].m_rules.empty())
{
std::cerr << "In \"" << m_file_name << "\": State map must define a rule for \"" << state->m_layout.m_entry_layout.m_entries[i].m_name << "\"!\n";
con::error("In \"{}\": State map must define a rule for \"{}\"!", m_file_name, state->m_layout.m_entry_layout.m_entries[i].m_name);
return false;
}
}
@@ -59,7 +60,7 @@ std::unique_ptr<StateMapDefinition> StateMapReader::ReadStateMapDefinition() con
const auto success = parser->Parse();
if (!success)
{
std::cout << "Parsing state map file \"" << m_file_name << "\" failed!\n";
con::error("Parsing state map file \"{}\" failed!", m_file_name);
return {};
}