eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 01:59:19 +02:00
Code Issues 121 Wiki Activity

Fix model rotation by changing glm::dmat4 BasisChange definition

Browse Source
This commit is contained in:
docentYT
2026-04-27 21:28:06 +02:00
parent fae68642bc
commit ef852b4307
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
utilities/dumb3d.h
View File

@@ -19,14 +19,7 @@ namespace Math3D
inline glm::dmat4 BasisChange(glm::dvec3 u, glm::dvec3 v, glm::dvec3 n) inline glm::dmat4 BasisChange(glm::dvec3 u, glm::dvec3 v, glm::dvec3 n)
{ {
glm::dmat4 M(1.0); 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
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;
} }
inline glm::dmat4 BasisChange(glm::dvec3 v, glm::dvec3 n) inline glm::dmat4 BasisChange(glm::dvec3 v, glm::dvec3 n)

2
vehicle/Train.cpp
View File

@@ -9525,7 +9525,7 @@ glm::dvec3 TTrain::MirrorPosition(bool lewe)
glm::dvec4( glm::dvec4(
mvOccupied->Dim.W * ( 0.5 * shiftdirection ) + ( 0.2 * shiftdirection ), mvOccupied->Dim.W * ( 0.5 * shiftdirection ) + ( 0.2 * shiftdirection ),
1.5 + Cabine[iCabn].CabPos1.y, 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) void TTrain::DynamicSet(TDynamicObject *d)