mirror of
https://github.com/WerWolv/ImHex.git
synced 2026-03-30 13:05:25 -05:00
impr: Remove hex::format, improve format and logging type safety
This commit is contained in:
@@ -346,16 +346,16 @@ namespace hex::plugin::visualizers {
|
||||
bool validateVector(const std::vector<float> &vector, u32 vertexCount, u32 divisor, const std::string &name, std::string &errorMessage) {
|
||||
if (!vector.empty()) {
|
||||
if (vector.size() % divisor != 0) {
|
||||
errorMessage = hex::format("hex.visualizers.pl_visualizer.3d.error_message_count"_lang, name , std::to_string(divisor));
|
||||
errorMessage = fmt::format("hex.visualizers.pl_visualizer.3d.error_message_count"_lang, name , std::to_string(divisor));
|
||||
return false;
|
||||
}
|
||||
} else {
|
||||
errorMessage = hex::format("hex.visualizers.pl_visualizer.3d.error_message_not_empty"_lang, name);
|
||||
errorMessage = fmt::format("hex.visualizers.pl_visualizer.3d.error_message_not_empty"_lang, name);
|
||||
return false;
|
||||
}
|
||||
auto vectorCount = vector.size()/divisor;
|
||||
if (vectorCount != vertexCount) {
|
||||
errorMessage = hex::format("hex.visualizers.pl_visualizer.3d.error_message_expected"_lang, std::to_string(vertexCount), std::to_string(vectorCount));
|
||||
errorMessage = fmt::format("hex.visualizers.pl_visualizer.3d.error_message_expected"_lang, std::to_string(vertexCount), std::to_string(vectorCount));
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
@@ -502,7 +502,7 @@ namespace hex::plugin::visualizers {
|
||||
drawList->AddText(
|
||||
screenPos + scaled({ 5, 5 }),
|
||||
ImGui::GetColorU32(ImGuiCol_Text),
|
||||
hex::format("X: {:.5}\nY: {:.5}", mousePos.x, mousePos.y).c_str());
|
||||
fmt::format("X: {:.5}\nY: {:.5}", mousePos.x, mousePos.y).c_str());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -669,7 +669,7 @@ namespace hex::plugin::visualizers {
|
||||
errorMessage += std::to_string(badIndex) + ", ";
|
||||
errorMessage.pop_back();
|
||||
errorMessage.pop_back();
|
||||
errorMessage += hex::format("hex.visualizers.pl_visualizer.3d.error_message_for_vertex_count"_lang.get(), s_vertexCount);
|
||||
errorMessage += fmt::format("hex.visualizers.pl_visualizer.3d.error_message_for_vertex_count"_lang, s_vertexCount);
|
||||
throw std::runtime_error(errorMessage);
|
||||
}
|
||||
}
|
||||
@@ -706,7 +706,7 @@ namespace hex::plugin::visualizers {
|
||||
errorMessage += std::to_string(badIndex) + ", ";
|
||||
errorMessage.pop_back();
|
||||
errorMessage.pop_back();
|
||||
errorMessage += hex::format("hex.visualizers.pl_visualizer.3d.error_message_for_vertex_count"_lang.get(), s_vertexCount);
|
||||
errorMessage += fmt::format("hex.visualizers.pl_visualizer.3d.error_message_for_vertex_count"_lang, s_vertexCount);
|
||||
throw std::runtime_error(errorMessage);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user