eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 20:59:19 +02:00
Code Issues 123 Wiki Activity

reformat: use auto on certain types

Browse Source
This commit is contained in:
jerrrrycho
2026-07-04 05:22:52 +02:00
parent f61068ff89
commit 20e7a99516
118 changed files with 2118 additions and 2063 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
launcher/deferred_image.h
View File

@@ -36,7 +36,7 @@ public:
glm::ivec2 size() const
{
if (image != null_handle) {
auto &tex = GfxRenderer->Texture(image);
const auto &tex = GfxRenderer->Texture(image);
return glm::ivec2(tex.get_width(), tex.get_height());
}
return glm::ivec2();

6
launcher/keymapper.cpp
View File

@@ -13,7 +13,7 @@ bool ui::keymapper_panel::key(int key)
if (!is_open || bind_active == user_command::none)
return false;
auto it = keyboard.keytonamemap.find(key);
const auto it = keyboard.keytonamemap.find(key);
if (it == keyboard.keytonamemap.end())
return false;
@@ -26,7 +26,7 @@ bool ui::keymapper_panel::key(int key)
key = 0;
// Replace the binding with a new key.
auto it2 = keyboard.bindings().find(bind_active);
const auto it2 = keyboard.bindings().find(bind_active);
if (it2 != keyboard.bindings().end()) {
it2->second = std::tuple<int, std::string>(key, std::get<std::string>(it2->second));
}
@@ -57,7 +57,7 @@ void ui::keymapper_panel::render_contents()
ImGui::Text((description.size() > 0 ? description : "(No description)").c_str());
// Binding key button
int keycode = std::get<int>(binding.second);
const int keycode = std::get<int>(binding.second);
std::string label;
if (keycode & keyboard_input::keymodifier::control)

2
launcher/launcheruilayer.cpp
View File

@@ -34,7 +34,7 @@ void launcher_ui::on_window_resize(int w, int h)
void launcher_ui::render_()
{
ImGuiWindowFlags flags = ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoMove;
const ImGuiWindowFlags flags = ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoMove;
const float topbar_height = 50 * Global.ui_scale;
const auto topbar_button_size = ImVec2(150 * Global.ui_scale, topbar_height - 16);
ImGui::SetNextWindowPos(ImVec2(0, 0));

26
launcher/scenery_list.cpp
View File

@@ -19,7 +19,7 @@ bool ui::scenerylist_panel::on_key(int key, int action)
if (!is_open)
return false;
auto it = keyboard.keytonamemap.find(key);
const auto it = keyboard.keytonamemap.find(key);
if (it == keyboard.keytonamemap.end())
return false;
@@ -50,7 +50,7 @@ void ui::scenerylist_panel::draw_scenery_list()
{
collapse_open = ImGui::CollapsingHeader(category.first.c_str());
if (collapse_open) {
for (auto desc : category.second)
for (const auto desc : category.second)
{
std::string name = desc->path.stem().string();
@@ -82,7 +82,7 @@ void ui::scenerylist_panel::draw_scenery_info()
void ui::scenerylist_panel::open_link(const std::string &link)
{
std::string file = ToLower(link);
const std::string file = ToLower(link);
#ifdef _WIN32
system(("start \"eu07_link\" \"" + file + "\"").c_str());
#elif __linux__
@@ -95,7 +95,7 @@ void ui::scenerylist_panel::open_link(const std::string &link)
void ui::scenerylist_panel::draw_scenery_image()
{
if (!selected_scenery->image_path.empty()) {
auto desc = const_cast<scenery_desc*>(selected_scenery);
const auto desc = const_cast<scenery_desc*>(selected_scenery);
desc->image = GfxRenderer->Fetch_Texture(selected_scenery->image_path, true);
desc->image_path.clear();
}
@@ -105,8 +105,8 @@ void ui::scenerylist_panel::draw_scenery_image()
tex.create();
if (tex.get_is_ready()) {
float avail_width = ImGui::GetContentRegionAvailWidth();
float height = avail_width / tex.get_width() * tex.get_height();
const float avail_width = ImGui::GetContentRegionAvailWidth();
const float height = avail_width / tex.get_width() * tex.get_height();
ImGui::Image(reinterpret_cast<void *>(tex.get_id()), ImVec2(avail_width, height), ImVec2(0, 1), ImVec2(1, 0));
}
@@ -238,8 +238,8 @@ void ui::scenerylist_panel::draw_summary_tooltip(const dynamic_desc &dyn_desc)
{
if (dyn_desc.vehicle && dyn_desc.skin)
{
std::string name = (dyn_desc.vehicle->path.parent_path() / dyn_desc.vehicle->path.stem()).string();
std::string skin = dyn_desc.skin->skin;
const std::string name = (dyn_desc.vehicle->path.parent_path() / dyn_desc.vehicle->path.stem()).string();
const std::string skin = dyn_desc.skin->skin;
ImGui::Text(STR_C("ID: %s"), dyn_desc.name.c_str());
ImGui::NewLine();
@@ -338,7 +338,7 @@ void ui::scenerylist_panel::draw_droptarget(trainset_desc &trainset, int positio
if (ImGui::BeginDragDropTarget()) {
const ImGuiPayload *payload = ImGui::AcceptDragDropPayload("vehicle_pure");
if (payload) {
skin_set *ptr = *reinterpret_cast<skin_set **>(payload->Data);
const skin_set *ptr = *reinterpret_cast<skin_set **>(payload->Data);
std::shared_ptr<skin_set> skin;
for (auto &s : ptr->vehicle.lock()->matching_skinsets)
if (s.get() == ptr)
@@ -354,7 +354,7 @@ void ui::scenerylist_panel::draw_droptarget(trainset_desc &trainset, int positio
payload = ImGui::AcceptDragDropPayload("vehicle_set");
if (payload) {
auto moved = reinterpret_cast<vehicle_moved*>(payload->Data);
const auto moved = reinterpret_cast<vehicle_moved*>(payload->Data);
dynamic_desc desc_copy = moved->dynamic;
int offset = 0;
@@ -399,14 +399,14 @@ void ui::dynamic_edit_popup::render_content()
if (dynamic.vehicle && dynamic.skin)
{
std::string name = (dynamic.vehicle->path.parent_path() / dynamic.vehicle->path.stem()).string();
const std::string name = (dynamic.vehicle->path.parent_path() / dynamic.vehicle->path.stem()).string();
ImGui::Text(STR_C("Type: %s"), name.c_str());
if (ImGui::BeginCombo(STR_C("Skin"), dynamic.skin->skin.c_str(), ImGuiComboFlags_HeightLargest))
{
for (auto const &skin : dynamic.vehicle->matching_skinsets) {
bool is_selected = skin == dynamic.skin;
const bool is_selected = skin == dynamic.skin;
if (ImGui::Selectable(skin->skin.c_str(), is_selected))
dynamic.skin = skin;
if (is_selected)
@@ -419,7 +419,7 @@ void ui::dynamic_edit_popup::render_content()
if (ImGui::BeginCombo(STR_C("Occupancy"), Translations.lookup_c(dynamic.drivertype.c_str())))
{
for (auto const &str : occupancy_names) {
bool is_selected = str == dynamic.drivertype;
const bool is_selected = str == dynamic.drivertype;
if (ImGui::Selectable(Translations.lookup_c(str.c_str()), is_selected))
dynamic.drivertype = str;
if (is_selected)

2
launcher/scenery_scanner.cpp
View File

@@ -111,7 +111,7 @@ void scenery_scanner::parse_trainset(cParser &parser)
parser.getTokens(7, false);
parser >> datafolder >> skinfile >> mmdfile >> dyn.offset >> dyn.drivertype >> params >> dyn.loadcount;
size_t params_pos = params.find('.');
const size_t params_pos = params.find('.');
if (params_pos != -1 && params_pos < params.size()) {
dyn.params = params.substr(params_pos + 1, -1);
params.erase(params_pos);

8
launcher/textures_scanner.cpp
View File

@@ -30,7 +30,7 @@ void ui::vehicles_bank::parse_entry(const std::string &line)
std::string content;
std::shared_ptr<skin_meta> meta;
size_t pos = line.find("//");
const size_t pos = line.find("//");
if (pos != -1)
meta = parse_meta(line.substr(pos));
content = line.substr(0, pos);
@@ -86,7 +86,7 @@ void ui::vehicles_bank::parse_category_entry(const std::string &param)
if (tok.size() < 1)
return;
auto it = type_map.find(tok[0]);
const auto it = type_map.find(tok[0]);
if (it != type_map.end())
ctx_type = it->second;
else if (tok[0] >= 'A' && tok[0] <= 'Z')
@@ -191,7 +191,7 @@ std::shared_ptr<ui::skin_meta> ui::vehicles_bank::parse_meta(const std::string &
void ui::vehicles_bank::parse_coupling_rule(const std::string &target, const std::string &param)
{
auto target_vehicle = get_vehicle(target);
const auto target_vehicle = get_vehicle(target);
if (param == "?")
return;
@@ -249,7 +249,7 @@ std::shared_ptr<ui::vehicle_desc> ui::vehicles_bank::get_vehicle(const std::stri
auto path = ctx_path / ToLower(name);
path = std::filesystem::path(path.generic_string());
auto it = vehicles.find(path);
const auto it = vehicles.find(path);
if (it != vehicles.end()) {
return it->second;
}

16
launcher/vehicle_picker.cpp
View File

@@ -17,7 +17,7 @@ void ui::vehiclepicker_panel::render_contents()
if (ImGui::BeginChild("box1")) {
for (auto const &e : type_names) {
deferred_image *image = nullptr;
const deferred_image *image = nullptr;
auto it = bank.category_icons.find(e.first);
if (it != bank.category_icons.end())
image = &it->second;
@@ -47,15 +47,15 @@ void ui::vehiclepicker_panel::render_contents()
bool model_added = false;
bool can_break = false;
bool map_sel_eq = selected_group && group == *selected_group;
const bool map_sel_eq = selected_group && group == *selected_group;
for (auto const &vehicle : kv.second) {
if (vehicle->type != selected_type)
continue;
for (auto const &skinset : vehicle->matching_skinsets) {
bool map_group_eq = skinset->group == group;
bool sel_group_eq = selected_group && skinset->group == *selected_group;
const bool map_group_eq = skinset->group == group;
const bool sel_group_eq = selected_group && skinset->group == *selected_group;
if (!model_added && map_group_eq) {
model_list.push_back(&group);
@@ -81,9 +81,9 @@ void ui::vehiclepicker_panel::render_contents()
ImGuiListClipper clipper(model_list.size());
while (clipper.Step())
for (int i = clipper.DisplayStart; i < clipper.DisplayEnd; i++) {
auto group = model_list[i];
const auto group = model_list[i];
deferred_image *image = nullptr;
const deferred_image *image = nullptr;
auto it = bank.group_icons.find(*group);
if (it != bank.group_icons.end())
image = &it->second;
@@ -144,14 +144,14 @@ void ui::vehiclepicker_panel::render_contents()
ImGuiListClipper clipper(skinset_list.size());
while (clipper.Step())
for (int i = clipper.DisplayStart; i < clipper.DisplayEnd; i++) {
auto skin = skinset_list[i];
const auto skin = skinset_list[i];
//std::string label = skin->skins[0].stem().string();
std::string label = skin->skin;
if (skin->meta && !skin->meta->name.empty() && skin->meta->name != "?")
label = skin->meta->name;
auto mini = skin->mini ? &skin->mini : &placeholder_mini;
const auto mini = skin->mini ? &skin->mini : &placeholder_mini;
if (selectable_image(label.c_str(), skin == selected_skinset, mini, skin))
selected_skinset = skin;