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

Merge remote-tracking branch 'origin/master' into fix/door-inner-faces-lowpoly-lighting

# Conflicts:
#	vehicle/DynObj.cpp
This commit is contained in:
jerrrrycho
2026-11-08 21:47:32 +01:00
86 changed files with 3447 additions and 124 deletions

View File

@@ -319,6 +319,16 @@ private:
TSubModel *sm_summer_variant {}; // submodel letniego wariantu
TSubModel *sm_autumn_variant {}; // submodel jesiennego wariantu
double fWahaczeAmp;
// levers with a slot, turned by a pin on the coupling rod sliding in the slot (e.g. speedometer drive of 401Da)
struct slottedlever_data {
TSubModel *submodel { nullptr }; // lever, turned around its local X axis like the wheels
int axle { 0 }; // index of the axle animation, whose crank drives the coupling rod
glm::dvec2 pin { 0.0 }; // pin position relative to the lever axis for wheel angle 0, in local (Y, Z) plane [m]
glm::dvec2 crank { 0.0 }; // crank vector for wheel angle 0, in local (Y, Z) plane [m]
};
std::vector<slottedlever_data> m_slottedlevers;
static double slottedlever_angle( slottedlever_data const &Lever, double const Wheelangle );
void update_slottedlevers();
// Winger 160204 - pantografy
double pantspeedfactor;
// animacje typu przesuw