Adjustment to air hose display

Author: peternewell

Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs

@@ -248,6 +248,11 @@ public static Interpolator SteamHeatBoilerFuelUsageGalukpH()
         public float RearAirHoseDisconnectedAnimWidthM;
         public float RearAirHoseDisconnectedAnimHeightM;
 
+        public float FrontAirHoseHeightAdjustmentM;
+        public float RearAirHoseHeightAdjustmentM;
+        public float FrontAirHoseAngleAdjustmentRad;
+        public float RearAirHoseAngleAdjustmentRad;
+
         // Used to calculate Carriage Steam Heat Loss
         public const float BogieHeightM = 1.06f; // Height reduced by 1.06m to allow for bogies, etc
         public const float CarCouplingPipeM = 1.2f;  // Allow for connection between cars (assume 2' each end) - no heat is contributed to carriages.
@@ -1270,6 +1275,68 @@ public void UpdateTrainDerailmentRisk()
                         CarAhead.WagonRearCouplerAngleRad = 0;
                     }
                 }
+
+                // Calculate airhose angles and height
+                var airhoselengthM = 1.0f; // 2' = 600mm  - Note if air hose length is less then coupler distance then NaN occurs
+                var rearairhoseheightadjustmentreferenceM = (float)Math.Sqrt((float)Math.Pow(airhoselengthM, 2) - (float)Math.Pow(CouplerDistanceThisCarM, 2));
+                var frontairhoseheightadjustmentreferenceM = (float)Math.Sqrt((float)Math.Pow(airhoselengthM, 2) - (float)Math.Pow(CouplerDistanceBehindCarM, 2));
+
+                RearAirHoseHeightAdjustmentM =  (float)Math.Sqrt( (float)Math.Pow(airhoselengthM, 2) - (float)Math.Pow((CouplerDistanceThisCarM + CouplerSlackM / 2.0f), 2));
+                CarBehind.FrontAirHoseHeightAdjustmentM = (float)Math.Sqrt((float)Math.Pow(airhoselengthM, 2) - (float)Math.Pow((CouplerDistanceBehindCarM + CouplerSlackM / 2.0f), 2));
+//                Trace.TraceInformation("Rear AirHose Heights - CarID {0} R {1} length {2} CouplerDistance {3} Slack {4}", CarID, RearAirHoseHeightAdjustmentM, airhoselengthM, CouplerDistanceThisCarM, CouplerSlackM / 2.0f);
+
+//                Trace.TraceInformation("Front AirHose Heights - CarID {0} F {1} length {2} CouplerDistance {3} Slack {4}", CarID, CarBehind.FrontAirHoseHeightAdjustmentM, airhoselengthM, CouplerDistanceBehindCarM, CouplerSlackM / 2.0f);
+
+                // refererence adjustment heights to rest position
+                if (RearAirHoseHeightAdjustmentM >= rearairhoseheightadjustmentreferenceM)
+                {
+                    RearAirHoseHeightAdjustmentM -= rearairhoseheightadjustmentreferenceM;
+                }
+                else
+                {
+                    RearAirHoseHeightAdjustmentM = rearairhoseheightadjustmentreferenceM - RearAirHoseHeightAdjustmentM;
+                }
+
+                if (CarBehind.FrontAirHoseHeightAdjustmentM >= frontairhoseheightadjustmentreferenceM)
+                {
+                    CarBehind.FrontAirHoseHeightAdjustmentM -= frontairhoseheightadjustmentreferenceM;
+                }
+                else
+                {
+                    CarBehind.FrontAirHoseHeightAdjustmentM = frontairhoseheightadjustmentreferenceM - CarBehind.FrontAirHoseHeightAdjustmentM;
+                }
+
+                var rearairhoseangleadjustmentreferenceRad = (float)Math.Cos(CouplerDistanceThisCarM / airhoselengthM);
+                var frontairhoseangleadjustmentreferenceRad = (float)Math.Cos(CouplerDistanceBehindCarM / airhoselengthM);
+
+                RearAirHoseAngleAdjustmentRad = (float)Math.Cos((CouplerDistanceThisCarM + CouplerSlackM / 2.0f)/ airhoselengthM);
+                CarBehind.FrontAirHoseAngleAdjustmentRad = (float)Math.Cos((CouplerDistanceBehindCarM + CouplerSlackM / 2.0f) / airhoselengthM);
+
+//                Trace.TraceInformation("Angle Adjustment Rear - CarID {0} Adj {1} CouplerDist {2} Slack {3} Length {4} Ref {5}", CarID, RearAirHoseAngleAdjustmentRad, CouplerDistanceThisCarM, CouplerSlackM / 2.0f, airhoselengthM, rearairhoseangleadjustmentreferenceRad);
+
+//                Trace.TraceInformation("Angle Adjustment Front - CarID {0} Adj {1} CouplerDist {2} Slack {3} Length {4} Ref {5}", CarID, CarBehind.FrontAirHoseAngleAdjustmentRad, CouplerDistanceBehindCarM, CouplerSlackM / 2.0f, airhoselengthM, frontairhoseangleadjustmentreferenceRad);
+
+                // refererence adjustment angles to rest position
+                if (RearAirHoseAngleAdjustmentRad >= rearairhoseangleadjustmentreferenceRad)
+                {
+                    RearAirHoseAngleAdjustmentRad -= rearairhoseangleadjustmentreferenceRad;
+                }
+                else
+                {
+                    RearAirHoseAngleAdjustmentRad = rearairhoseangleadjustmentreferenceRad - RearAirHoseAngleAdjustmentRad;
+                }
+
+                if (CarBehind.FrontAirHoseAngleAdjustmentRad >= frontairhoseangleadjustmentreferenceRad)
+                {
+                    CarBehind.FrontAirHoseAngleAdjustmentRad -= frontairhoseangleadjustmentreferenceRad;
+                }
+                else
+                {
+                    CarBehind.FrontAirHoseAngleAdjustmentRad = frontairhoseangleadjustmentreferenceRad - CarBehind.FrontAirHoseAngleAdjustmentRad;
+                }
+
+//                Trace.TraceInformation("CarID {0} FrontAdj {1} RearAdj {2}", CarID, CarBehind.FrontAirHoseAngleAdjustmentRad, RearAirHoseAngleAdjustmentRad);
+
             }
 
             // Train will derail if lateral forces on the train exceed the vertical forces holding the train on the railway track.

Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs

@@ -1030,22 +1030,22 @@ private void UpdateCouplers(RenderFrame frame, ElapsedTime elapsedTime)
             // Display front airhose in sim if open coupler shape is configured, otherwise skip to next section, and just display closed (default) coupler if configured
             if (FrontAirHoseShape != null && !(Viewer.Camera.AttachedCar == this.MSTSWagon && Viewer.Camera.Style == Camera.Styles.ThreeDimCab))
             {
-                // Get the movement that would be needed to locate the coupler on the car if they were pointing in the default direction.
-                var displacement = new Vector3
-                {
-                    X = Car.FrontAirHoseAnimWidthM,
-                    Y = Car.FrontAirHoseAnimHeightM,
-                    Z = (Car.FrontAirHoseAnimLengthM + (Car.CarLengthM / 2.0f))  // Reversed as this is the rear coupler of the wagon
-                };
 
                 if (Car.CarAhead != null) // Display animated coupler if there is a car behind this car
                 {
+                    // Get the movement that would be needed to locate the air hose on the car if they were pointing in the default direction.
+                    var displacement = new Vector3
+                    {
+                        X = Car.FrontAirHoseAnimWidthM,
+                        Y = Car.FrontAirHoseAnimHeightM + Car.FrontAirHoseHeightAdjustmentM,
+                        Z = (Car.FrontCouplerAnimLengthM + (Car.CarLengthM / 2.0f) + Car.FrontCouplerSlackM)
+                    };
+
                     var quaternion = PositionCoupler(Car, FrontAirHoseShape, displacement);
 
                     var quaternionCar = new Quaternion(quaternion.X, quaternion.Y, quaternion.Z, quaternion.W);
 
-                    var maximumCouplerExtension = Me.FromIn(3.0f);
-                    var AirHoseAngleRadians = (Car.CouplerSlackM / maximumCouplerExtension) * 0.174533f;
+                    var AirHoseAngleRadians = Car.FrontAirHoseAngleAdjustmentRad;
 
                     AlignCouplerWithCar(Car, FrontAirHoseShape);
 
@@ -1057,6 +1057,14 @@ private void UpdateCouplers(RenderFrame frame, ElapsedTime elapsedTime)
                 }
                 else if (FrontAirHoseDisconnectedShape != null && Car.RearCouplerOpenFitted && Car.RearCouplerOpen) // Display open coupler if no car is behind car, and an open coupler shape is present
                 {
+                    // Get the movement that would be needed to locate the air hose on the car if they were pointing in the default direction.
+                    var displacement = new Vector3
+                    {
+                        X = Car.FrontAirHoseAnimWidthM,
+                        Y = Car.FrontAirHoseAnimHeightM,
+                        Z = (Car.FrontCouplerAnimLengthM + (Car.CarLengthM / 2.0f) + Car.FrontCouplerSlackM)
+                    };
+
                     var quaternion = PositionCoupler(Car, FrontAirHoseDisconnectedShape, displacement);
 
                     AlignCouplerWithCar(Car, FrontAirHoseDisconnectedShape);
@@ -1066,6 +1074,13 @@ private void UpdateCouplers(RenderFrame frame, ElapsedTime elapsedTime)
                 }
                 else //Display closed static coupler by default if other conditions not met
                 {
+                    // Get the movement that would be needed to locate the air hose on the car if they were pointing in the default direction.
+                    var displacement = new Vector3
+                    {
+                        X = Car.FrontAirHoseAnimWidthM,
+                        Y = Car.FrontAirHoseAnimHeightM,
+                        Z = (Car.FrontCouplerAnimLengthM + (Car.CarLengthM / 2.0f) + Car.FrontCouplerSlackM)
+                    };
                     var quaternion = PositionCoupler(Car, FrontAirHoseShape, displacement);
 
                     AlignCouplerWithCar(Car, FrontAirHoseShape);
@@ -1079,22 +1094,22 @@ private void UpdateCouplers(RenderFrame frame, ElapsedTime elapsedTime)
             // Display rear airhose in sim if open coupler shape is configured, otherwise skip to next section, and just display closed (default) coupler if configured
             if (RearAirHoseShape != null && !(Viewer.Camera.AttachedCar == this.MSTSWagon && Viewer.Camera.Style == Camera.Styles.ThreeDimCab))
             {
-                // Get the movement that would be needed to locate the coupler on the car if they were pointing in the default direction.
-                var displacement = new Vector3
-                {
-                    X = Car.RearAirHoseAnimWidthM,
-                    Y = Car.RearAirHoseAnimHeightM,
-                    Z = -(Car.RearAirHoseAnimLengthM + (Car.CarLengthM / 2.0f))  // Reversed as this is the rear coupler of the wagon
-                };
 
-                if (Car.CarBehind != null) // Display animated coupler if there is a car behind this car
+                if (Car.CarBehind != null) // Display animated air hose if there is a car behind this car
                 {
+                    // Get the movement that would be needed to locate the air hose on the car if they were pointing in the default direction.
+                    var displacement = new Vector3
+                    {
+                        X = Car.RearAirHoseAnimWidthM,
+                        Y = Car.RearAirHoseAnimHeightM + Car.RearAirHoseHeightAdjustmentM,
+                        Z = -(Car.RearCouplerAnimLengthM + (Car.CarLengthM / 2.0f) + Car.RearCouplerSlackM)  // Reversed as this is the rear coupler of the wagon
+                    };
+
                     var quaternion = PositionCoupler(Car, RearAirHoseShape, displacement);
 
                     var quaternionCar = new Quaternion(quaternion.X, quaternion.Y, quaternion.Z, quaternion.W);
 
-                    var maximumCouplerExtension = Me.FromIn(3.0f);
-                    var AirHoseAngleRadians = -(Car.CouplerSlackM / maximumCouplerExtension) * 0.174533f;
+                    var AirHoseAngleRadians = -Car.RearAirHoseAngleAdjustmentRad;
 
                     AlignCouplerWithCar(Car, RearAirHoseShape);
 
@@ -1104,17 +1119,33 @@ private void UpdateCouplers(RenderFrame frame, ElapsedTime elapsedTime)
                     RearAirHoseShape.PrepareFrame(frame, elapsedTime);
 
                 }
-                else if (RearAirHoseDisconnectedShape != null && Car.RearCouplerOpenFitted && Car.RearCouplerOpen) // Display open coupler if no car is behind car, and an open coupler shape is present
+                else if (RearAirHoseDisconnectedShape != null && Car.RearCouplerOpenFitted && Car.RearCouplerOpen) // Display single air hose if no car is behind car, and an open air hose shape is present
                 {
+                    // Get the movement that would be needed to locate the air hose on the car if they were pointing in the default direction.
+                    var displacement = new Vector3
+                    {
+                        X = Car.RearAirHoseAnimWidthM,
+                        Y = Car.RearAirHoseAnimHeightM,
+                        Z = -(Car.RearCouplerAnimLengthM + (Car.CarLengthM / 2.0f) + Car.RearCouplerSlackM)  // Reversed as this is the rear coupler of the wagon
+                    };
+
                     var quaternion = PositionCoupler(Car, RearAirHoseDisconnectedShape, displacement);
 
                     AlignCouplerWithCar(Car, RearAirHoseDisconnectedShape);
 
                     // Display Animation Shape                    
                     RearAirHoseDisconnectedShape.PrepareFrame(frame, elapsedTime);
                 }
-                else //Display closed static coupler by default if other conditions not met
+                else //Display closed static air hose by default if other conditions not met
                 {
+                    // Get the movement that would be needed to locate the air hose on the car if they were pointing in the default direction.
+                    var displacement = new Vector3
+                    {
+                        X = Car.RearAirHoseAnimWidthM,
+                        Y = Car.RearAirHoseAnimHeightM,
+                        Z = -(Car.RearCouplerAnimLengthM + (Car.CarLengthM / 2.0f) + Car.RearCouplerSlackM)  // Reversed as this is the rear coupler of the wagon
+                    };
+
                     var quaternion = PositionCoupler(Car, RearAirHoseShape, displacement);
 
                     AlignCouplerWithCar(Car, RearAirHoseShape);