engine revolutions based cab shake, pantograph control tweaks

McZapkie/MOVER.h

@@ -1021,7 +1021,7 @@ public:
 	int PulseForceCount = 0;
 
 	/*dla drezyny, silnika spalinowego i parowego*/
-	double eAngle = 1.5;
+	double eAngle = M_PI * 0.5;
 
 	/*-dla wagonow*/
     double Load = 0.0;      /*masa w T lub ilosc w sztukach - zaladowane*/

McZapkie/Mover.cpp

@@ -8517,7 +8517,8 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C
 	else if (Command == "PantFront") /*Winger 160204*/
 	{ // Ra: uwzględnić trzeba jeszcze zgodność sprzęgów
 	  // Czemu EZT ma być traktowane inaczej? Ukrotnienie ma, a człon może być odwrócony
-		if ((TrainType == dt_EZT))
+		if ((TrainType == dt_EZT)
+         || (TrainType == dt_ET41))
 		{ //'ezt'
 			if ((CValue1 == 1))
 			{
@@ -8561,7 +8562,8 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C
 	}
 	else if (Command == "PantRear") /*Winger 160204, ABu 310105 i 030305*/
 	{ // Ra: uwzględnić trzeba jeszcze zgodność sprzęgów
-		if ((TrainType == dt_EZT))
+		if ((TrainType == dt_EZT)
+          ||(TrainType == dt_ET41))
 		{ //'ezt'
 			if ((CValue1 == 1))
 			{

Spring.cpp

@@ -41,7 +41,7 @@ Math3D::vector3 TSpring::ComputateForces( Math3D::vector3 const &pPosition1, Mat
     //		dist = VectorLength(&deltaP);					// Magnitude of
     // deltaP
     dist = deltaP.Length();
-    if (dist != 0.0 ) {
+    if( dist > 0.00001 ) {
 
         //		Hterm = (dist - spring->restLen) * spring->Ks;	// Ks * (dist - rest)
         Hterm = ( dist - restLen ) * Ks; // Ks * (dist - rest)

Train.cpp

@@ -3654,31 +3654,51 @@ void TTrain::UpdateMechPosition(double dt)
     // Granice mozna ustalic doswiadczalnie. Ja proponuje 14:20
     double const iVel = std::min( DynamicObject->GetVelocity(), 150.0 );
 
-    if( !Global.iSlowMotion // musi być pełna prędkość
+    if( ( false == Global.iSlowMotion ) // musi być pełna prędkość
-        && ( pMechOffset.y < 4.0 ) ) // Ra 15-01: przy oglądaniu pantografu bujanie przeszkadza
+     && ( pMechOffset.y < 4.0 ) ) // Ra 15-01: przy oglądaniu pantografu bujanie przeszkadza
     {
+        Math3D::vector3 shakevector;
+        if( ( mvOccupied->EngineType == DieselElectric )
+            || ( mvOccupied->EngineType == DieselEngine ) ) {
+            if( std::abs( mvOccupied->enrot ) > 0.0 ) {
+                // engine vibration
+                shakevector.x +=
+                    ( std::cos( mvOccupied->eAngle * 4.0 ) * dt * 2.0 )
+                    // fade in with rpm < 300
+                    * clamp(
+                        ( mvOccupied->enrot - 1.0 ) * 0.25,
+                        0.0, 1.0 )
+                    // fade out with rpm > 600
+                    * interpolate(
+                        1.0, 0.0,
+                        clamp(
+                            mvOccupied->enrot - 10.0,
+                            0.0, 1.0 ) );
+            }
+        }
         if( iVel > 0.5 ) {
             // acceleration-driven base shake
-            shake += 1.25 * MechSpring.ComputateForces(
+            shakevector += Math3D::vector3(
-                Math3D::vector3(
+                -mvOccupied->AccN * dt * 5.0, // highlight side sway
-                -mvControlled->AccN * dt * 5.0, // highlight side sway
+                -mvOccupied->AccVert * dt,
-                -mvControlled->AccVert * dt,
+                -mvOccupied->AccSVBased * dt * 1.25 ); // accent acceleration/deceleration
-                -mvControlled->AccSVBased * dt * 1.25 ), // accent acceleration/deceleration
-                pMechShake );
-
-            if( Random( iVel ) > 25.0 ) {
-                // extra shake at increased velocity
-                shake += MechSpring.ComputateForces(
-                    Math3D::vector3(
-                    ( Random( iVel * 2 ) - iVel ) / ( ( iVel * 2 ) * 4 ) * fMechSpringX,
-                    ( Random( iVel * 2 ) - iVel ) / ( ( iVel * 2 ) * 4 ) * fMechSpringY,
-                    ( Random( iVel * 2 ) - iVel ) / ( ( iVel * 2 ) * 4 ) * fMechSpringZ )
-                    * 1.25,
-                    pMechShake );
-                //                    * (( 200 - DynamicObject->MyTrack->iQualityFlag ) * 0.0075 ); // scale to 75-150% based on track quality
-            }
-//            shake *= 0.85;
         }
+
+        shake += 1.25 * MechSpring.ComputateForces( shakevector, pMechShake );
+
+        if( Random( iVel ) > 25.0 ) {
+            // extra shake at increased velocity
+            shake += MechSpring.ComputateForces(
+                Math3D::vector3(
+                ( Random( iVel * 2 ) - iVel ) / ( ( iVel * 2 ) * 4 ) * fMechSpringX,
+                ( Random( iVel * 2 ) - iVel ) / ( ( iVel * 2 ) * 4 ) * fMechSpringY,
+                ( Random( iVel * 2 ) - iVel ) / ( ( iVel * 2 ) * 4 ) * fMechSpringZ )
+                * 1.25,
+                pMechShake );
+            //                    * (( 200 - DynamicObject->MyTrack->iQualityFlag ) * 0.0075 ); // scale to 75-150% based on track quality
+        }
+        shake *= 0.85;
+
         vMechVelocity -= ( shake + vMechVelocity * 100 ) * ( fMechSpringX + fMechSpringY + fMechSpringZ ) / ( 200 );
         //        shake *= 0.95 * dt; // shake damping
 
@@ -4829,17 +4849,20 @@ bool TTrain::Update( double const Deltatime )
 
     // NOTE: crude way to have the pantographs go back up if they're dropped due to insufficient pressure etc
     // TODO: rework it into something more elegant, when redoing the whole consist/unit/cab etc arrangement
-    if( ( mvControlled->Battery )
+    if( false == DynamicObject->Mechanik->AIControllFlag ) {
-     || ( mvControlled->ConverterFlag ) ) {
+        // don't mess with the ai driving, at least not while switches don't follow ai-set vehicle state
-        if( ggPantAllDownButton.GetDesiredValue() < 0.05 ) {
+        if( ( mvControlled->Battery )
-            // the 'lower all' button overrides state of switches, while active itself
+         || ( mvControlled->ConverterFlag ) ) {
-            if( ( false == mvControlled->PantFrontUp )
+            if( ggPantAllDownButton.GetDesiredValue() < 0.05 ) {
-             && ( ggPantFrontButton.GetDesiredValue() >= 0.95 ) ) {
+                // the 'lower all' button overrides state of switches, while active itself
-                mvControlled->PantFront( true );
+                if( ( false == mvControlled->PantFrontUp )
-            }
+                 && ( ggPantFrontButton.GetDesiredValue() >= 0.95 ) ) {
-            if( ( false == mvControlled->PantRearUp )
+                    mvControlled->PantFront( true );
-             && ( ggPantRearButton.GetDesiredValue() >= 0.95 ) ) {
+                }
-                mvControlled->PantRear( true );
+                if( ( false == mvControlled->PantRearUp )
+                 && ( ggPantRearButton.GetDesiredValue() >= 0.95 ) ) {
+                    mvControlled->PantRear( true );
+                }
             }
         }
     }
@@ -4869,7 +4892,7 @@ bool TTrain::Update( double const Deltatime )
         m_radiomessages.erase(
             std::remove_if(
                 std::begin( m_radiomessages ), std::end( m_radiomessages ),
-                []( sound_source &source ) {
+                []( sound_source const &source ) {
                     return ( false == source.is_playing() ); } ),
             std::end( m_radiomessages ) );
     }