eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-23 14:29:18 +02:00
Code Issues 123 Wiki Activity

map zoom tweaks

Browse Source
This commit is contained in:
milek7
2019-10-06 14:41:37 +02:00
parent 582c079d97
commit 0fe0894d59
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
widgets/map.cpp
View File

@@ -222,12 +222,15 @@ void ui::map_panel::render_contents()
ImVec2 surface_size_im = ImGui::GetContentRegionAvail(); ImVec2 surface_size_im = ImGui::GetContentRegionAvail();
glm::vec2 surface_size(surface_size_im.x, surface_size_im.y); glm::vec2 surface_size(surface_size_im.x, surface_size_im.y);
glm::mat4 aspect_transform;
float aspect = surface_size.y / surface_size.x; float aspect = surface_size.y / surface_size.x;
if (aspect > 1.0f / aspect) if (aspect > 1.0f / aspect)
transform = glm::scale(transform, glm::vec3(aspect, 1.0f, 1.0f)); aspect_transform = glm::scale(glm::mat4(), glm::vec3(aspect, 1.0f, 1.0f));
else else
transform = glm::scale(transform, glm::vec3(1.0f, 1.0f, 1.0f / aspect)); aspect_transform = glm::scale(glm::mat4(), glm::vec3(1.0f, 1.0f, 1.0f / aspect));
transform *= aspect_transform;
if (mode == MODE_VEHICLE && simulation::Train) if (mode == MODE_VEHICLE && simulation::Train)
{ {
@@ -276,7 +279,8 @@ void ui::map_panel::render_contents()
zoom *= std::pow(2.0, io.MouseWheel); zoom *= std::pow(2.0, io.MouseWheel);
float x = zoom / prev_zoom; float x = zoom / prev_zoom;
translate += ndc_pos; glm::vec4 corrected = glm::inverse(aspect_transform) * glm::vec4(ndc_pos.x, 0.0f, ndc_pos.y, 1.0f);
translate += glm::vec2(corrected.x, corrected.z);
translate *= x; translate *= x;
glm::vec2 surface_screen_center = glm::vec2(screen_origin.x, screen_origin.y) + surface_size / 2.0f; glm::vec2 surface_screen_center = glm::vec2(screen_origin.x, screen_origin.y) + surface_size / 2.0f;