Merge pull request #589 from cjakeman/menu-options02g

02g: Removed menu option LODViewingExtention

Author: cjakeman

Source/Menu/Options.Designer.cs

@@ -320,7 +320,6 @@ orderby folder.Key
             checkConditionalLoadOfNightTextures.Checked = Settings.ConditionalLoadOfDayOrNightTextures;
             checkSignalLightGlow.Checked = Settings.SignalLightGlow;
             checkCircularSpeedGauge.Checked = Settings.CircularSpeedGauge;
-            checkLODViewingExtention.Checked = Settings.LODViewingExtention;
             checkPreferDDSTexture.Checked = Settings.PreferDDSTexture;
             checkUseLocationPassingPaths.Checked = Settings.UseLocationPassingPaths;
             checkUseMSTSEnv.Checked = Settings.UseMSTSEnv;
@@ -516,7 +515,6 @@ void buttonOK_Click(object sender, EventArgs e)
             Settings.ConditionalLoadOfDayOrNightTextures = checkConditionalLoadOfNightTextures.Checked;
             Settings.SignalLightGlow = checkSignalLightGlow.Checked;
             Settings.CircularSpeedGauge = checkCircularSpeedGauge.Checked;
-            Settings.LODViewingExtention = checkLODViewingExtention.Checked;
             Settings.PreferDDSTexture = checkPreferDDSTexture.Checked;
             Settings.UseLocationPassingPaths = checkUseLocationPassingPaths.Checked;
             Settings.UseMSTSEnv = checkUseMSTSEnv.Checked;

Source/Menu/Options.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.resx

@@ -184,11 +184,11 @@ public SharedStaticShapeInstance(Viewer viewer, string path, List<StaticShape> s
                 // Object radius should extend from central location to the furthest instance location PLUS the actual object radius.
                 ObjectRadius = shapes.Max(s => (Location.Location - s.Location.Location).Length()) + dlHighest.ViewSphereRadius;
 
-                // Object viewing distance is easy because it's based on the outside of the object radius.
-                if (viewer.Settings.LODViewingExtention)
-                    ObjectViewingDistance = float.MaxValue;
-                else
-                    ObjectViewingDistance = dlLowest.ViewingDistance;
+                // Set to MaxValue so that an object never disappears.
+                // Many MSTS objects had a LOD of 2km which is the maximum distance that MSTS can handle.
+                // Open Rails can handle greater distances, so we override the lowest-detail LOD to make sure OR shows shapes further away than 2km.
+                // See http://www.elvastower.com/forums/index.php?/topic/35301-menu-options/page__view__findpost__p__275531
+                ObjectViewingDistance = float.MaxValue;
             }
 
             // Create all the primitives for the shared shape.