From 0fcdf983921a1be7042447556853c4c14d0b02c0 Mon Sep 17 00:00:00 2001
From: docentYT <63965954+docentYT@users.noreply.github.com>
Date: Mon, 27 Apr 2026 21:57:13 +0200
Subject: [PATCH] more glm instead of Math3D in vehicle

---
 vehicle/DynObj.h  | 6 +++---
 vehicle/Train.cpp | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/vehicle/DynObj.h b/vehicle/DynObj.h
index 04e2e6c8..c495f578 100644
--- a/vehicle/DynObj.h
+++ b/vehicle/DynObj.h
@@ -716,7 +716,7 @@ private:
     // TODO: check if scanning takes into account direction when selecting axle
     // if it does, replace the version above
     // if it doesn't, fix it so it does
-    inline Math3D::vector3 AxlePositionGet() {
+    inline glm::dvec3 AxlePositionGet() {
         return (
             iDirection ?
                 ( iAxleFirst ? Axle1.pPosition : Axle0.pPosition ) :
@@ -834,8 +834,8 @@ public:
     std::pair<double, double> shake_angles() const;
 // members
     struct baseshake_config {
-        Math3D::vector3 angle_scale { 0.05, 0.0, 0.1 }; // roll, yaw, pitch
-        Math3D::vector3 jolt_scale { 0.2, 0.2, 0.1 };
+        glm::dvec3 angle_scale { 0.05, 0.0, 0.1 }; // roll, yaw, pitch
+		glm::dvec3 jolt_scale{0.2, 0.2, 0.1};
         double jolt_limit { 2.0f };
     } BaseShake;
     struct engineshake_config {
diff --git a/vehicle/Train.cpp b/vehicle/Train.cpp
index ee2cd6ec..9e062133 100644
--- a/vehicle/Train.cpp
+++ b/vehicle/Train.cpp
@@ -563,7 +563,7 @@ TTrain::TTrain() {
     fPPress = fNPress = 0;
 
     // asMessage="";
-    pMechOffset = Math3D::vector3(0, 0, 0);
+	pMechOffset = glm::dvec3(0, 0, 0);
     fBlinkTimer = 0;
     fHaslerTimer = 0;
     DynamicSet(NULL); // ustawia wszystkie mv*
@@ -5147,11 +5147,10 @@ void TTrain::OnCommand_endsignalstoggle( TTrain *Train, command_data const &Comm
         auto *vehicle { std::get<TDynamicObject *>( simulation::Region->find_vehicle( Command.location, 10, false, true ) ) };
 
         if( vehicle == nullptr ) { return; }
-		// TODO: Maybe command_data should be dvec3?
         int const CouplNr {
             clamp(
                 vehicle->DirectionGet()
-                * ( Math3D::LengthSquared3( vehicle->HeadPosition() - glm::dvec3(Command.location) ) > Math3D::LengthSquared3( vehicle->RearPosition() - glm::dvec3(Command.location) ) ?
+                * ( glm::length2( vehicle->HeadPosition() - glm::dvec3(Command.location) ) > glm::length2( vehicle->RearPosition() - glm::dvec3(Command.location) ) ?
                      1 :
                     -1 ),
                 0, 1 ) }; // z [-1,1] zrobić [0,1]