From ef852b430749bce5f301a2ca0339be378f7840e4 Mon Sep 17 00:00:00 2001 From: docentYT <63965954+docentYT@users.noreply.github.com> Date: Mon, 27 Apr 2026 21:28:06 +0200 Subject: [PATCH] Fix model rotation by changing glm::dmat4 BasisChange definition --- utilities/dumb3d.h | 9 +-------- vehicle/Train.cpp | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/utilities/dumb3d.h b/utilities/dumb3d.h index 19075cd4..33ea4bde 100644 --- a/utilities/dumb3d.h +++ b/utilities/dumb3d.h @@ -19,14 +19,7 @@ namespace Math3D inline glm::dmat4 BasisChange(glm::dvec3 u, glm::dvec3 v, glm::dvec3 n) { - glm::dmat4 M(1.0); - - M[0] = glm::dvec4(u, 0.0); // kolumna 0 - M[1] = glm::dvec4(v, 0.0); // kolumna 1 - M[2] = glm::dvec4(n, 0.0); // kolumna 2 - M[3] = glm::dvec4(0.0, 0.0, 0.0, 1.0); // kolumna 3 - - return M; + return glm::dmat4{glm::dvec4(u.x, v.x, n.x, 0.0), glm::dvec4(u.y, v.y, n.y, 0.0), glm::dvec4(u.z, v.z, n.z, 0.0), glm::dvec4(0.0, 0.0, 0.0, 1.0)}; // 4 columns; first rows: u, v, n } inline glm::dmat4 BasisChange(glm::dvec3 v, glm::dvec3 n) diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp index 4470ff1e..ee2cd6ec 100644 --- a/vehicle/Train.cpp +++ b/vehicle/Train.cpp @@ -9525,7 +9525,7 @@ glm::dvec3 TTrain::MirrorPosition(bool lewe) glm::dvec4( mvOccupied->Dim.W * ( 0.5 * shiftdirection ) + ( 0.2 * shiftdirection ), 1.5 + Cabine[iCabn].CabPos1.y, - interpolate( Cabine[ iCabn ].CabPos1.z , Cabine[ iCabn ].CabPos2.z, 0.5 ), 0.0 ); + interpolate( Cabine[ iCabn ].CabPos1.z , Cabine[ iCabn ].CabPos2.z, 0.5 ), 1.0); }; void TTrain::DynamicSet(TDynamicObject *d)