mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-11-21 21:24:58 +01:00
fix(editor): the orthophoto only on the chunks of the heightmap terrain in memory, and laid onto the ground again once it comes (#417)
* fix(editor): the orthophoto only on the chunks of the heightmap terrain in memory, and laid onto the ground again once it comes Right after the editor started, the tiles of the orthophoto came from the disk cache at once and were fitted to the ground before the chunks of the heightmap terrain had come (on IRT the orthophoto was on at 24.5 s, the first chunk came at 24.5 s, the last one at 85 s). A tile with no ground under it, and none beside, stayed flat at the height of the layer (0 m, some 230 m under IRT); one partly over the ground had its holes filled from the points beside. Neither was fitted again when the ground came: only the guessed tiles were, by their middle and corners alone, and a tile with no chunk under it at all never got any. The overlay, drawn over everything, then slid with the camera (WASD, turning) instead of lying on the ground. Turning the orthophoto off and on hid it: by then the terrain was in and the tiles took their heights from it or from the edges of the tiles beside. - With the heightmap terrain (the terrain streamer active), a tile of the orthophoto, of the WMS layers and of Ctrl+~ is asked for and shown only where its chunks are in memory (terrain_streamer::ground_under): it waits while one is still to come, and where no chunk is nor will be there's no imagery at all. A scenery without the heightmap terrain is as before. - A tile remembers the points of its grid the ground didn't answer and is fitted again once the ground comes under any of them (every second point and the edges), not only the guessed tiles. No asset changes. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(editor): the orthophoto waits only for the chunks that will come at this distance, and lies on the other ground or the guess elsewhere After the reviews of maj00r and jerrrrycho on #417: - A tile is no longer dropped where no chunk of the heightmap terrain is nor will be. There it lies on whatever ground there is (terrain models) or on the NMT guess, as on master; a scenery with a few chunks, or with chunks removed, keeps its imagery around them. - A chunk counts as still to come only while it's being loaded or lies within the circle the streamer walks around the camera. The corners of the imagery in the 3D view, beyond that circle, no longer wait for chunks that won't load there: they lie on the guess and are sampled again when the camera comes near and the chunk loads. - terrain_streamer::ground_under() (true / false / empty) became ground_coming() (bool), the cover source of the orthophoto the coming source, and on_ground() waits_for_ground(), which only holds back a new tile. - In the scene (in_scene), the points a steep triangle leaves without a height but the heightmap terrain answers aren't kept as unanswered, so the tile isn't sampled again on every chunk that comes. The holes are counted from the heights again, as on master. --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -20,6 +20,7 @@ http://mozilla.org/MPL/2.0/.
|
||||
#include <algorithm>
|
||||
#include <chrono>
|
||||
#include <cmath>
|
||||
#include <cstdlib>
|
||||
#include <filesystem>
|
||||
|
||||
terrain_streamer EditorTerrain;
|
||||
@@ -907,6 +908,44 @@ bool terrain_streamer::owns(gfx::geometry_handle const &Geometry) const
|
||||
return false;
|
||||
}
|
||||
|
||||
bool terrain_streamer::in_walk(chunk_key const &Key) const
|
||||
{
|
||||
// the circle update() walks around the camera and around where it's heading
|
||||
auto const within = [this, &Key](chunk_key const &Centre) {
|
||||
auto const dx{Key.first - Centre.first};
|
||||
auto const dz{Key.second - Centre.second};
|
||||
return std::abs(dx) <= m_walkradius && std::abs(dz) <= m_walkradius && dx * dx + dz * dz <= (m_walkradius + 1) * (m_walkradius + 1);
|
||||
};
|
||||
return within(m_walkhere) || within(m_walkthere);
|
||||
}
|
||||
|
||||
bool terrain_streamer::chunk_coming(chunk_key const &Key) const
|
||||
{
|
||||
if (m_chunks.contains(Key) || m_removed.contains(Key))
|
||||
return false;
|
||||
if (m_loading.contains(Key))
|
||||
return true;
|
||||
// a chunk the walk doesn't reach at this distance isn't loaded, so it isn't waited for: it's taken in when the camera comes near
|
||||
if (false == in_walk(Key))
|
||||
return false;
|
||||
// still to come while its pack isn't read yet, or it's in its pack; not there where the pack is read without it
|
||||
auto const pack{m_packs.find(heightmap::pack_of(Key))};
|
||||
if (pack == m_packs.end() || pack->second.status == pack_state::state::unknown || pack->second.status == pack_state::state::loading)
|
||||
return true;
|
||||
return pack->second.status == pack_state::state::ready && pack->second.file->has(Key);
|
||||
}
|
||||
|
||||
bool terrain_streamer::ground_coming(glm::dvec2 const &Low, glm::dvec2 const &High) const
|
||||
{
|
||||
auto const first{heightmap::chunk_at(Low.x, Low.y)};
|
||||
auto const last{heightmap::chunk_at(High.x, High.y)};
|
||||
for (auto z{std::min(first.second, last.second)}; z <= std::max(first.second, last.second); ++z)
|
||||
for (auto x{std::min(first.first, last.first)}; x <= std::max(first.first, last.first); ++x)
|
||||
if (chunk_coming(chunk_key{x, z}))
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
bool terrain_streamer::exists(chunk_key const &Key) const
|
||||
{
|
||||
if (m_chunks.count(Key) > 0)
|
||||
|
||||
Reference in New Issue
Block a user