Skip to content

Commit a0dc483

Browse files
committed
Automatic merge of T1.5.1-922-g0a17d985e and 16 pull requests
- Pull request #570 at 3539862: Experimental glTF 2.0 support with PBR lighting - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder - Pull request #882 at 3ca0eb1: Blueprint/train car operations UI window - Pull request #885 at 42092cb: feat: Add notifications to Menu - Pull request #886 at 6c0785b: Scene viewer extension to TrackViewer - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains - Pull request #903 at 29f3d1a: Downloading route content (Github, zip) - Pull request #912 at f7b85e4: New Triple Valve Features Vol. 2 - Pull request #919 at 26cc6a8: Added mouse wheel support for controls which can be moved by pressing t… - Pull request #923 at cc1b5b6: Add curve squeal to route - Pull request #924 at 6c2c3cd: Default Asset Improvements - Pull request #925 at e3b1688: Fix brakeshoe force bug - Pull request #927 at cf687d4: AI Train Power Supply/Lights Fix - Pull request #928 at 1f23512: Fix Missing Initializations From Copy in MSTSLocomotive
18 parents bd05999 + 0a17d98 + 3539862 + d00beb9 + f92de76 + 3ca0eb1 + 42092cb + 6c0785b + 1f5ba4c + 5866028 + 29f3d1a + f7b85e4 + 26cc6a8 + cc1b5b6 + 6c2c3cd + e3b1688 + cf687d4 + 1f23512 commit a0dc483

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

Source/Orts.Formats.Msts/SoundManagmentFile.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ public Discrete_Trigger(STFReader f)
346346
public class Variable_Trigger : Trigger
347347
{
348348
public enum Events { Speed_Inc_Past, Speed_Dec_Past, Distance_Inc_Past, Distance_Dec_Past,
349-
Variable1_Inc_Past, Variable1_2_Inc_Past, Variable1_3_Inc_Past, Variable1_4_Inc_Past, Variable1_Dec_Past, Variable1_2_Dec_Past, Variable1_3_Dec_Past, Variable1_4_Dec_Past, Variable2_Inc_Past, Variable2_Dec_Past, Variable3_Inc_Past, Variable3_Dec_Past, BrakeCyl_Inc_Past, BrakeCyl_Dec_Past, CurveForce_Inc_Past, CurveForce_Dec_Past
349+
Variable1_Inc_Past, Variable1_2_Inc_Past, Variable1_3_Inc_Past, Variable1_4_Inc_Past, Variable1_Dec_Past, Variable1_2_Dec_Past, Variable1_3_Dec_Past, Variable1_4_Dec_Past, Variable2_Inc_Past, Variable2_Dec_Past, Variable3_Inc_Past, Variable3_Dec_Past, BrakeCyl_Inc_Past, BrakeCyl_Dec_Past, CurveForce_Inc_Past, CurveForce_Dec_Past, AngleofAttack_Inc_Past, AngleofAttack_Dec_Past
350350
};
351351

352352
public Events Event;
@@ -392,6 +392,8 @@ public Variable_Trigger(STFReader f)
392392
case "brakecyl_dec_past": Event = Events.BrakeCyl_Dec_Past; break;
393393
case "curveforce_inc_past": Event = Events.CurveForce_Inc_Past; break;
394394
case "curveforce_dec_past": Event = Events.CurveForce_Dec_Past; break;
395+
case "angleofattack_inc_past": Event = Events.AngleofAttack_Inc_Past; break;
396+
case "angleofattack_dec_past": Event = Events.AngleofAttack_Dec_Past; break;
395397
}
396398

397399

Source/RunActivity/Viewer3D/Sound.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1951,6 +1951,7 @@ public override void TryTrigger( )
19511951
case Orts.Formats.Msts.Variable_Trigger.Events.Variable3_Dec_Past:
19521952
case Orts.Formats.Msts.Variable_Trigger.Events.BrakeCyl_Dec_Past:
19531953
case Orts.Formats.Msts.Variable_Trigger.Events.CurveForce_Dec_Past:
1954+
case Orts.Formats.Msts.Variable_Trigger.Events.AngleofAttack_Dec_Past:
19541955
if (newValue < SMS.Threshold)
19551956
{
19561957
Signaled = true;
@@ -1968,6 +1969,7 @@ public override void TryTrigger( )
19681969
case Orts.Formats.Msts.Variable_Trigger.Events.Variable3_Inc_Past:
19691970
case Orts.Formats.Msts.Variable_Trigger.Events.BrakeCyl_Inc_Past:
19701971
case Orts.Formats.Msts.Variable_Trigger.Events.CurveForce_Inc_Past:
1972+
case Orts.Formats.Msts.Variable_Trigger.Events.AngleofAttack_Inc_Past:
19711973
if (newValue > SMS.Threshold)
19721974
{
19731975
Signaled = true;
@@ -2051,6 +2053,9 @@ private float ReadValue()
20512053
case Orts.Formats.Msts.Variable_Trigger.Events.CurveForce_Dec_Past:
20522054
case Orts.Formats.Msts.Variable_Trigger.Events.CurveForce_Inc_Past:
20532055
return car.CurveForceNFiltered;
2056+
case Orts.Formats.Msts.Variable_Trigger.Events.AngleofAttack_Dec_Past:
2057+
case Orts.Formats.Msts.Variable_Trigger.Events.AngleofAttack_Inc_Past:
2058+
return car.CurveSquealAoAmRadFiltered;
20542059
default:
20552060
return 0;
20562061
}

0 commit comments

Comments
 (0)