18
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-21 06:14:58 +01:00

feat(editor): Fields in the Terrain work mode, the ground under them made wavy, natural slopes (#315)

* feat(editor): Fields in the Terrain work mode, the ground under them made wavy, natural slopes

A Fields tool beside Fill: LMB outlines a field, which gets the material chosen in the palette
and is kept in a list (terrain/<name>/patches.txt, or in the manifest while there are few),
where its material, repeat, angle, transition and grass are changed later.

- painted into the terrain (the paint of the chunks, its edge blended over a transition and
  shifted by a noise, the 3D grass under it left, taken away or of another kind), or
- a surface of its own: the ground cut away within the outline and the field drawn over the
  hole as a mesh following the heights of the terrain, made around the camera as the water
  is. It doesn't take one of the 8 materials of a chunk; its edge is sharp.

The ground under a field can be made wavy before: rolling hills, furrows, bumps, long waves,
a hollow or a mound, hummocks in a grid, strips of fields; with a profile (rounded, sharp
ridges, sharp valleys, terraces, flat tops), roughness, variation and a fade from the edge.
The chunks under it are made finer where the waves need it.

The formation modifiers get an optional natural shape (natural: wander, scale, gentler,
soften, roughness in the manifest): the formation and the edges of the track bed stay, the
slopes and their foot wander, get gentler and meet the ground softly. Without it the
modifiers shape the ground as before.

Formats: new optional entries patches, patches_file and natural of the manifest, and the
patches file; a terrain without them reads and saves as before, and the release doesn't read
them.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01DDcMn1Q7wdYkbxDUWscNHZ

* Fields: one noise for the edges of the fields and the natural slopes, one filling of the geometry of the water

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01DDcMn1Q7wdYkbxDUWscNHZ

* Fields: the vertices handed to the geometry of the water by value

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01DDcMn1Q7wdYkbxDUWscNHZ

* fix(editor): whole-number loop counters instead of float ones (Sonar cpp:S2193)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01DDcMn1Q7wdYkbxDUWscNHZ

* fix(editor): Fields: the edits of a field stick, the natural slopes stay when the formations are laid again, no holes far off or by a missing chunk

The copy of the field the widgets edit is kept while one of them is held, so a drag ends with what it was dragged to. Laying
the formations again keeps the natural shape of the slopes of each. The surfaces of the fields are made as far as the chunks
are drawn, so their holes never show without them; a field over ground with no chunk is made of what has ground, and waits
only for chunks which are in the files but not loaded yet. Outline it again puts the points on the ground and the cut changes
that field. The holes of the fields are marked (254) and giving one back closes only its own, the holes cut by hand stay.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01DDcMn1Q7wdYkbxDUWscNHZ

* fix(editor): Fields: a separate field is built after loading with the camera still; a cleared outline or another field chosen forgets the one to outline again; giving back a field keeps the holes of the others over it

- waits_for_ground counts a chunk as still coming while its pack isn't read
  yet (right after opening the scenery none is), and as not coming only when
  the pack is missing or read without that chunk. Before, the first build
  after opening left a saved separate field a hole until the camera moved.
- Clear the outline (Fields and the area fill) and choosing another field in
  the list forget the field put back by Outline it again, so the next cut is
  a new field and not the old one moved.
- All holes of separate fields share one mark, so closing one closed it under
  an overlapping field too; the separate fields left over the closed outline
  are cut again after it (when a field is given back or outlined again).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01DDcMn1Q7wdYkbxDUWscNHZ

* chore(editor): Fields: one identifier a statement, contains() for the sets (Sonar cpp:S1659, cpp:S6171)

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01DDcMn1Q7wdYkbxDUWscNHZ

* ci(windows): build lua51.dll for the unit tests

(cherry picked from commit b3e6e02779)

* fix(terrain): the fields made again only when one comes or goes; patches_file a plain name; the hand holes leave the fields'

After the review of jerrrrycho at edb5160a:
- update() no longer rebuilds all the water and the separate fields every 200 m the camera moves. Past
  patch_move it compares the separate (not painted) fields within the reach with the ones made, and rebuilds
  only when one came within the reach or left it; otherwise only the centre moves. A terrain with only
  painted fields never rebuilds for a move, also in driving mode. The fields waiting for their ground are
  made again as before.
- patches_file of a manifest is taken only as a plain file name in the folder of the terrain. A path with
  folders, "..", or a root is logged ("Bad terrain: ...") and patches.txt is used instead, so a downloaded
  manifest can't have the patches read from, or saved over, a file elsewhere.
- The holes cut or closed by hand (the Holes tool, "Close the hole" of the Fill section) leave the hole
  samples of the fields (kFieldHole) as they are, so a field's mesh no longer stands over closed ground and
  z-fights with it, and "Give back" still finds the field's hole. The unmarked fallback of cut_field (the
  fields cut before the mark) thereby closes only unmarked holes.
- The field picked with "Outline it again" is forgotten when the Fill tool uses the outline up, and when
  another terrain tool than the fields is chosen, so the next field drawn is a new one.

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>
Co-authored-by: Hirek193 <polomarket73@gmail.com>
This commit is contained in:
pol102
2026-11-20 03:56:43 +01:00
committed by GitHub
parent c9c390017a
commit 142a3bc287
11 changed files with 2238 additions and 31 deletions

View File

@@ -680,7 +680,8 @@ class editor_mode : public application_mode, private editor_track::observer, pri
restore, // takes the touch-ups over the modifiers back
fill, // outlines an area filled with a material
holes, // cuts holes in the ground (portals of tunnels), Shift: closes them
grass // grows the chosen kind of grass, Shift: takes the grass away
grass, // grows the chosen kind of grass, Shift: takes the grass away
fields // outlines a field: a surface cut out of the terrain with a material of its own, the ground under it made wavy
};
terrain_tool m_terrain_tool{terrain_tool::none};
bool terrain_brush() const
@@ -703,9 +704,67 @@ class editor_mode : public application_mode, private editor_track::observer, pri
void remove_selected_chunks();
// takes the height of whatever is under the cursor (terrain, track, model) for the target of the level brush. returns: false if there's nothing
bool pick_terrain_target();
bool terrain_clicking() const { return m_terrain_tool == terrain_tool::chunks || m_terrain_tool == terrain_tool::spacing || m_terrain_tool == terrain_tool::water || m_terrain_tool == terrain_tool::fill; }
bool terrain_clicking() const
{
return m_terrain_tool == terrain_tool::chunks || m_terrain_tool == terrain_tool::spacing || m_terrain_tool == terrain_tool::water || m_terrain_tool == terrain_tool::fill ||
m_terrain_tool == terrain_tool::fields;
}
// fills the outlined area with the material of the chosen palette entry, turned by m_paint_rotation
void fill_terrain_area();
// the fields (editormodefields.cpp): surfaces cut out of the terrain within the outline of the Fill tool, each with a material
// of its own, kept in a list to be changed later; painted into the paint of the chunks, or as a mesh of its own over a hole
// (out of the 8 materials a chunk holds, its seam showing); the ground under them made wavy; the slopes of the formation
// modifiers made natural
struct field_settings
{
float feather{1.0f}; // metres the field blends into the ground around over
float noise{0.3f}; // metres its edge wanders in and out by
float noise_scale{4.0f}; // about how long the waves of the edge are
int grass{-1}; // the 3D grass under it: -2 left, -1 taken away, 0 or more: that kind grown
bool separate{false}; // a mesh of its own over a hole instead of the paint of the chunks
bool everywhere{false}; // where the slopes are made natural: the whole scenery, or around the camera
float radius{1500.0f};
};
field_settings m_field;
// the ground under a field made wavy: rolling hills, furrows of a field, bumps, long waves, a hollow or a mound
struct terrain_waves
{
enum kind { hills, furrows, bumps, waves, hollow, grid, strips, count };
// the profile of a wave: rounded as a sine, sharp ridges, sharp valleys, terraces, flat tops; how sharp it goes
enum profile { smooth, ridges, valleys, terraces, plateaus, profiles };
bool on{false};
int kind{hills};
float height{0.4f}; // metres, from the lowest to the highest point of a wave; negative for the hollow, upside down
float length{25.0f}; // metres, of a wave
float angle{0.0f}; // degrees the furrows and the waves run at, counterclockwise from x
float edge{6.0f}; // metres inside the outline over which the waves fade in from nothing
float variation{0.35f}; // 0..1, how much the waves differ from one another
int shape{smooth};
float sharpness{0.5f}; // 0..1: 0 the profile still rounded, 1 its corners and edges as sharp as it gets
int steps{4}; // of the terraces, from the bottom of a wave to its top
float roughness{0.0f}; // 0..1, small bumps over the whole surface, as clods of a field
};
terrain_waves m_waves;
heightmap::modifier::natural_shape m_natural{0.8, 15.0, 0.15, 0.3, 0.08};
int m_patch_selected{-1}; // field chosen in the list
heightmap::surface_patch m_patch_edit; // its copy the widgets edit, kept while one of them is held
int m_patch_edited{-1}; // which field m_patch_edit is of
std::string m_patch_reoutline; // the field whose outline was put back to be drawn again: cutting out changes it
void render_fields_ui();
void cut_out_field();
void render_waves_options();
// the ground within Outline made wavy as m_waves says; returns true if it changed
bool apply_waves(std::vector<glm::dvec2> const &Outline);
// a combo of what's done with the grass; true if changed
bool grass_choice(char const *Label, int &Choice);
// a field painted into the chunks, with its grass
bool paint_patch(heightmap::surface_patch const &Patch);
// the list of the fields set to All, the ones of Changed painted again with the ones over them they touch, the ground under the
// ones of Cleared given back the first material of the palette
void repaint_patches(std::vector<heightmap::surface_patch> All, std::vector<std::size_t> const &Changed, std::vector<heightmap::surface_patch> const &Cleared = {});
void render_patches_list();
void naturalise_slopes(bool Natural);
// the brush, the hovered chunk and the outlines of water drawn over the viewport
void draw_terrain_overlay();
// forgets what's known about the ground, after the terrain changed