Merge pull request #585 from cjakeman/menu-options02b

cjakeman · web-flow · commit 84cd5e18441c · 2022-02-14T08:55:39.000Z
02b: Removed menu option checkFastFullScreenAltTab
diff --git a/Source/Documentation/Manual/driving.rst b/Source/Documentation/Manual/driving.rst
@@ -25,6 +25,33 @@ your train will be in motion or stopped. To look around in the simulation, you
 can select different views using the keyboard, as described in 
 :ref:`Changing the View <driving-changing-view>`.
 
+Cab Letter-Boxing
+----------------
+
+OR manages not only cab interiors using 2D images in a MSTS-compatible
+way, but also supports 3D models. Most 2D cab images follow MSTS practice,
+being 1024 x 768 pixels to suit monitors with a 4:3 aspect ratio.
+
+.. image:: images/options-2dstretch_1.png
+
+So, the problem arises -- how to display these 4:3 cabs on a 16:9 or 16:10
+monitor?
+
+One possibility is to enlarge these images to fill the width of wider monitors, 
+as shown in the image below.
+
+In doing so, we lose a portion from the top and bottom of the image. 
+You can use the Up and Down Arrow keys to pan and reveal these missing portions.
+
+.. image:: images/options-2dstretch_2.png
+
+Instead of enlarging the image, OR can also 'letterbox' it by showing the full height
+and filling the missing space with black bars. 
+You can activate this mode in-game by pressing Ctrl+1.
+
+.. image:: images/options-2dstretch_3.png
+
+
 Open Rails Driving Controls
 ===========================
 
diff --git a/Source/Documentation/Manual/images/options-video.png b/Source/Documentation/Manual/images/options-video.png
diff --git a/Source/Documentation/Manual/options.rst b/Source/Documentation/Manual/options.rst
@@ -242,22 +242,6 @@ Note: This may reduce the frame rate.
 Note: Static objects provided with shadows (in the file <route>.ref) 
 will cast shadows anyway. This option adds shadows for other static objects.
 
-
-.. _options-fullscreen:
-
-Fast full-screen Alt+Tab
-------------------------
-
-When this option is selected, and OR is running full-screen, pressing
-Alt+Tab leaves OR full-screen and running, and allows the
-:ref:`Dispatcher Window <driving-dispatcher>` to be shown in front of it. 
-If this option is not selected, OR is minimized. 
-Each successive press of Alt+Tab will toggle between the map window
-and the OR window.
-
-Note: To display the Map Window, the :ref:`Map window option <options-map-window>` 
-must also be selected and the Map Window started with Ctrl+9.
-
 Glass on in-game windows
 ------------------------
 
@@ -299,41 +283,6 @@ may see stuttering or image "tearing". To prevent this, either turn off
 the VSync option or reduce the values for video options such as view 
 distance, anti-aliasing, or world object density.
 
-.. _options-cab-stretch:
-
-% Cab 2D stretch
-----------------
-
-OR manages not only cab interiors using 2D images in a MSTS-compatible
-way, but also supports 3D models. Most 2D cab images follow MSTS practice,
-being 1024 x 768 pixels to suit monitors with a 4:3 aspect ratio.
-
-So, the problem arises -- how to display these 4:3 cabs on a 16:9 or 16:10
-monitor?
-
-One possibility is to stretch these images horizontally to match other
-aspect ratios, as shown in the image below.
-
-.. image:: images/options-2dstretch_1.png
-
-To respect the proportions however, by default OR does no stretching and
-shows the full width of the cab interior, thus losing a portion from the
-top and bottom of the image. You can use the Up and Down Arrow keys to pan
-and reveal these missing portions.
-
-Therefore the setting for % Cab 2D Stretch has a default value of 0
-providing no stretching and a maximum value of 100 which stretches the
-picture so as to cover the complete display. Intermediate values provide a
-blend of panning and stretching.
-
-.. image:: images/options-2dstretch_2.png
-
-OR can also pillarbox or letterbox the cab by filling the missing space with 
-black bars. You can activate this mode in-game by pressing Ctrl+1. It overrides 
-any stretching.
-
-.. image:: images/options-2dstretch_3.png
-
 Viewing distance
 ----------------
 
diff --git a/Source/Menu/Options.Designer.cs b/Source/Menu/Options.Designer.cs
diff --git a/Source/Menu/Options.cs b/Source/Menu/Options.cs
@@ -163,12 +163,10 @@ public OptionsForm(UserSettings settings, UpdateManager updateManager, bool init
             // Video tab
             checkDynamicShadows.Checked = Settings.DynamicShadows;
             checkShadowAllShapes.Checked = Settings.ShadowAllShapes;
-            checkFastFullScreenAltTab.Checked = Settings.FastFullScreenAltTab;
             checkWindowGlass.Checked = Settings.WindowGlass;
             checkModelInstancing.Checked = Settings.ModelInstancing;
             checkWire.Checked = Settings.Wire;
             checkVerticalSync.Checked = Settings.VerticalSync;
-            numericCab2DStretch.Value = Settings.Cab2DStretch;
             numericViewingDistance.Value = Settings.ViewingDistance;
             checkDistantMountains.Checked = Settings.DistantMountains;
             labelDistantMountainsViewingDistance.Enabled = checkDistantMountains.Checked;
@@ -454,12 +452,10 @@ void buttonOK_Click(object sender, EventArgs e)
             // Video tab
             Settings.DynamicShadows = checkDynamicShadows.Checked;
             Settings.ShadowAllShapes = checkShadowAllShapes.Checked;
-            Settings.FastFullScreenAltTab = checkFastFullScreenAltTab.Checked;
             Settings.WindowGlass = checkWindowGlass.Checked;
             Settings.ModelInstancing = checkModelInstancing.Checked;
             Settings.Wire = checkWire.Checked;
             Settings.VerticalSync = checkVerticalSync.Checked;
-            Settings.Cab2DStretch = (int)numericCab2DStretch.Value;
             Settings.ViewingDistance = (int)numericViewingDistance.Value;
             Settings.DistantMountains = checkDistantMountains.Checked;
             Settings.DistantMountainsViewingDistance = (int)numericDistantMountainsViewingDistance.Value * 1000;
diff --git a/Source/Menu/Options.resx b/Source/Menu/Options.resx
@@ -120,7 +120,13 @@
   <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <metadata name="bindingSourceContent.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>114, 17</value>
   </metadata>
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>
diff --git a/Source/ORTS.Settings/UserSettings.cs b/Source/ORTS.Settings/UserSettings.cs
@@ -186,8 +186,6 @@ public enum DirectXFeature
         public bool DisableTCSScripts { get; set; }
 
         // Audio settings:
-        [Default(true)]
-        public bool MSTSBINSound { get; set; }
         [Default(100)]
         public int SoundVolumePercent { get; set; }
         [Default(5)]
@@ -201,17 +199,13 @@ public enum DirectXFeature
         [Default(false)]
         public bool ShadowAllShapes { get; set; }
         [Default(false)]
-        public bool FastFullScreenAltTab { get; set; }
-        [Default(false)]
         public bool WindowGlass { get; set; }
         [Default(false)]
         public bool ModelInstancing { get; set; }
         [Default(true)]
         public bool Wire { get; set; }
         [Default(false)]
         public bool VerticalSync { get; set; }
-        [Default(0)]
-        public int Cab2DStretch { get; set; }
         [Default(2000)]
         public int ViewingDistance { get; set; }
         [Default(true)]
diff --git a/Source/Orts.Simulation/Common/Events.cs b/Source/Orts.Simulation/Common/Events.cs
@@ -268,7 +268,7 @@ public enum Source
         // MSTS/MSTSBin behaviour whenever possible. NEVER return values for
         // non-MSTS events when passed an MSTS Source.
 
-        public static Event From(bool mstsBinEnabled, Source source, int eventID)
+        public static Event From(Source source, int eventID)
         {
             switch (source)
             {
diff --git a/Source/RunActivity/Viewer3D/Cameras.cs b/Source/RunActivity/Viewer3D/Cameras.cs
@@ -2040,7 +2040,7 @@ public void Initialize()
                 float fovFactor = 1f - Math.Max((float)Viewer.CabXLetterboxPixels / Viewer.DisplaySize.X, (float)Viewer.CabYLetterboxPixels / Viewer.DisplaySize.Y);
                 FieldOfView = MathHelper.ToDegrees((float)(2 * Math.Atan(fovFactor * Math.Tan(MathHelper.ToRadians(Viewer.Settings.ViewingFOV / 2)))));
             }
-            else if (Viewer.Settings.Cab2DStretch == 0 && Viewer.CabExceedsDisplayHorizontally <= 0)
+            else if (Viewer.CabExceedsDisplayHorizontally <= 0)
             {
                 // We must modify FOV to get correct lookout
                     FieldOfView = MathHelper.ToDegrees((float)(2 * Math.Atan((float)Viewer.DisplaySize.Y / Viewer.DisplaySize.X / Viewer.CabTextureInverseRatio * Math.Tan(MathHelper.ToRadians(Viewer.Settings.ViewingFOV / 2)))));
diff --git a/Source/RunActivity/Viewer3D/Processes/RenderProcess.cs b/Source/RunActivity/Viewer3D/Processes/RenderProcess.cs
@@ -100,7 +100,7 @@ internal RenderProcess(Game game)
             GraphicsDeviceManager.PreferredDepthStencilFormat = DepthFormat.Depth24Stencil8;
             GraphicsDeviceManager.IsFullScreen = Game.Settings.FullScreen;
             GraphicsDeviceManager.PreferMultiSampling = (AntiAliasingMethod)Game.Settings.AntiAliasing != AntiAliasingMethod.None;
-            GraphicsDeviceManager.HardwareModeSwitch = !Game.Settings.FastFullScreenAltTab;
+            GraphicsDeviceManager.HardwareModeSwitch = false; // for fast full-screen Alt-Tab switching
             GraphicsDeviceManager.PreparingDeviceSettings += new EventHandler<PreparingDeviceSettingsEventArgs>(GDM_PreparingDeviceSettings);
         }
 
diff --git a/Source/RunActivity/Viewer3D/Sound.cs b/Source/RunActivity/Viewer3D/Sound.cs
@@ -1620,7 +1620,7 @@ public class ORTSDiscreteTrigger: ORTSTrigger, Orts.Common.EventHandler
 
         public ORTSDiscreteTrigger(SoundStream soundStream, Events.Source eventSound, Orts.Formats.Msts.Discrete_Trigger smsData, UserSettings settings)
         {
-            TriggerID = Events.From(settings.MSTSBINSound, eventSound, smsData.TriggerID);
+            TriggerID = Events.From(eventSound, smsData.TriggerID);
             SoundCommand = ORTSSoundCommand.FromMSTS(smsData.SoundCommand, soundStream);
             SoundStream = soundStream;
         }
diff --git a/Source/RunActivity/Viewer3D/Viewer.cs b/Source/RunActivity/Viewer3D/Viewer.cs
@@ -203,13 +203,9 @@ enum VisibilityState
 
         // MSTS cab views are images with aspect ratio 4:3.
         // OR can use cab views with other aspect ratios where these are available.
-        // On screen with other aspect ratios (e.g. 16:9), three approaches are possible:
-        //   1) stretch the width to fit the screen. This gives flattened controls, most noticeable with round dials.
-        //   2) clip the image losing a slice off top and bottom.
-        //   3) letterbox the image by drawing black bars in the unfilled spaces.
-        // Setting.Cab2DStretch controls the amount of stretch and clip. 0 is entirely clipped and 100 is entirely stretched.
-        // No difference is seen on screens with 4:3 aspect ratio.
-        // This adjustment assumes that the cab view is 4:3. Where the cab view matches the aspect ratio of the screen, use an adjustment of 100.
+        // On screen with other aspect ratios (e.g. 16:9), two approaches are possible:
+        //   1) clip the image losing a slice off top and bottom. Use arrow keys to bring these slices into view.
+        //   2) letterbox the image by drawing black bars in the unfilled spaces.
         public int CabHeightPixels { get; private set; }
         public int CabWidthPixels { get; private set; }
         public int CabYOffsetPixels { get; set; } // Note: Always -ve. Without it, the cab view is fixed to the top of the screen. -ve values pull it up the screen.
@@ -703,11 +699,9 @@ public void AdjustCabHeight(int windowWidth, int windowHeight)
             // MSTS cab views are designed for 4:3 aspect ratio. This is the default. However a check is done with the actual
             // cabview texture. If this has a different aspect ratio, that one is considered
             // For wider screens (e.g. 16:9), the height of the cab view before adjustment exceeds the height of the display.
-            // The user can decide how much of this excess to keep. Setting of 0 keeps all the excess and 100 keeps none.
 
-            // <CSComment> If the aspect ratio of the viewing window is greater than the aspect ratio of the cabview texture file
-            // it is either possible to stretch the cabview texture file or to leave the proportions unaltered and to vertically pan
-            // the screen
+            // <CSComment> If the aspect ratio of the viewing window is greater than the aspect ratio of the cabview texture file,
+            // it is possible to vertically pan the screen.
             if (CabCamera.IsAvailable)
             {
                 var i = ((PlayerLocomotive as MSTSLocomotive).UsingRearCab) ? 1 : 0;
@@ -737,7 +731,7 @@ public void AdjustCabHeight(int windowWidth, int windowHeight)
                 else if (windowInverseRatio < CabTextureInverseRatio)
                 {
                     // screen is wide-screen, so can choose between vertical scroll or horizontal stretch
-                    CabExceedsDisplay = (int)((unstretchedCabHeightPixels - windowHeight) * ((100 - Settings.Cab2DStretch) / 100f));
+                    CabExceedsDisplay = (int)(unstretchedCabHeightPixels - windowHeight);
                     CabExceedsDisplayHorizontally = 0;
                 }
                 else

Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ public enum Source`
`268`	`268`	`// MSTS/MSTSBin behaviour whenever possible. NEVER return values for`
`269`	`269`	`// non-MSTS events when passed an MSTS Source.`
`270`	`270`
`271`		`- public static Event From(bool mstsBinEnabled, Source source, int eventID)`
	`271`	`+ public static Event From(Source source, int eventID)`
`272`	`272`	`{`
`273`	`273`	`switch (source)`
`274`	`274`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2040,7 +2040,7 @@ public void Initialize()`
`2040`	`2040`	`float fovFactor = 1f - Math.Max((float)Viewer.CabXLetterboxPixels / Viewer.DisplaySize.X, (float)Viewer.CabYLetterboxPixels / Viewer.DisplaySize.Y);`
`2041`	`2041`	`FieldOfView = MathHelper.ToDegrees((float)(2 * Math.Atan(fovFactor * Math.Tan(MathHelper.ToRadians(Viewer.Settings.ViewingFOV / 2)))));`
`2042`	`2042`	`}`
`2043`		`- else if (Viewer.Settings.Cab2DStretch == 0 && Viewer.CabExceedsDisplayHorizontally <= 0)`
	`2043`	`+ else if (Viewer.CabExceedsDisplayHorizontally <= 0)`
`2044`	`2044`	`{`
`2045`	`2045`	`// We must modify FOV to get correct lookout`
`2046`	`2046`	`FieldOfView = MathHelper.ToDegrees((float)(2 * Math.Atan((float)Viewer.DisplaySize.Y / Viewer.DisplaySize.X / Viewer.CabTextureInverseRatio * Math.Tan(MathHelper.ToRadians(Viewer.Settings.ViewingFOV / 2)))));`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ internal RenderProcess(Game game)`
`100`	`100`	`GraphicsDeviceManager.PreferredDepthStencilFormat = DepthFormat.Depth24Stencil8;`
`101`	`101`	`GraphicsDeviceManager.IsFullScreen = Game.Settings.FullScreen;`
`102`	`102`	`GraphicsDeviceManager.PreferMultiSampling = (AntiAliasingMethod)Game.Settings.AntiAliasing != AntiAliasingMethod.None;`
`103`		`- GraphicsDeviceManager.HardwareModeSwitch = !Game.Settings.FastFullScreenAltTab;`
	`103`	`+ GraphicsDeviceManager.HardwareModeSwitch = false; // for fast full-screen Alt-Tab switching`
`104`	`104`	`GraphicsDeviceManager.PreparingDeviceSettings += new EventHandler<PreparingDeviceSettingsEventArgs>(GDM_PreparingDeviceSettings);`
`105`	`105`	`}`
`106`	`106`