18
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-22 03:15:00 +01:00

prevent collecting all switches from scenery at start of tool

This commit is contained in:
maj00r
2026-10-08 19:35:28 +02:00
parent 917c8f7285
commit 14e916e81f
2 changed files with 10 additions and 12 deletions

View File

@@ -652,8 +652,6 @@ void editor_mode::arm_switch()
if (false == tool.collected)
{
tool.templates = editor_track::standard_switch_templates();
auto const found{editor_track::find_switch_templates()};
tool.templates.insert(tool.templates.end(), found.begin(), found.end());
tool.collected = true;
}
tool.status.clear();
@@ -1029,8 +1027,6 @@ void editor_mode::render_turnout_ui()
if (false == tool.collected)
{
tool.templates = editor_track::standard_switch_templates();
auto const found{editor_track::find_switch_templates()};
tool.templates.insert(tool.templates.end(), found.begin(), found.end());
tool.collected = true;
}
if (tool.templates.empty())
@@ -1102,7 +1098,6 @@ void editor_mode::render_turnout_ui()
ImGui::SameLine();
if (ImGui::Button(STR_C("Flip the side")))
{
auto const current{editor_track::find_switch_templates()};
editor_track::switch_template own;
own.source = track;
for (int i = 0; i < 2; ++i)
@@ -5101,12 +5096,15 @@ void editor_mode::render_switch_ui()
render_switch_drive_choice();
if (false == tool.status.empty())
ImGui::TextColored(ImVec4(1.0f, 0.7f, 0.2f, 1.0f), "%s", tool.status.c_str());
if (ImGui::SmallButton(STR_C("Collect again from the scenery")))
if (ImGui::SmallButton(STR_C("Collect from the scenery")))
{
tool.collected = false;
tool.templates = editor_track::standard_switch_templates();
auto const found{editor_track::find_switch_templates()};
tool.templates.insert(tool.templates.end(), found.begin(), found.end());
tool.collected = true;
arm_switch();
}
item_tooltip("Looks for the switches of the scenery again, to use their shapes as the templates");
item_tooltip("Looks for the switches of the scenery, to use their shapes as the templates");
}
std::vector<glm::dvec3> editor_mode::detour_outline() const

View File

@@ -107,8 +107,8 @@ msgstr "Wzorzec rozjazdu"
msgid "Press on the selected straight or curve where the switch starts and drag: along sets its direction, sideways its side"
msgstr "Wciśnij na wybranej prostej lub łuku w miejscu początku rozjazdu i przeciągnij: wzdłuż ustala kierunek, w bok stronę"
msgid "Collect again from the scenery"
msgstr "Zbierz ponownie ze scenerii"
msgid "Collect from the scenery"
msgstr "Zbierz ze scenerii"
msgid "Select a path in the view, then build the route along the line, or set its start and end paths (switches are passed through)"
msgstr "Wybierz odcinek w widoku, potem zbuduj trasę wzdłuż linii albo wskaż jej odcinek początkowy i końcowy (rozjazdy są przechodzone)"
@@ -305,8 +305,8 @@ msgstr "Długości i przechyłka zalecane dla prędkości i promienia; wyłączo
msgid "Takes the textures and the other parameters from the selected track.\nA track started or finished at a free end always takes them from the track it joins"
msgstr "Bierze tekstury i pozostałe parametry z wybranego toru.\nTor zaczęty lub zakończony na wolnym końcu zawsze bierze je z toru, do którego dochodzi"
msgid "Looks for the switches of the scenery again, to use their shapes as the templates"
msgstr "Ponownie szuka rozjazdów w scenerii, aby użyć ich kształtów jako wzorców"
msgid "Looks for the switches of the scenery, to use their shapes as the templates"
msgstr "Szuka rozjazdów w scenerii, aby użyć ich kształtów jako wzorców"
msgid "start of the new track, on the ground or at a free end"
msgstr "początek nowego toru, na terenie lub na wolnym końcu"