mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-11-22 10:19:52 +01:00
feat(editor): ~ shows or hides the orthophoto, Ctrl+~ downloads what the camera sees first; the speed of the camera in the View menu (#312)
* feat(editor): ~ shows or hides the orthophoto, Ctrl+~ downloads what the camera sees first; the speed of the camera in the View menu ~ (the key left of 1) turns the orthophoto on and off. Ctrl+~ finds what of the ground the camera sees (rays through a grid over the screen down to the level of the ground under the camera, or as far as 2.5 km where they don't come down to it) and puts those tiles at the front of the queue of the downloads, the ones which failed tried again at once; the status line tells how many. Tab is not used, the laying and the switches have it. View > Camera speed: the speed of the free camera of the editor (x0.05 to x10, 1 as it was), how many times faster Ctrl makes it (1 to 30, 30 as it was), and in the top view as fast as the view is zoomed, so the map crosses the screen at the same pace zoomed in or out. Kept in the settings of the editor; the camera of the cab and of the free fly outside the editor unchanged. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01DDcMn1Q7wdYkbxDUWscNHZ * fix(editor): Ctrl+~ in the top view, over a scenery with no terrain under the camera and with the orthophoto off; "As it was" without the speed going with the zoom In the top view the box is the view itself, its corners on the ground. The ground under the camera is the terrain, else the scenery, else the rays go as far as the reach. The tile of the camera is taken anew by hurry(), it isn't followed while the layer is off. The top view is as fast zoomed in as out by default, as before. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01DDcMn1Q7wdYkbxDUWscNHZ * fix(editor): the corners of the top view on the ground put where the camera is (the view matrix is camera-relative) Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01DDcMn1Q7wdYkbxDUWscNHZ * i18n(editor): Polish for the orthophoto keys and the camera speed, on top of the master's own translations Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01DDcMn1Q7wdYkbxDUWscNHZ * fix(editor): Ctrl+~ asks only for the tiles update() would ask for; the tooltip of "Track colours" back in its place After the reviews of #312: - hurry() skips the tiles outside the download area set and marks the ones outside the area the service covers as empty, as update() does, so Ctrl+~ no longer queues downloads update() drops at once (and the workers took anyway, into the disk cache, against the area set), nor requests the service can't answer. - A blank tile hurried takes the standard image first, as in update(); first_level() and outside_area() are shared by both loops, and the body of the loop of hurry() is hurry_tile(). - orthophoto_hurry() takes the level of the terrain only when it's below the camera, as the branch of the scenery already did: a camera under the terrain (a tunnel, under the heightmap) no longer flips the box of the view behind it. - The "Camera speed" menu goes after the tooltip of "Track colours", which it had taken. - #include <set> once in editorOrthophoto.hpp. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01QRgQ1K1Qu7TCsa74zsNURd --------- Co-authored-by: Claude <noreply@anthropic.com>
This commit is contained in:
@@ -14,6 +14,7 @@ http://mozilla.org/MPL/2.0/.
|
|||||||
#include <iterator>
|
#include <iterator>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <regex>
|
#include <regex>
|
||||||
|
#include <optional>
|
||||||
#include "application/editormode.h"
|
#include "application/editormode.h"
|
||||||
#include "application/editormodeshared.h"
|
#include "application/editormodeshared.h"
|
||||||
#include "application/editorgestures.h"
|
#include "application/editorgestures.h"
|
||||||
@@ -4258,6 +4259,11 @@ void editor_mode::render_view_menu()
|
|||||||
}
|
}
|
||||||
if (ImGui::IsItemHovered())
|
if (ImGui::IsItemHovered())
|
||||||
ImGui::SetTooltip("%s", STR_C("The tracks of the track mode coloured by their radius, speed or grade, with the legend in the corner"));
|
ImGui::SetTooltip("%s", STR_C("The tracks of the track mode coloured by their radius, speed or grade, with the legend in the corner"));
|
||||||
|
if (ImGui::BeginMenu(STR_C("Camera speed")))
|
||||||
|
{
|
||||||
|
render_camera_settings();
|
||||||
|
ImGui::EndMenu();
|
||||||
|
}
|
||||||
ImGui::MenuItem(STR_C("Track labels in the top view"), nullptr, &m_track_labels);
|
ImGui::MenuItem(STR_C("Track labels in the top view"), nullptr, &m_track_labels);
|
||||||
if (ImGui::IsItemHovered())
|
if (ImGui::IsItemHovered())
|
||||||
ImGui::SetTooltip("%s", STR_C("Zoomed in from above, the curves get their radius and length and the switches their name and type, as on a plan; where they'd crowd, some are left out"));
|
ImGui::SetTooltip("%s", STR_C("Zoomed in from above, the curves get their radius and length and the switches their name and type, as on a plan; where they'd crowd, some are left out"));
|
||||||
@@ -6989,6 +6995,8 @@ void editor_mode::enter()
|
|||||||
simulation::Blackbox.close();
|
simulation::Blackbox.close();
|
||||||
// the cursor drawn into the picture is the editor's: back on when it comes back, if it was chosen
|
// the cursor drawn into the picture is the editor's: back on when it comes back, if it was chosen
|
||||||
ui_layer::draw_cursor(m_draw_cursor);
|
ui_layer::draw_cursor(m_draw_cursor);
|
||||||
|
apply_camera_settings();
|
||||||
|
Global.EditorCameraOn = true;
|
||||||
|
|
||||||
if (simulation::Region != nullptr)
|
if (simulation::Region != nullptr)
|
||||||
{
|
{
|
||||||
@@ -7090,6 +7098,7 @@ void editor_mode::exit()
|
|||||||
track_sleepers::lay_in_background(true);
|
track_sleepers::lay_in_background(true);
|
||||||
// the driver's view has no menu to switch the drawn cursor off: the system one there
|
// the driver's view has no menu to switch the drawn cursor off: the system one there
|
||||||
ui_layer::draw_cursor(false);
|
ui_layer::draw_cursor(false);
|
||||||
|
Global.EditorCameraOn = false;
|
||||||
Global.editor_tracks = false;
|
Global.editor_tracks = false;
|
||||||
EditorModeFlag = false;
|
EditorModeFlag = false;
|
||||||
Global.ControlPicking = m_statebackup.picking;
|
Global.ControlPicking = m_statebackup.picking;
|
||||||
@@ -7489,6 +7498,22 @@ void editor_mode::on_key(int const Key, int const Scancode, int const Action, in
|
|||||||
lay_switch_mode();
|
lay_switch_mode();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case GLFW_KEY_GRAVE_ACCENT:
|
||||||
|
// ~ (left of 1): the orthophoto shown or hidden; with Ctrl what the camera sees downloaded before anything else
|
||||||
|
if (false == is_press(Action) || ImGui::GetIO().WantTextInput)
|
||||||
|
break;
|
||||||
|
if (Mods & GLFW_MOD_CONTROL)
|
||||||
|
{
|
||||||
|
orthophoto_hurry();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (false == anyModifier)
|
||||||
|
{
|
||||||
|
m_orthophoto.enabled(false == m_orthophoto.enabled());
|
||||||
|
ui()->set_status(m_orthophoto.enabled() ? STR("Orthophoto on (~)") : STR("Orthophoto off (~)"));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
case GLFW_KEY_BACKSPACE:
|
case GLFW_KEY_BACKSPACE:
|
||||||
// the switch being clicked off the view: the last point taken back
|
// the switch being clicked off the view: the last point taken back
|
||||||
if (m_switch_designer.open && m_switch_designer.picking)
|
if (m_switch_designer.open && m_switch_designer.picking)
|
||||||
@@ -8094,3 +8119,113 @@ void editor_mode::render_top_tracks_choice(bool const Combo)
|
|||||||
if (ImGui::IsItemHovered())
|
if (ImGui::IsItemHovered())
|
||||||
ImGui::SetTooltip("%s", STR_C("The colour of the rails, to stand out on the imagery and the map"));
|
ImGui::SetTooltip("%s", STR_C("The colour of the rails, to stand out on the imagery and the map"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void editor_mode::apply_camera_settings()
|
||||||
|
{
|
||||||
|
auto const &camera{EditorSettings.camera()};
|
||||||
|
Global.EditorCameraSpeed = camera.speed;
|
||||||
|
Global.EditorCameraFast = camera.fast;
|
||||||
|
Global.EditorCameraZoomed = camera.zoomed;
|
||||||
|
}
|
||||||
|
|
||||||
|
void editor_mode::render_camera_settings()
|
||||||
|
{
|
||||||
|
auto &camera{EditorSettings.camera()};
|
||||||
|
auto changed{false};
|
||||||
|
auto release{false};
|
||||||
|
ImGui::PushItemWidth(180.0f * Global.ui_scale);
|
||||||
|
auto speed{static_cast<float>(camera.speed)};
|
||||||
|
if (ImGui::SliderFloat(STR_C("Speed of the camera"), &speed, 0.05f, 10.0f, "x %.2f", ImGuiSliderFlags_Logarithmic))
|
||||||
|
{
|
||||||
|
camera.speed = speed;
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
release |= ImGui::IsItemDeactivatedAfterEdit();
|
||||||
|
if (ImGui::IsItemHovered())
|
||||||
|
ImGui::SetTooltip("%s", STR_C("How fast the arrows or WSAD move the camera, Shift a bit faster; 1 as it was"));
|
||||||
|
auto fast{static_cast<float>(camera.fast)};
|
||||||
|
if (ImGui::SliderFloat(STR_C("Ctrl speeds it up"), &fast, 1.0f, 30.0f, "x %.1f", ImGuiSliderFlags_Logarithmic))
|
||||||
|
{
|
||||||
|
camera.fast = fast;
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
release |= ImGui::IsItemDeactivatedAfterEdit();
|
||||||
|
if (ImGui::IsItemHovered())
|
||||||
|
ImGui::SetTooltip("%s", STR_C("How many times faster the camera goes with Ctrl held, Ctrl+Shift too; 30 as it was"));
|
||||||
|
ImGui::PopItemWidth();
|
||||||
|
if (ImGui::Checkbox(STR_C("In the top view as fast as the view is zoomed"), &camera.zoomed))
|
||||||
|
changed = release = true;
|
||||||
|
if (ImGui::IsItemHovered())
|
||||||
|
ImGui::SetTooltip("%s", STR_C("Zoomed in the map moves slowly, zoomed out fast: across the screen at the same pace whatever the zoom"));
|
||||||
|
ImGui::Separator();
|
||||||
|
if (ImGui::MenuItem(STR_C("As it was")))
|
||||||
|
{
|
||||||
|
camera = {};
|
||||||
|
changed = release = true;
|
||||||
|
}
|
||||||
|
if (changed)
|
||||||
|
apply_camera_settings();
|
||||||
|
if (release)
|
||||||
|
EditorSettings.save();
|
||||||
|
}
|
||||||
|
|
||||||
|
void editor_mode::orthophoto_hurry()
|
||||||
|
{
|
||||||
|
if (false == m_orthophoto.enabled())
|
||||||
|
m_orthophoto.enabled(true);
|
||||||
|
// what the camera sees of the ground: rays through a grid over the screen to the level of the ground under the camera, or as far
|
||||||
|
// as the reach of the orthophoto along it where they don't come down to it (the sky)
|
||||||
|
ImGuiIO const &io = ImGui::GetIO();
|
||||||
|
if (io.DisplaySize.x <= 0.0f || io.DisplaySize.y <= 0.0f)
|
||||||
|
return;
|
||||||
|
auto const inverse = glm::inverse(editor_mode::projection_matrix(io.DisplaySize.x / io.DisplaySize.y) * GfxRenderer->Camera_View_Matrix());
|
||||||
|
auto const camera{GfxRenderer->Camera_Position()};
|
||||||
|
// the level of the ground under the camera: the terrain, else the scenery; with neither the rays go as far as the reach
|
||||||
|
std::optional<double> level;
|
||||||
|
// only a level below the camera: one above it (in a tunnel, or flown under the terrain) would put the hits behind it
|
||||||
|
if (double ground{0.0}; m_streamer.active() && m_streamer.height_at(camera.x, camera.z, ground) && ground < camera.y)
|
||||||
|
level = ground;
|
||||||
|
else if (std::vector<char> found; Global.EditorOrtho == false)
|
||||||
|
{
|
||||||
|
auto const heights{ground_heights({camera}, true, &found)};
|
||||||
|
if (false == found.empty() && found.front() != 0 && heights.front() < camera.y)
|
||||||
|
level = heights.front();
|
||||||
|
}
|
||||||
|
double constexpr reach{2500.0};
|
||||||
|
glm::dvec2 low{camera.x, camera.z};
|
||||||
|
glm::dvec2 high{camera.x, camera.z};
|
||||||
|
for (int j = 0; j <= 6; ++j)
|
||||||
|
for (int i = 0; i <= 6; ++i)
|
||||||
|
{
|
||||||
|
glm::vec2 const ndc{static_cast<float>(i) / 3.0f - 1.0f, static_cast<float>(j) / 3.0f - 1.0f};
|
||||||
|
auto const point = [&inverse, &ndc](float const Depth) {
|
||||||
|
auto const clip = inverse * glm::vec4(ndc, Depth, 1.0f);
|
||||||
|
return glm::dvec3{glm::vec3{clip} / clip.w};
|
||||||
|
};
|
||||||
|
if (Global.EditorOrtho)
|
||||||
|
{
|
||||||
|
// the view straight down: the corners of the screen are where it reaches on the ground
|
||||||
|
auto const corner{camera + point(0.0f)}; // the view matrix is camera-relative
|
||||||
|
low = glm::min(low, glm::dvec2{corner.x, corner.z});
|
||||||
|
high = glm::max(high, glm::dvec2{corner.x, corner.z});
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
auto direction = point(0.5f) - point(0.0f);
|
||||||
|
if (glm::length(direction) < 1e-9)
|
||||||
|
continue;
|
||||||
|
direction = glm::normalize(direction);
|
||||||
|
glm::dvec2 flat{direction.x, direction.z};
|
||||||
|
auto distance{reach};
|
||||||
|
if (level && direction.y < -1e-6)
|
||||||
|
distance = std::min(reach, (camera.y - *level) / -direction.y * glm::length(flat));
|
||||||
|
if (glm::length(flat) < 1e-6)
|
||||||
|
continue;
|
||||||
|
flat = glm::normalize(flat) * distance;
|
||||||
|
glm::dvec2 const hit{camera.x + flat.x, camera.z + flat.y};
|
||||||
|
low = glm::min(low, hit);
|
||||||
|
high = glm::max(high, hit);
|
||||||
|
}
|
||||||
|
auto const count{m_orthophoto.hurry(low, high, camera)};
|
||||||
|
ui()->set_status(count > 0 ? format(STR_C("Orthophoto: %zu tiles of the view downloaded first (Ctrl+~)"), count)
|
||||||
|
: std::string{STR("Orthophoto: the view is all shown already (Ctrl+~)")});
|
||||||
|
}
|
||||||
|
|||||||
@@ -871,6 +871,12 @@ class editor_mode : public application_mode, private editor_track::observer, pri
|
|||||||
bool orthophoto_settings_open() const;
|
bool orthophoto_settings_open() const;
|
||||||
// view menu: the top view, the lanes of the roads, the structure gauge, the environment
|
// view menu: the top view, the lanes of the roads, the structure gauge, the environment
|
||||||
void render_view_menu();
|
void render_view_menu();
|
||||||
|
// View > Camera speed: the speed of the free camera, the Ctrl multiplier, in the top view as fast as it's zoomed; kept in the
|
||||||
|
// settings of the editor and handed to the camera
|
||||||
|
void render_camera_settings();
|
||||||
|
void apply_camera_settings();
|
||||||
|
// ~ (Ctrl): the orthophoto of what the camera sees downloaded before the rest, the ones which failed tried again at once
|
||||||
|
void orthophoto_hurry();
|
||||||
// time of day, day of the year, visibility, clouds and air temperature, as the scenery is seen in the editor
|
// time of day, day of the year, visibility, clouds and air temperature, as the scenery is seen in the editor
|
||||||
void render_environment_window();
|
void render_environment_window();
|
||||||
bool m_environment_open{false};
|
bool m_environment_open{false};
|
||||||
|
|||||||
@@ -1032,6 +1032,20 @@ editor_orthophoto::statistics editor_orthophoto::stats() const
|
|||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int editor_orthophoto::first_level(tile const &Tile, int const Level)
|
||||||
|
{
|
||||||
|
// a tile showing nothing yet takes the standard image first, from the disk cache at once mostly: the 4K one comes from a slow
|
||||||
|
// service a few at a time, the tiles around the camera stayed blank meanwhile though their standard images lay on the disk
|
||||||
|
if (Level > standard_pixels && Tile.level < standard_pixels)
|
||||||
|
return standard_pixels;
|
||||||
|
return Level;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool editor_orthophoto::outside_area(tile_key const &Key) const
|
||||||
|
{
|
||||||
|
return false == m_area.empty() && 0 == m_area_tiles.count(Key);
|
||||||
|
}
|
||||||
|
|
||||||
int editor_orthophoto::level_for(int Distance, bool Hires)
|
int editor_orthophoto::level_for(int Distance, bool Hires)
|
||||||
{
|
{
|
||||||
// coarser imagery further away keeps the memory use of large radii in check
|
// coarser imagery further away keeps the memory use of large radii in check
|
||||||
@@ -1630,7 +1644,7 @@ void editor_orthophoto::update(glm::dvec3 const &Camera)
|
|||||||
{
|
{
|
||||||
tile_key const key{centre.first + dx, centre.second + dy};
|
tile_key const key{centre.first + dx, centre.second + dy};
|
||||||
// outside the download area: nothing asked for, nothing shown
|
// outside the download area: nothing asked for, nothing shown
|
||||||
if (false == m_area.empty() && 0 == m_area_tiles.count(key))
|
if (outside_area(key))
|
||||||
{
|
{
|
||||||
if (auto const found{m_tiles.find(key)}; found != m_tiles.end())
|
if (auto const found{m_tiles.find(key)}; found != m_tiles.end())
|
||||||
{
|
{
|
||||||
@@ -1642,11 +1656,7 @@ void editor_orthophoto::update(glm::dvec3 const &Camera)
|
|||||||
tile &t = m_tiles[key];
|
tile &t = m_tiles[key];
|
||||||
if (!in_service_area(key.first, key.second))
|
if (!in_service_area(key.first, key.second))
|
||||||
t.empty = true;
|
t.empty = true;
|
||||||
int level = level_for(std::max(std::abs(dx), std::abs(dy)), m_config.hires);
|
int const level = first_level(t, level_for(std::max(std::abs(dx), std::abs(dy)), m_config.hires));
|
||||||
// a tile showing nothing yet takes the standard image first, from the disk cache at once mostly: the 4K one comes from a slow
|
|
||||||
// service a few at a time, the tiles around the camera stayed blank meanwhile though their standard images lay on the disk
|
|
||||||
if (level > standard_pixels && t.level < standard_pixels)
|
|
||||||
level = standard_pixels;
|
|
||||||
if (t.empty || (t.level == level && t.alpha == m_alpha) || (t.requested == level && t.requested_alpha == m_alpha) || now < t.retry_at)
|
if (t.empty || (t.level == level && t.alpha == m_alpha) || (t.requested == level && t.requested_alpha == m_alpha) || now < t.retry_at)
|
||||||
continue;
|
continue;
|
||||||
schedule(key, t, level, m_alpha);
|
schedule(key, t, level, m_alpha);
|
||||||
@@ -1713,7 +1723,8 @@ void editor_orthophoto::worker()
|
|||||||
continue;
|
continue;
|
||||||
long long const dx = it->key.first - m_focus.first;
|
long long const dx = it->key.first - m_focus.first;
|
||||||
long long const dy = it->key.second - m_focus.second;
|
long long const dy = it->key.second - m_focus.second;
|
||||||
long long const d = dx * dx + dy * dy;
|
// the tiles hurried (Ctrl+~) before all the others, the nearest of them first
|
||||||
|
long long const d = dx * dx + dy * dy - (m_urgent.count(it->key) > 0 ? (1LL << 40) : 0LL);
|
||||||
if (d < bestdistance)
|
if (d < bestdistance)
|
||||||
{
|
{
|
||||||
bestdistance = d;
|
bestdistance = d;
|
||||||
@@ -1730,6 +1741,7 @@ void editor_orthophoto::worker()
|
|||||||
{
|
{
|
||||||
current = *best;
|
current = *best;
|
||||||
m_queue.erase(best);
|
m_queue.erase(best);
|
||||||
|
m_urgent.erase(current.key);
|
||||||
m_running.insert(current.key);
|
m_running.insert(current.key);
|
||||||
if (current.level >= hires_pixels)
|
if (current.level >= hires_pixels)
|
||||||
++m_running_hires;
|
++m_running_hires;
|
||||||
@@ -1957,3 +1969,58 @@ void editor_orthophoto::draw(glm::mat4 const &ViewProjection, glm::dvec3 const &
|
|||||||
drawlist->PopTextureID();
|
drawlist->PopTextureID();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool editor_orthophoto::hurry_tile(tile_key const &Key, int const Distance)
|
||||||
|
{
|
||||||
|
// as update() does: nothing asked for outside the download area, nor outside the area the service covers, where the requests
|
||||||
|
// can't be answered
|
||||||
|
if (outside_area(Key))
|
||||||
|
return false;
|
||||||
|
auto &t{m_tiles[Key]};
|
||||||
|
if (false == in_service_area(Key.first, Key.second))
|
||||||
|
t.empty = true;
|
||||||
|
if (t.empty)
|
||||||
|
return false;
|
||||||
|
auto const level{first_level(t, level_for(Distance, m_config.hires))};
|
||||||
|
t.retry_at = 0.0;
|
||||||
|
if (t.level == level && t.alpha == m_alpha)
|
||||||
|
return false; // already shown as it should be
|
||||||
|
if (false == (t.requested == level && t.requested_alpha == m_alpha))
|
||||||
|
schedule(Key, t, level, m_alpha);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::size_t editor_orthophoto::hurry(glm::dvec2 const &Min, glm::dvec2 const &Max, glm::dvec3 const &Camera)
|
||||||
|
{
|
||||||
|
if (false == m_enabled)
|
||||||
|
return 0;
|
||||||
|
// the tile of the camera as it is now: it isn't followed while the layer is off
|
||||||
|
m_camera_tile = camera_tile(Camera);
|
||||||
|
{
|
||||||
|
std::lock_guard<std::mutex> lock(m_mutex);
|
||||||
|
m_focus = m_camera_tile;
|
||||||
|
}
|
||||||
|
auto const a{camera_tile(glm::dvec3{Min.x, 0.0, Min.y})};
|
||||||
|
auto const b{camera_tile(glm::dvec3{Max.x, 0.0, Max.y})};
|
||||||
|
tile_key const first{std::min(a.first, b.first), std::min(a.second, b.second)};
|
||||||
|
tile_key const last{std::max(a.first, b.first), std::max(a.second, b.second)};
|
||||||
|
auto const centre{m_camera_tile};
|
||||||
|
int const radius = m_config.radius;
|
||||||
|
std::vector<tile_key> keys;
|
||||||
|
for (int y = first.second; y <= last.second; ++y)
|
||||||
|
for (int x = first.first; x <= last.first; ++x)
|
||||||
|
{
|
||||||
|
tile_key const key{x, y};
|
||||||
|
auto const distance{std::max(std::abs(x - centre.first), std::abs(y - centre.second))};
|
||||||
|
if (distance <= radius && hurry_tile(key, distance))
|
||||||
|
keys.push_back(key);
|
||||||
|
}
|
||||||
|
auto const count{keys.size()};
|
||||||
|
{
|
||||||
|
std::lock_guard<std::mutex> lock(m_mutex);
|
||||||
|
m_urgent.clear();
|
||||||
|
m_urgent.insert(keys.begin(), keys.end());
|
||||||
|
}
|
||||||
|
m_wakeup.notify_all();
|
||||||
|
return count;
|
||||||
|
}
|
||||||
|
|||||||
@@ -102,6 +102,9 @@ class editor_orthophoto
|
|||||||
editor_orthophoto(editor_orthophoto const &) = delete;
|
editor_orthophoto(editor_orthophoto const &) = delete;
|
||||||
editor_orthophoto &operator=(editor_orthophoto const &) = delete;
|
editor_orthophoto &operator=(editor_orthophoto const &) = delete;
|
||||||
|
|
||||||
|
// the tiles over a rectangle of the world (x, z; what the camera sees), within the reach around the camera, asked for before anything
|
||||||
|
// else, the ones which failed tried again at once. returns: how many were put at the front of the queue
|
||||||
|
std::size_t hurry(glm::dvec2 const &Min, glm::dvec2 const &Max, glm::dvec3 const &Camera);
|
||||||
bool enabled() const { return m_enabled; }
|
bool enabled() const { return m_enabled; }
|
||||||
// disabling drops the queue and returns the gpu memory of the resident tiles
|
// disabling drops the queue and returns the gpu memory of the resident tiles
|
||||||
void enabled(bool State);
|
void enabled(bool State);
|
||||||
@@ -245,6 +248,12 @@ class editor_orthophoto
|
|||||||
};
|
};
|
||||||
|
|
||||||
static int level_for(int Distance, bool Hires);
|
static int level_for(int Distance, bool Hires);
|
||||||
|
// the level a tile is asked for at first: a tile showing nothing yet takes the standard image before the 4K one
|
||||||
|
static int first_level(tile const &Tile, int Level);
|
||||||
|
// the tile is outside the download area set, which then has no imagery asked for it
|
||||||
|
bool outside_area(tile_key const &Key) const;
|
||||||
|
// a tile of the view hurried: put at the front of the queue unless it's shown as it should be. true: counted among the hurried
|
||||||
|
bool hurry_tile(tile_key const &Key, int Distance);
|
||||||
tile_key camera_tile(glm::dvec3 const &Camera) const;
|
tile_key camera_tile(glm::dvec3 const &Camera) const;
|
||||||
glm::dvec2 tile_corner(tile_key const &Key) const; // world (x,z) of the north-west corner
|
glm::dvec2 tile_corner(tile_key const &Key) const; // world (x,z) of the north-west corner
|
||||||
void schedule(tile_key const &Key, tile &Tile, int Level, std::uint8_t Alpha);
|
void schedule(tile_key const &Key, tile &Tile, int Level, std::uint8_t Alpha);
|
||||||
@@ -300,6 +309,7 @@ class editor_orthophoto
|
|||||||
bool m_prefetch_paused{false};
|
bool m_prefetch_paused{false};
|
||||||
source m_prefetch_source;
|
source m_prefetch_source;
|
||||||
std::uint32_t m_prefetch_generation{0};
|
std::uint32_t m_prefetch_generation{0};
|
||||||
|
std::set<tile_key> m_urgent; // asked for by hurry(): workers take these first; guarded by m_mutex
|
||||||
|
|
||||||
std::atomic<bool> m_stop{false};
|
std::atomic<bool> m_stop{false};
|
||||||
std::atomic<std::uint32_t> m_generation{1};
|
std::atomic<std::uint32_t> m_generation{1};
|
||||||
|
|||||||
@@ -198,6 +198,18 @@ bool editorSettings::load()
|
|||||||
layer.terms = fields[5];
|
layer.terms = fields[5];
|
||||||
m_wms_layers.push_back(layer);
|
m_wms_layers.push_back(layer);
|
||||||
}
|
}
|
||||||
|
else if (key == "camera_speed")
|
||||||
|
{
|
||||||
|
parse(value, m_camera.speed);
|
||||||
|
m_camera.speed = std::clamp(m_camera.speed, 0.05, 10.0);
|
||||||
|
}
|
||||||
|
else if (key == "camera_fast")
|
||||||
|
{
|
||||||
|
parse(value, m_camera.fast);
|
||||||
|
m_camera.fast = std::clamp(m_camera.fast, 1.0, 30.0);
|
||||||
|
}
|
||||||
|
else if (key == "camera_zoomed")
|
||||||
|
m_camera.zoomed = (value == "1");
|
||||||
else if (key.rfind(origin_prefix, 0) == 0)
|
else if (key.rfind(origin_prefix, 0) == 0)
|
||||||
{
|
{
|
||||||
// northing;easting
|
// northing;easting
|
||||||
@@ -269,6 +281,9 @@ bool editorSettings::save()
|
|||||||
stream << "laying_heights " << (m_heights == lay_heights::points ? "points" : m_heights == lay_heights::level ? "level" : "fitted") << "\n";
|
stream << "laying_heights " << (m_heights == lay_heights::points ? "points" : m_heights == lay_heights::level ? "level" : "fitted") << "\n";
|
||||||
for (auto const &layer : m_wms_layers)
|
for (auto const &layer : m_wms_layers)
|
||||||
stream << "wms_layer " << (layer.visible ? 1 : 0) << ";" << layer.opacity << ";" << encoded(layer.url) << ";" << encoded(layer.layers) << ";" << encoded(layer.title) << ";" << encoded(layer.terms) << "\n";
|
stream << "wms_layer " << (layer.visible ? 1 : 0) << ";" << layer.opacity << ";" << encoded(layer.url) << ";" << encoded(layer.layers) << ";" << encoded(layer.title) << ";" << encoded(layer.terms) << "\n";
|
||||||
|
stream << "camera_speed " << m_camera.speed << "\n";
|
||||||
|
stream << "camera_fast " << m_camera.fast << "\n";
|
||||||
|
stream << "camera_zoomed " << (m_camera.zoomed ? 1 : 0) << "\n";
|
||||||
stream << std::fixed << std::setprecision(3);
|
stream << std::fixed << std::setprecision(3);
|
||||||
for (auto const &origin : m_orthophoto_origins)
|
for (auto const &origin : m_orthophoto_origins)
|
||||||
stream << origin.first << " " << origin.second.first << ";" << origin.second.second << "\n";
|
stream << origin.first << " " << origin.second.first << ";" << origin.second.second << "\n";
|
||||||
|
|||||||
@@ -119,10 +119,19 @@ public:
|
|||||||
};
|
};
|
||||||
lay_heights heights() const { return m_heights; }
|
lay_heights heights() const { return m_heights; }
|
||||||
void heights(lay_heights Heights) { m_heights = Heights; }
|
void heights(lay_heights Heights) { m_heights = Heights; }
|
||||||
|
// the free camera: its speed, how many times faster Ctrl makes it, and in the top view as fast as the view is zoomed
|
||||||
|
struct camera_settings
|
||||||
|
{
|
||||||
|
double speed{1.0};
|
||||||
|
double fast{30.0};
|
||||||
|
bool zoomed{false}; // off as the editor was before: "As it was" means it
|
||||||
|
};
|
||||||
|
camera_settings &camera() { return m_camera; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
movement_scheme m_movement{movement_scheme::wsad};
|
movement_scheme m_movement{movement_scheme::wsad};
|
||||||
orthophoto_settings m_orthophoto;
|
orthophoto_settings m_orthophoto;
|
||||||
|
camera_settings m_camera;
|
||||||
std::map<std::string, std::pair<double, double>> m_orthophoto_origins;
|
std::map<std::string, std::pair<double, double>> m_orthophoto_origins;
|
||||||
std::vector<wms_layer> m_wms_layers;
|
std::vector<wms_layer> m_wms_layers;
|
||||||
double m_platform_edge{1.725};
|
double m_platform_edge{1.725};
|
||||||
|
|||||||
@@ -14266,3 +14266,39 @@ msgstr "Kursor rysowany w obrazie (stream)"
|
|||||||
|
|
||||||
msgid "The pointer drawn by the editor into the frame instead of the one of the system: seen by those watching a stream\nor a recording of the window (Discord, OBS, the capture of the system), which leave the system pointer out"
|
msgid "The pointer drawn by the editor into the frame instead of the one of the system: seen by those watching a stream\nor a recording of the window (Discord, OBS, the capture of the system), which leave the system pointer out"
|
||||||
msgstr "Wskaźnik rysowany przez edytor w klatce zamiast systemowego: widać go w streamie\ni w nagraniu okna (Discord, OBS, przechwytywanie systemowe), które pomijają wskaźnik systemu"
|
msgstr "Wskaźnik rysowany przez edytor w klatce zamiast systemowego: widać go w streamie\ni w nagraniu okna (Discord, OBS, przechwytywanie systemowe), które pomijają wskaźnik systemu"
|
||||||
|
|
||||||
|
msgid "Camera speed"
|
||||||
|
msgstr "Prędkość kamery"
|
||||||
|
|
||||||
|
msgid "Speed of the camera"
|
||||||
|
msgstr "Prędkość kamery"
|
||||||
|
|
||||||
|
msgid "How fast the arrows or WSAD move the camera, Shift a bit faster; 1 as it was"
|
||||||
|
msgstr "Jak szybko strzałki albo WSAD przesuwają kamerę, z Shiftem trochę szybciej; 1 = jak dotąd"
|
||||||
|
|
||||||
|
msgid "Ctrl speeds it up"
|
||||||
|
msgstr "Przyspieszenie z Ctrl"
|
||||||
|
|
||||||
|
msgid "How many times faster the camera goes with Ctrl held, Ctrl+Shift too; 30 as it was"
|
||||||
|
msgstr "Ile razy szybciej jedzie kamera z wciśniętym Ctrl, także Ctrl+Shift; 30 = jak dotąd"
|
||||||
|
|
||||||
|
msgid "In the top view as fast as the view is zoomed"
|
||||||
|
msgstr "W widoku z góry prędkość zależna od powiększenia"
|
||||||
|
|
||||||
|
msgid "Zoomed in the map moves slowly, zoomed out fast: across the screen at the same pace whatever the zoom"
|
||||||
|
msgstr "Przybliżona mapa jedzie wolno, oddalona szybko: po ekranie zawsze w tym samym tempie"
|
||||||
|
|
||||||
|
msgid "As it was"
|
||||||
|
msgstr "Przywróć domyślne"
|
||||||
|
|
||||||
|
msgid "Orthophoto on (~)"
|
||||||
|
msgstr "Ortofoto włączone (~)"
|
||||||
|
|
||||||
|
msgid "Orthophoto off (~)"
|
||||||
|
msgstr "Ortofoto wyłączone (~)"
|
||||||
|
|
||||||
|
msgid "Orthophoto: %zu tiles of the view downloaded first (Ctrl+~)"
|
||||||
|
msgstr "Ortofoto: %zu kafli widoku pobieranych w pierwszej kolejności (Ctrl+~)"
|
||||||
|
|
||||||
|
msgid "Orthophoto: the view is all shown already (Ctrl+~)"
|
||||||
|
msgstr "Ortofoto: cały widok jest już pokazany (Ctrl+~)"
|
||||||
|
|||||||
@@ -199,6 +199,12 @@ struct global_settings {
|
|||||||
bool EditorOrtho{ false };
|
bool EditorOrtho{ false };
|
||||||
float EditorOrthoExtent{ 150.f };
|
float EditorOrthoExtent{ 150.f };
|
||||||
int EditorOrthoTracks{ 0 }; // the railway in the top view of the editor: 0 whole, 1 without the ballast, 2 the rails alone
|
int EditorOrthoTracks{ 0 }; // the railway in the top view of the editor: 0 whole, 1 without the ballast, 2 the rails alone
|
||||||
|
// the free camera of the editor: its speed set in the View menu, the Ctrl multiplier of it, and in the top view whether it goes as far
|
||||||
|
// as the view reaches, so the map moves across the screen as fast zoomed in as out
|
||||||
|
bool EditorCameraOn{ false }; // the editor is on: its camera goes by the settings below
|
||||||
|
double EditorCameraSpeed{ 1.0 };
|
||||||
|
double EditorCameraFast{ 30.0 };
|
||||||
|
bool EditorCameraZoomed{ false };
|
||||||
GLint iMaxTextureSize{ 4096 }; // maksymalny rozmiar tekstury
|
GLint iMaxTextureSize{ 4096 }; // maksymalny rozmiar tekstury
|
||||||
GLint iMaxCabTextureSize{ 4096 }; // largest allowed texture in vehicle cab
|
GLint iMaxCabTextureSize{ 4096 }; // largest allowed texture in vehicle cab
|
||||||
int iMultisampling{ 2 }; // tryb antyaliasingu: 0=brak,1=2px,2=4px,3=8px,4=16px
|
int iMultisampling{ 2 }; // tryb antyaliasingu: 0=brak,1=2px,2=4px,3=8px,4=16px
|
||||||
|
|||||||
@@ -62,6 +62,30 @@ TCamera::OnCommand( command_data const &Command ) {
|
|||||||
// threshold position on stick between walk lerp and walk/run lerp
|
// threshold position on stick between walk lerp and walk/run lerp
|
||||||
auto const stickthreshold = 2.0 / 3.0;
|
auto const stickthreshold = 2.0 / 3.0;
|
||||||
|
|
||||||
|
// the free camera of the editor as fast as its View menu sets it, Ctrl by the multiplier set there, in the top view by how far it reaches
|
||||||
|
auto editorscale { 1.0 };
|
||||||
|
auto editorfast { -1.0 };
|
||||||
|
if( Global.EditorCameraOn && m_owner == nullptr ) {
|
||||||
|
editorscale = Global.EditorCameraSpeed;
|
||||||
|
if( Global.EditorOrtho && Global.EditorCameraZoomed ) {
|
||||||
|
editorscale *= std::clamp( static_cast<double>( Global.EditorOrthoExtent ) / 150.0, 0.02, 200.0 );
|
||||||
|
}
|
||||||
|
editorfast = Global.EditorCameraFast;
|
||||||
|
}
|
||||||
|
// how many times faster the fast command of a move makes it: the editor's own, or the free fly's (Default) and the cab's (Cab)
|
||||||
|
auto const fastness = [&]( bool const Fast, double const Editor, double const Default, double const Cab ) {
|
||||||
|
if( false == Fast ) {
|
||||||
|
return 1.0;
|
||||||
|
}
|
||||||
|
if( editorfast > 0.0 ) {
|
||||||
|
return Editor;
|
||||||
|
}
|
||||||
|
if( false == FreeFlyModeFlag ) {
|
||||||
|
return 1.0;
|
||||||
|
}
|
||||||
|
return m_owner == nullptr ? Default : Cab;
|
||||||
|
};
|
||||||
|
|
||||||
bool iscameracommand { true };
|
bool iscameracommand { true };
|
||||||
switch( Command.command ) {
|
switch( Command.command ) {
|
||||||
|
|
||||||
@@ -82,7 +106,7 @@ TCamera::OnCommand( command_data const &Command ) {
|
|||||||
|
|
||||||
// if( movespeed == 0.0 ) { break; } // enable to fix external cameras in place
|
// if( movespeed == 0.0 ) { break; } // enable to fix external cameras in place
|
||||||
|
|
||||||
auto const speedmultiplier = true == FreeFlyModeFlag && Command.command == user_command::movehorizontalfast ? m_owner == nullptr ? 30.0 : 5.0 : 1.0;
|
auto const speedmultiplier = editorscale * fastness( Command.command == user_command::movehorizontalfast, editorfast, 30.0, 5.0 );
|
||||||
|
|
||||||
// left-right
|
// left-right
|
||||||
m_moverate.x = ComputeAxisSpeed(Command.param1, walkspeed, movespeed, stickthreshold) * speedmultiplier;
|
m_moverate.x = ComputeAxisSpeed(Command.param1, walkspeed, movespeed, stickthreshold) * speedmultiplier;
|
||||||
@@ -101,7 +125,7 @@ TCamera::OnCommand( command_data const &Command ) {
|
|||||||
|
|
||||||
// if( movespeed == 0.0 ) { break; } // enable to fix external cameras in place
|
// if( movespeed == 0.0 ) { break; } // enable to fix external cameras in place
|
||||||
|
|
||||||
auto const speedmultiplier = true == FreeFlyModeFlag && Command.command == user_command::moveverticalfast ? m_owner == nullptr ? 10.0 : 3.0 : 1.0;
|
auto const speedmultiplier = editorscale * fastness( Command.command == user_command::moveverticalfast, std::max( 1.0, editorfast / 3.0 ), 10.0, 3.0 );
|
||||||
// up-down
|
// up-down
|
||||||
m_moverate.y = ComputeAxisSpeed(Command.param1, walkspeed, movespeed, stickthreshold) * speedmultiplier;
|
m_moverate.y = ComputeAxisSpeed(Command.param1, walkspeed, movespeed, stickthreshold) * speedmultiplier;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user