thirdpartymirrors/UnleashedRecomp
1
0
Fork 0
mirror of https://github.com/hedge-dev/UnleashedRecomp.git synced 2026-04-28 05:11:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove excessive const ref usage

Browse source
This commit is contained in:
DeaTh-G 2025-01-29 18:10:11 +01:00
parent 726120f661
commit f0b4c40cc4
3 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
UnleashedRecomp/ui/imgui_utils.cpp
View file

@ -381,7 +381,7 @@ std::pair<std::string, std::map<std::string, std::string>> RemoveRubyAnnotations
return { output, rubyMap }; return { output, rubyMap };
} }
std::string ReAddRubyAnnotations(const std::string& wrappedText, const std::map<std::string, std::string>& rubyMap) { std::string ReAddRubyAnnotations(const std::string_view& wrappedText, const std::map<std::string, std::string>& rubyMap) {
std::string annotatedText; std::string annotatedText;
size_t idx = 0; size_t idx = 0;
size_t length = wrappedText.length(); size_t length = wrappedText.length();
@ -392,7 +392,12 @@ std::string ReAddRubyAnnotations(const std::string& wrappedText, const std::map<
{ {
if (wrappedText.substr(idx, mainText.length()) == mainText) if (wrappedText.substr(idx, mainText.length()) == mainText)
{ {
annotatedText += "[" + mainText + ":" + rubyText + "]"; annotatedText += "[";
annotatedText += mainText;
annotatedText += ":";
annotatedText += rubyText;
annotatedText += "]";
idx += mainText.length(); idx += mainText.length();
matched = true; matched = true;
break; break;
@ -543,9 +548,9 @@ Paragraph CalculateAnnotatedParagraph(const std::vector<std::string>& lines)
std::vector<std::string> RemoveAnnotationFromParagraph(const std::vector<std::string>& lines) std::vector<std::string> RemoveAnnotationFromParagraph(const std::vector<std::string>& lines)
{ {
std::vector<std::string> result; std::vector<std::string> result;
const auto& annotatedLines = CalculateAnnotatedParagraph(lines).lines; const auto paragraph = CalculateAnnotatedParagraph(lines);
for (auto& annotatedLine : annotatedLines) for (auto& annotatedLine : paragraph.lines)
{ {
std::string annotationRemovedLine = ""; std::string annotationRemovedLine = "";
for (const auto& segment : annotatedLine) for (const auto& segment : annotatedLine)
@ -576,10 +581,10 @@ ImVec2 MeasureCentredParagraph(const ImFont* font, float fontSize, float lineMar
auto x = 0.0f; auto x = 0.0f;
auto y = 0.0f; auto y = 0.0f;
const auto& annotatedLines = CalculateAnnotatedParagraph(lines); const auto paragraph = CalculateAnnotatedParagraph(lines);
std::vector<std::string> annotationRemovedLines; std::vector<std::string> annotationRemovedLines;
for (const auto& line : annotatedLines.lines) for (const auto& line : paragraph.lines)
{ {
annotationRemovedLines.emplace_back(RemoveAnnotationFromParagraphLine(line)); annotationRemovedLines.emplace_back(RemoveAnnotationFromParagraphLine(line));
} }
@ -594,7 +599,7 @@ ImVec2 MeasureCentredParagraph(const ImFont* font, float fontSize, float lineMar
x = std::max(x, textSize.x); x = std::max(x, textSize.x);
y += textSize.y + Scale(lineMargin); y += textSize.y + Scale(lineMargin);
if (annotatedLines.annotated) if (paragraph.annotated)
{ {
y += annotationSize.y; y += annotationSize.y;
} }
@ -612,7 +617,7 @@ void DrawRubyAnnotatedText(const ImFont* font, float fontSize, float maxWidth, c
{ {
float annotationFontSize = fontSize * ANNOTATION_FONT_SIZE_MODIFIER; float annotationFontSize = fontSize * ANNOTATION_FONT_SIZE_MODIFIER;
const auto& input = RemoveRubyAnnotations(text); const auto input = RemoveRubyAnnotations(text);
auto lines = Split(input.first.c_str(), font, fontSize, maxWidth); auto lines = Split(input.first.c_str(), font, fontSize, maxWidth);
for (auto& line : lines) for (auto& line : lines)
@ -623,11 +628,11 @@ void DrawRubyAnnotatedText(const ImFont* font, float fontSize, float maxWidth, c
auto paragraphSize = MeasureCentredParagraph(font, fontSize, lineMargin, lines); auto paragraphSize = MeasureCentredParagraph(font, fontSize, lineMargin, lines);
float offsetY = 0.0f; float offsetY = 0.0f;
const auto& annotatedLines = CalculateAnnotatedParagraph(lines); const auto paragraph = CalculateAnnotatedParagraph(lines);
for (const auto& annotatedLine : annotatedLines.lines) for (const auto& annotatedLine : paragraph.lines)
{ {
const auto& annotationRemovedLine = RemoveAnnotationFromParagraphLine(annotatedLine); const auto annotationRemovedLine = RemoveAnnotationFromParagraphLine(annotatedLine);
auto textSize = font->CalcTextSizeA(fontSize, FLT_MAX, 0, annotationRemovedLine.c_str()); auto textSize = font->CalcTextSizeA(fontSize, FLT_MAX, 0, annotationRemovedLine.c_str());
auto annotationSize = font->CalcTextSizeA(annotationFontSize, FLT_MAX, 0, ""); auto annotationSize = font->CalcTextSizeA(annotationFontSize, FLT_MAX, 0, "");
@ -661,7 +666,7 @@ void DrawRubyAnnotatedText(const ImFont* font, float fontSize, float maxWidth, c
} }
offsetY += textSize.y + Scale(lineMargin); offsetY += textSize.y + Scale(lineMargin);
if (annotatedLines.annotated) if (paragraph.annotated)
{ {
offsetY += annotationSize.y; offsetY += annotationSize.y;
} }

2
UnleashedRecomp/ui/imgui_utils.h
View file

@ -62,7 +62,7 @@ void DrawTextWithShadow(const ImFont* font, float fontSize, const ImVec2& pos, I
float CalcWidestTextSize(const ImFont* font, float fontSize, std::span<std::string> strs); float CalcWidestTextSize(const ImFont* font, float fontSize, std::span<std::string> strs);
std::string Truncate(const std::string& input, size_t maxLength, bool useEllipsis = true, bool usePrefixEllipsis = false); std::string Truncate(const std::string& input, size_t maxLength, bool useEllipsis = true, bool usePrefixEllipsis = false);
std::pair<std::string, std::map<std::string, std::string>> RemoveRubyAnnotations(const char* input); std::pair<std::string, std::map<std::string, std::string>> RemoveRubyAnnotations(const char* input);
std::string ReAddRubyAnnotations(const std::string& wrappedText, const std::map<std::string, std::string>& rubyMap); std::string ReAddRubyAnnotations(const std::string_view& wrappedText, const std::map<std::string, std::string>& rubyMap);
std::vector<std::string> Split(const char* strStart, const ImFont* font, float fontSize, float maxWidth); std::vector<std::string> Split(const char* strStart, const ImFont* font, float fontSize, float maxWidth);
Paragraph CalculateAnnotatedParagraph(const std::vector<std::string>& lines); Paragraph CalculateAnnotatedParagraph(const std::vector<std::string>& lines);
std::vector<std::string> RemoveAnnotationFromParagraph(const std::vector<std::string>& lines); std::vector<std::string> RemoveAnnotationFromParagraph(const std::vector<std::string>& lines);

2
UnleashedRecomp/ui/message_window.cpp
View file

@ -273,7 +273,7 @@ void MessageWindow::Draw()
auto maxWidth = Scale(820); auto maxWidth = Scale(820);
auto fontSize = Scale(28); auto fontSize = Scale(28);
const auto& input = RemoveRubyAnnotations(g_text.c_str()); const auto input = RemoveRubyAnnotations(g_text.c_str());
auto lines = Split(input.first.c_str(), g_fntSeurat, fontSize, maxWidth); auto lines = Split(input.first.c_str(), g_fntSeurat, fontSize, maxWidth);
for (auto& line : lines) for (auto& line : lines)