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

@@ -155,6 +155,43 @@ struct water_body
std::vector<glm::dvec2> outline; // x, z
};
// piece of the ground cut out of the terrain and drawn on its own with a material of its own (a yard, a platform of beaten earth, a
// field of other crops): the terrain is cut away within the outline, the heights it had there are kept on a grid of the piece, so it
// lies where the ground was and stays as it was cut whatever happens to the terrain later
struct surface_patch
{
std::string name;
std::string material; // empty: the first material of the palette
float size{0.f}; // metres the texture repeats at; 0: the size given by the material, or 8 m
float rotation{0.f}; // degrees the texture is turned by, counterclockwise seen from above
float lift{0.f}; // metres the surface lies over the heights kept
std::vector<glm::dvec2> outline; // x, z
glm::dvec2 origin{0.0}; // x, z of the first point of the grid
double spacing{1.0};
int columns{0}; // points along x
int rows{0}; // points along z
std::vector<float> heights; // rows of growing z
// the surface follows the terrain under it (its heights, holes or not) instead of heights of its own, on a grid of the spacing
// laid from 0; the grid and heights above are unused
bool follow{false};
// painted into the terrain instead (follow is true too): no hole and no mesh of its own, the material laid into the paint of
// the chunks, blending over Feather metres across the outline, the edge shifted by up to Noise metres in waves of Noise_scale
bool paint{false};
float feather{1.f};
float noise{0.f};
float noise_scale{4.f};
// the points it was drawn with and the options of its outline (curves, handles, along a track), for it to be outlined again as
// it was drawn; empty: the outline itself
std::string shape;
// the 3D grass under a painted surface: -2 left as it grows, -1 taken away, 0 or more: that kind of the grass palette grown there
int grass{-2};
// height kept at specified point, interpolated between the points of the grid; false out of the grid
bool height(double X, double Z, double &Height) const;
// x, z of the corners of the box around the outline
void bounds(glm::dvec2 &Low, glm::dvec2 &High) const;
};
// modifier of the terrain: a corridor along a line (axis of a track or a road) with a formation of specified
// height and width, and slopes from its edges to the ground
struct corridor_point
@@ -174,6 +211,18 @@ struct modifier
// portal of a tunnel; otherwise they go round it
bool open_start{false};
bool open_end{false};
// the slopes not drawn with a ruler: the formation and the edges of the track bed stay as designed, the slopes and their foot
// wander and roll as the earth does. All 0: the slopes as designed
struct natural_shape
{
double wander{0.0}; // metres the foot of the slopes wanders in and out by
double scale{15.0}; // about how long the waves of it are along the line, metres
double gentler{0.0}; // up to how much gentler the slopes get than designed, 0.2: up to 1:1.8 of 1:1.5 (never steeper)
double soften{0.0}; // the foot rounded off more, metres of the bend a metre of the height of the slope
double roughness{0.0}; // metres the face of the slope is bumpy by
bool any() const { return wander > 0.0 || gentler > 0.0 || soften > 0.0 || roughness > 0.0; }
};
natural_shape natural;
std::vector<corridor_point> points;
// rectangle (x, z) the modifier can change the ground in
@@ -242,10 +291,20 @@ struct manifest
bool compress{true}; // pack files store their data compressed with zstd
float spacing{default_spacing}; // point spacing of new chunks
std::vector<water_body> water;
std::vector<surface_patch> patches;
// file next to the manifest the patches are kept in, a line each (many of them, as cut along tracks, load faster so); empty:
// in the manifest, unless there are more than patches_inline
std::string patches_file;
std::vector<modifier> modifiers;
std::vector<grass_def> grass; // the grass palette
};
// past this many the patches are saved to their own file (manifest::patches_file)
std::size_t constexpr patches_inline{200};
// smooth noise of -1..1 in waves of about Scale metres, the same at the same place every time; Channel gives another one
double natural_noise(double X, double Z, double Scale, int Channel);
bool load_patches(std::string const &Path, std::vector<surface_patch> &Patches);
bool save_patches(std::string const &Path, std::vector<surface_patch> const &Patches);
bool load_manifest(std::string const &Path, manifest &Manifest, std::string *Error = nullptr);
bool save_manifest(std::string const &Path, manifest const &Manifest, std::string *Error = nullptr);