17
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-01 23:59:12 +01:00

feat(roads): editor menu and window for building roads, lanes shown as trajectories

This commit is contained in:
2026-10-03 18:21:10 +02:00
parent 2f417fddcc
commit e4083d507f
12 changed files with 2094 additions and 249 deletions

View File

@@ -23,6 +23,7 @@ http://mozilla.org/MPL/2.0/.
namespace scene
{
struct scratch_data;
class basic_section;
}
// a piece of a road for wheeled traffic: an axis, and a cross-section which stays the same along it.
@@ -60,7 +61,6 @@ class road_node : public scene::basic_node
{
float width{3.5f};
float velocity{-1.f}; // speed limit, none if negative
TTrack *track{nullptr}; // the generated path; owned by the path table, like every other track
};
struct side_data
{
@@ -68,37 +68,96 @@ class road_node : public scene::basic_node
float width{0.f};
std::string material;
};
// everything the scenery says about the road. the lanes go left to right when facing along the axis:
// the ones going against it, outermost first, then the ones going along it
struct state
{
segment_data axis;
int forward{1}; // number of lanes going along the axis
int backward{1}; // number of lanes going against the axis
float lanewidth{3.5f}; // what a lane gets unless it's told otherwise
float velocity{-1.f};
std::vector<lane_data> lanes;
std::vector<int> changes; // permissions to change the lane, one for each pair of neighbouring lanes
std::string surface{"asphaltdark1"};
float texturelength{4.f};
std::array<side_data, 2> sides; // left, right
float kerbheight{0.12f};
glm::vec2 slope{1.f, 0.4f}; // width and drop of the bank which closes a shoulder
marking_colour markings{marking_colour::white};
float friction{0.85f};
float sounddistance{25.f};
int quality{15};
std::string environment{"flat"};
// brings the content to a usable form: values within their limits, an entry for each lane and for each pair of neighbours
void normalize();
// identifier of a lane: f1..fn go along the axis and b1..bn against it, both counted outwards from where the directions meet
std::string lane_id(std::size_t const Lane) const;
// number of a lane in the left to right order, -1 if there's no lane with such identifier
int lane_index(std::string const &Id) const;
// permission to change the lane a pair of neighbouring lanes gets if the scenery doesn't say otherwise
int default_change(std::size_t const Boundary) const;
// distance of the middle of a lane from the axis, positive to the left when facing along the axis
double lane_offset(std::size_t const Lane) const;
// combined width of the lanes
double width() const;
// shape of the middle of a lane, laid out in the direction of travel
segment_data lane_path(std::size_t const Lane) const;
// length of the axis
double length() const;
// position on the axis and direction of the axis, for specified value of the curve parameter
glm::dvec3 point(double const T) const;
glm::dvec3 tangent(double const T) const;
};
// constructors
explicit road_node(scene::node_data const &Nodedata);
// methods
// restores content of the node from provided input stream; reads up to and including the closing 'endroad'
void import(cParser &Input, glm::dvec3 const &Offset);
state const &definition() const
{
return m_state;
}
// replaces what the node knows about the road. the lanes and the geometry stay the way they were made,
// it's up to the caller to take them down beforehand and make them again
void define(state const &State);
// creates paths of the lanes and hands them over to the simulation
void create_lanes();
// links lanes of opposite directions at an end of the road which leads nowhere, so the vehicles can turn back
void close_ends();
// gives up the paths of the lanes, or the ones made to close the loose ends. the paths belong to the path table,
// the caller is expected to take them out of use
std::vector<TTrack *> release_lanes();
std::vector<TTrack *> release_turns();
// paths of the lanes, in the order of the lanes, and the ones made to close the loose ends
std::vector<TTrack *> const &tracks() const
{
return m_tracks;
}
std::vector<TTrack *> const &turns() const
{
return m_turns;
}
// true if there's a vehicle on any path of the road
bool occupied() const;
// generates geometry of the surface, the sides and the markings
std::vector<scene::shape_node> create_shapes() const;
// identifier of a lane: f1..fn go along the axis and b1..bn against it, both counted outwards from where the directions meet
std::string lane_id(std::size_t const Lane) const;
// distance of the middle of a lane from the axis, positive to the left when facing along the axis
double lane_offset(std::size_t const Lane) const;
// combined width of the lanes
double width() const;
// lanes, left to right when facing along the axis: the ones going against it, outermost first, then the ones going along it
std::vector<lane_data> const &lanes() const
// puts geometry of the road in the scene as shapes of its own, which can be taken back
void show();
// takes back geometry put in the scene by show()
void hide();
// marks geometry of the road as mixed with other shapes of the scenery; such road can't be changed anymore
void merged(bool const Merged)
{
return m_lanes;
m_merged = Merged;
}
// permissions to change the lane, one for each pair of neighbouring lanes
std::vector<int> const &lane_changes() const
bool merged() const
{
return m_changes;
}
segment_data const &axis() const
{
return m_axis;
return m_merged;
}
// members
bool m_editorremoved{false}; // removed in the editor; kept around so the removal can be undone
private:
// methods
@@ -110,33 +169,17 @@ class road_node : public scene::basic_node
void deserialize_(std::istream &Input) override;
// export() subclass details, sends basic content of the class in legacy (text) format to provided stream
void export_as_text_(std::ostream &Output) const override;
// number of a lane in the left to right order, -1 if the road has no lane with such identifier
int lane_index(std::string const &Id) const;
// permission to change the lane a pair of neighbouring lanes gets if the scenery doesn't say otherwise
int default_change(std::size_t const Boundary) const;
// shape of the middle of a lane, laid out in the direction of travel
segment_data lane_path(std::size_t const Lane) const;
// creates a path for the vehicles and registers it with the simulation
TTrack *create_track(std::string const &Name, segment_data const &Path, float const Width, float const Velocity);
// members
segment_data m_axis;
int m_forward{1}; // number of lanes going along the axis
int m_backward{1}; // number of lanes going against the axis
float m_lanewidth{3.5f};
float m_velocity{-1.f};
std::vector<lane_data> m_lanes;
std::vector<int> m_changes;
std::string m_surface{"asphaltdark1"};
float m_texturelength{4.f};
std::array<side_data, 2> m_sides; // left, right
float m_kerbheight{0.12f};
glm::vec2 m_slope{1.f, 0.4f}; // width and drop of the bank which closes a shoulder
marking_colour m_markings{marking_colour::white};
float m_friction{0.85f};
float m_sounddistance{25.f};
int m_quality{15};
std::string m_environment{"flat"};
std::vector<TTrack *> m_turns; // paths made to close loose ends of the road
state m_state;
std::vector<TTrack *> m_tracks;
std::vector<TTrack *> m_turns;
bool m_merged{false};
// geometry put in the scene by show()
gfx::geometrybank_handle m_bank{0, 0};
std::vector<gfx::geometry_handle> m_geometry;
scene::basic_section *m_section{nullptr};
};
// collection of roads present in the scene
@@ -146,7 +189,7 @@ class road_table : public basic_table<road_node>
public:
// legacy style initialization, to be performed when the tracks are already joined
void InitRoads();
// generates geometry of the roads and inserts it in the region
// generates geometry of the roads and puts it in the scene
void create_geometry(scene::scratch_data &Scratchpad);
};