18
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-20 19:44:58 +01:00

Merge branch 'master' into feat/renderers-cleanup

This commit is contained in:
2026-11-16 21:44:48 +01:00
264 changed files with 41203 additions and 10041 deletions

View File

@@ -26,6 +26,9 @@ public:
private:
// members
std::array<char, 256> m_buffer;
// the broken coupler next to the camera, which the panel offers to repair: the vehicle and its end
TDynamicObject const *m_brokenvehicle { nullptr };
int m_brokenend { 0 };
};
class timetable_panel : public ui_expandable_panel {
@@ -90,6 +93,8 @@ private:
void update_section_powergrid( std::vector<text_line> &Output ) const;
void update_section_camera( std::vector<text_line> &Output ) const;
void update_section_renderer( std::vector<text_line> &Output );
// the coupler nearest to the camera, and the state of its coupling
void update_section_coupler( std::vector<text_line> &Output );
#ifdef WITH_UART
void update_section_uart( std::vector<text_line> &Output ) const;
#endif
@@ -102,6 +107,8 @@ private:
bool render_section_scenario();
bool render_section_eventqueue();
bool render_section_renderer();
// the coupler section, with the parameters of the physical model to try out in the debug mode
bool render_section_coupler();
bool render_section_settings() const;
bool render_section_developer() const;
// members
@@ -119,6 +126,14 @@ private:
std::vector<text_line> m_rendererlines;
std::vector<gfx_renderer::info_section> m_renderersections; // the data of the renderer, each part under a header of its own
std::vector<text_line> m_uartlines;
std::vector<text_line> m_couplerlines;
// the coupler nearest to the camera
struct coupler_pick {
TDynamicObject const *vehicle { nullptr };
int end { 0 };
};
coupler_pick m_coupler;
bool m_couplerbothends { true }; // changes to the parameters apply to the end of the other vehicle of the pair too
double last_time = std::numeric_limits<double>::quiet_NaN();