Merge pull request #591 from cjakeman/menu-options02i

02i: Removed menu option ConditionalLoadOfDayOrNightTextures. Now always conditional.

Author: cjakeman

Source/Documentation/Manual/images/options-experimental.png

@@ -620,17 +620,6 @@ When this option is selected, when OR is loading the shape (.s) files it
 will report errors in syntax and structure (even if these don't cause
 runtime errors) in the :ref:`Log file <driving-logfile>` ``OpenRailsLog.txt`` on the desktop.
 
-Load day/night textures only when needed
-----------------------------------------
-
-As a default OR loads night textures together with the day textures both at
-daytime and nighttime. When this option is selected, to reduce loading time and reduce
-memory used, night textures are not loaded in the daytime and are only
-loaded at sunset (if the game continues through sunset time); analogously day
-textures are not loaded in the nighttime if the related night textures are
-available, and are only loaded at sunrise (if the game continues through sunrise
-time).
-
 Signal light glow
 -----------------
 

Source/Documentation/Manual/options.rst

@@ -316,7 +316,6 @@ orderby folder.Key
             numericPerformanceTunerTarget.Value = Settings.PerformanceTunerTarget;
             trackLODBias.Value = Settings.LODBias;
             trackLODBias_ValueChanged(null, null);
-            checkConditionalLoadOfNightTextures.Checked = Settings.ConditionalLoadOfDayOrNightTextures;
             checkSignalLightGlow.Checked = Settings.SignalLightGlow;
             checkPreferDDSTexture.Checked = Settings.PreferDDSTexture;
             checkUseLocationPassingPaths.Checked = Settings.UseLocationPassingPaths;
@@ -509,7 +508,6 @@ void buttonOK_Click(object sender, EventArgs e)
             Settings.PerformanceTuner = checkPerformanceTuner.Checked;
             Settings.PerformanceTunerTarget = (int)numericPerformanceTunerTarget.Value;
             Settings.LODBias = trackLODBias.Value;
-            Settings.ConditionalLoadOfDayOrNightTextures = checkConditionalLoadOfNightTextures.Checked;
             Settings.SignalLightGlow = checkSignalLightGlow.Checked;
             Settings.PreferDDSTexture = checkPreferDDSTexture.Checked;
             Settings.UseLocationPassingPaths = checkUseLocationPassingPaths.Checked;

Source/Menu/Options.Designer.cs

@@ -123,7 +123,4 @@
   <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>

Source/Menu/Options.cs

@@ -324,8 +324,6 @@ public enum DirectXFeature
         public bool AdhesionProportionalToWeather { get; set; }
         [Default(false)]
         public bool NoForcedRedAtStationStops { get; set; }
-        [Default(false)]
-        public bool ConditionalLoadOfDayOrNightTextures { get; set; }
         [Default(100)]
         public int PrecipitationBoxHeight { get; set; }
         [Default(500)]

Source/Menu/Options.resx

@@ -723,21 +723,21 @@ public SceneryMaterial(Viewer viewer, string texturePath, SceneryMaterialOptions
             Texture = SharedMaterialManager.MissingTexture;
             NightTexture = SharedMaterialManager.MissingTexture;
             // <CSComment> if "trainset" is in the path (true for night textures for 3DCabs) deferred load of night textures is disabled 
-            if (!String.IsNullOrEmpty(texturePath) && (Options & SceneryMaterialOptions.NightTexture) != 0 && ((!viewer.DontLoadNightTextures && !viewer.DontLoadDayTextures) 
+            if (!String.IsNullOrEmpty(texturePath) && (Options & SceneryMaterialOptions.NightTexture) != 0 && ((!viewer.IsDaytime && !viewer.IsNighttime) 
                 || TexturePath.Contains(@"\trainset\")))
             {
                 var nightTexturePath = Helpers.GetNightTextureFile(Viewer.Simulator, texturePath);
                 if (!String.IsNullOrEmpty(nightTexturePath))
                     NightTexture = Viewer.TextureManager.Get(nightTexturePath.ToLower());
                Texture = Viewer.TextureManager.Get(texturePath, true);
             }
-            else if ((Options & SceneryMaterialOptions.NightTexture) != 0 && viewer.DontLoadNightTextures)
+            else if ((Options & SceneryMaterialOptions.NightTexture) != 0 && viewer.IsDaytime)
             {
                 viewer.NightTexturesNotLoaded = true;
                 Texture = Viewer.TextureManager.Get(texturePath, true);
             }
 
-            else if ((Options & SceneryMaterialOptions.NightTexture) != 0 && viewer.DontLoadDayTextures)
+            else if ((Options & SceneryMaterialOptions.NightTexture) != 0 && viewer.IsNighttime)
             {
                 var nightTexturePath = Helpers.GetNightTextureFile(Viewer.Simulator, texturePath);
                 if (!String.IsNullOrEmpty(nightTexturePath))

Source/ORTS.Settings/UserSettings.cs

@@ -77,12 +77,7 @@ public SceneryDrawer(Viewer viewer)
         public void Load()
         {
             var cancellation = Viewer.LoaderProcess.CancellationToken;
-            Viewer.DontLoadNightTextures = (Program.Simulator.Settings.ConditionalLoadOfDayOrNightTextures &&
-            ((Viewer.MaterialManager.sunDirection.Y > 0.05f && Program.Simulator.ClockTime % 86400 < 43200) ||
-            (Viewer.MaterialManager.sunDirection.Y > 0.15f && Program.Simulator.ClockTime % 86400 >= 43200))) ? true : false;
-            Viewer.DontLoadDayTextures = (Program.Simulator.Settings.ConditionalLoadOfDayOrNightTextures &&
-            ((Viewer.MaterialManager.sunDirection.Y < -0.05f && Program.Simulator.ClockTime % 86400 >= 43200) ||
-            (Viewer.MaterialManager.sunDirection.Y < -0.15f && Program.Simulator.ClockTime % 86400 < 43200))) ? true : false;
+
             if (TileX != VisibleTileX || TileZ != VisibleTileZ)
             {
                 TileX = VisibleTileX;
@@ -113,7 +108,7 @@ public void Load()
                 Viewer.tryLoadingNightTextures = true; // when Tiles loaded change you can try
                 Viewer.tryLoadingDayTextures = true; // when Tiles loaded change you can try
             }
-            else if (Viewer.NightTexturesNotLoaded && Program.Simulator.ClockTime % 86400 >= 43200 && Viewer.tryLoadingNightTextures)
+            else if (Viewer.NightTexturesNotLoaded && !Viewer.IsBeforeNoon && Viewer.tryLoadingNightTextures)
             {
                 var sunHeight = Viewer.MaterialManager.sunDirection.Y;
                 if (sunHeight < 0.10f && sunHeight > 0.01)
@@ -133,7 +128,7 @@ public void Load()
                 else if (sunHeight <= 0.01)
                     Viewer.NightTexturesNotLoaded = false; // too late to try, we must give up and we don't load the night textures
             }
-            else if (Viewer.DayTexturesNotLoaded && Program.Simulator.ClockTime % 86400 < 43200 && Viewer.tryLoadingDayTextures)
+            else if (Viewer.DayTexturesNotLoaded && Viewer.IsBeforeNoon && Viewer.tryLoadingDayTextures)
             {
                 var sunHeight = Viewer.MaterialManager.sunDirection.Y;
                 if (sunHeight > -0.10f && sunHeight < -0.01)

Source/RunActivity/Viewer3D/Materials.cs

@@ -217,9 +217,30 @@ enum VisibilityState
         public float CabTextureInverseRatio = 0.75f; // default of inverse of cab texture ratio 
 
         public CommandLog Log { get { return Simulator.Log; } }
+        public bool IsBeforeNoon
+        {
+            get
+            {
+                return Program.Simulator.ClockTime % 86400 < 43200;
+            }
+        }
 
-        public bool DontLoadNightTextures; // Checkbox set and time of day allows not to load textures
-        public bool DontLoadDayTextures; // Checkbox set and time of day allows not to load textures
+        public bool IsDaytime      // After dawn and before dusk, so definitely daytime
+        { 
+            get
+            {
+                return (MaterialManager.sunDirection.Y > 0.05f && IsBeforeNoon)
+                || (MaterialManager.sunDirection.Y > 0.15f && !IsBeforeNoon);
+            } 
+        }
+        public bool IsNighttime    // Before dawn and after dusk, so definitely nighttime
+        {
+            get 
+            { 
+                return (MaterialManager.sunDirection.Y < -0.05f && !IsBeforeNoon)
+                || (MaterialManager.sunDirection.Y < -0.15f && IsBeforeNoon);
+            }
+        }
         public bool NightTexturesNotLoaded; // At least one night texture hasn't been loaded
         public bool DayTexturesNotLoaded; // At least one day texture hasn't been loaded
         public ulong LoadMemoryThreshold; // Above this threshold loader doesn't bulk load day or night textures
@@ -509,11 +530,8 @@ internal void Initialize()
             // This ensures that a) we have all the required objects loaded when the 3D view first appears and b) that
             // all loading is performed on a single thread that we can handle in debugging and tracing.
             World.LoadPrep();
-            if (Simulator.Settings.ConditionalLoadOfDayOrNightTextures) // We need to compute sun height only in this case
-            {
             MaterialManager.LoadPrep();
             LoadMemoryThreshold = (ulong)HUDWindow.GetVirtualAddressLimit() - 512 * 1024 * 1024;
-            }
             Load();
 
             // MUST be after loading is done! (Or we try and load shapes on the main thread.)