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

map window improvements

Browse Source
This commit is contained in:
milek7
2019-10-05 15:14:13 +02:00
parent fece956ffd
commit bb1c0d6895
2 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
widgets/map.cpp
View File

@@ -7,6 +7,7 @@
#include "simulation.h" #include "simulation.h"
#include "Driver.h" #include "Driver.h"
#include "AnimModel.h" #include "AnimModel.h"
#include "application.h"
ui::map_panel::map_panel() : ui_panel(STR_C("Map"), false) ui::map_panel::map_panel() : ui_panel(STR_C("Map"), false)
{ {
@@ -194,24 +195,24 @@ void ui::map_panel::render_contents()
if (!init_done) if (!init_done)
return; return;
float prev_zoom = zoom; {
float prev_zoom = zoom;
if (ImGui::Button("-")) if (ImGui::Button("+"))
zoom /= 2; zoom *= 2.0f;
ImGui::SameLine(); ImGui::SameLine();
if (ImGui::Button("+")) if (ImGui::Button("-"))
zoom *= 2; zoom /= 2.0f;
ImGui::SameLine(); ImGui::SameLine();
float x = zoom / prev_zoom; float x = zoom / prev_zoom;
translate *= x; translate *= x;
}
glm::mat4 transform; glm::mat4 transform;
transform[0][0] = -1.0f; transform[0][0] = -1.0f;
static enum { MODE_MANUAL = 0, MODE_CAMERA, MODE_VEHICLE } mode = MODE_MANUAL;
ImGui::RadioButton("Pan", (int *)&mode, 0); ImGui::RadioButton("Pan", (int *)&mode, 0);
ImGui::SameLine(); ImGui::SameLine();
ImGui::RadioButton("Follow camera", (int *)&mode, 1); ImGui::RadioButton("Follow camera", (int *)&mode, 1);
@@ -264,22 +265,35 @@ void ui::map_panel::render_contents()
if (ImGui::IsItemHovered()) if (ImGui::IsItemHovered())
{ {
const ImVec2 screen_pos = ImGui::GetMousePos();
const glm::vec2 surface_pos(screen_pos.x - screen_origin.x, screen_pos.y - screen_origin.y);
const glm::vec2 ndc_pos = surface_pos / surface_size * 2.0f - 1.0f;
const ImGuiIO &io = ImGui::GetIO();
if (io.MouseWheel != 0.0f)
{
float prev_zoom = zoom;
zoom *= std::pow(2.0, io.MouseWheel);
float x = zoom / prev_zoom;
translate += ndc_pos;
translate *= x;
glm::vec2 surface_screen_center = glm::vec2(screen_origin.x, screen_origin.y) + surface_size / 2.0f;
Application.set_cursor_pos(surface_screen_center.x, surface_screen_center.y);
}
if (mode == 0 && ImGui::IsMouseDragging(0)) if (mode == 0 && ImGui::IsMouseDragging(0))
{ {
ImVec2 delta_im = ImGui::GetMouseDragDelta(); ImVec2 delta_im = ImGui::GetMouseDragDelta();
ImGui::ResetMouseDragDelta(); ImGui::ResetMouseDragDelta();
glm::vec2 delta(delta_im.x, delta_im.y); glm::vec2 delta(delta_im.x, delta_im.y);
delta.x /= surface_size.x;
delta.y /= surface_size.y;
translate -= delta * 2.0f; translate -= delta / surface_size * 2.0f;
} }
else else
{ {
ImVec2 screen_pos = ImGui::GetMousePos();
glm::vec2 surface_pos(screen_pos.x - screen_origin.x, screen_pos.y - screen_origin.y);
glm::vec2 ndc_pos = surface_pos / surface_size * 2.0f - 1.0f;
glm::vec3 world_pos = glm::inverse(transform) * glm::vec4(ndc_pos.x, 0.0f, -ndc_pos.y, 1.0f); glm::vec3 world_pos = glm::inverse(transform) * glm::vec4(ndc_pos.x, 0.0f, -ndc_pos.y, 1.0f);
map::sorted_object_list objects = map::Objects.find_in_range(glm::vec3(world_pos.x, NAN, world_pos.z), 0.03f / zoom); map::sorted_object_list objects = map::Objects.find_in_range(glm::vec3(world_pos.x, NAN, world_pos.z), 0.03f / zoom);

2
widgets/map.h
View File

@@ -97,6 +97,8 @@ class map_panel : public ui_panel
glm::vec2 translate; glm::vec2 translate;
float zoom = 1.0f / 1000.0f; float zoom = 1.0f / 1000.0f;
enum { MODE_MANUAL = 0, MODE_CAMERA, MODE_VEHICLE } mode = MODE_MANUAL;
float get_vehicle_rotation(); float get_vehicle_rotation();
void render_map_texture(glm::mat4 transform, glm::vec2 surface_size); void render_map_texture(glm::mat4 transform, glm::vec2 surface_size);
void render_labels(glm::mat4 transform, ImVec2 origin, glm::vec2 surface_size); void render_labels(glm::mat4 transform, ImVec2 origin, glm::vec2 surface_size);