Merge pull request #759 from twpol/feature/bug-1471416-sky-dome-smooth

fix: Improve sky dome distortion causing bug #1471416

Author: cjakeman

Source/RunActivity/Viewer3D/Cameras.cs

@@ -171,7 +171,7 @@ public virtual void Update(ElapsedTime elapsedTime)
         public void ScreenChanged()
         {
             var aspectRatio = (float)Viewer.DisplaySize.X / Viewer.DisplaySize.Y;
-            var farPlaneDistance = SkyConstants.skyRadius + 100;  // so far the sky is the biggest object in view
+            var farPlaneDistance = SkyPrimitive.SkyRadius + 100;  // so far the sky is the biggest object in view
             var fovWidthRadians = MathHelper.ToRadians(FieldOfView);
             if (Viewer.Settings.DistantMountains)
                 XnaDistantMountainProjection = Matrix.CreatePerspectiveFieldOfView(fovWidthRadians, aspectRatio, MathHelper.Clamp(Viewer.Settings.ViewingDistance - 500, 500, 1500), Viewer.Settings.DistantMountainsViewingDistance);

Source/RunActivity/Viewer3D/Common/SunMoonPos.cs

@@ -30,7 +30,7 @@
 
 namespace Orts.Viewer3D.Common
 {
-    class SunMoonPos
+    static class SunMoonPos
     {
         /// <summary>
         /// Calculates the solar direction vector.
@@ -40,14 +40,14 @@ class SunMoonPos
         /// <param name="longitude">longitude</param>
         /// <param name="clockTime">wall clock time since start of activity, days</param>
         /// <param name="date">structure made up of day, month, year and ordinal date</param>
-        public static Vector3 SolarAngle(double latitude, double longitude, float clockTime, SkyViewer.Date date)
+        public static Vector3 SolarAngle(double latitude, double longitude, float clockTime, SkyViewer.SkyDate date)
         {
             Vector3 sunDirection;
 
             // For these calculations, west longitude is in positive degrees,
             float NOAAlongitude = -MathHelper.ToDegrees((float)longitude);
             // Fractional year, radians
-            double fYear = (MathHelper.TwoPi / 365) * (date.ordinalDate - 1 + (clockTime - 0.5));
+            double fYear = (MathHelper.TwoPi / 365) * (date.OrdinalDate - 1 + (clockTime - 0.5));
             // Equation of time, minutes
             double eqTime = 229.18 * (0.000075
                 + 0.001868 * Math.Cos(fYear)
@@ -112,12 +112,12 @@ public static Vector3 SolarAngle(double latitude, double longitude, float clockT
         /// <param name="longitude">longitude</param>
         /// <param name="clockTime">wall clock time since start of activity</param>
         /// <param name="date">structure made up of day, month, year and ordinal date</param>
-        public static Vector3 LunarAngle(double latitude, double longitude, float clockTime, SkyViewer.Date date)
+        public static Vector3 LunarAngle(double latitude, double longitude, float clockTime, SkyViewer.SkyDate date)
         {
             Vector3 moonDirection;
 
             // Julian day.
-            double JEday = (float)367 * date.year - 7 * (date.year + (date.month + 9) / 12) / 4 + 275 * date.month / 9 + date.day - 730531.5 + clockTime;
+            double JEday = (float)367 * date.Year - 7 * (date.Year + (date.Month + 9) / 12) / 4 + 275 * date.Month / 9 + date.Day - 730531.5 + clockTime;
             // Fractional time within current 100-year epoch, days
             double Ftime = JEday / 36525;
             // Ecliptic longitude, radians

Source/RunActivity/Viewer3D/Lights.cs

@@ -236,7 +236,7 @@ bool UpdateState()
             // Time of day
             bool newIsDay = false;
             if (Viewer.Settings.UseMSTSEnv == false)
-                newIsDay = Viewer.World.Sky.solarDirection.Y > 0;
+                newIsDay = Viewer.World.Sky.SolarDirection.Y > 0;
             else
                 newIsDay = Viewer.World.MSTSSky.mstsskysolarDirection.Y > 0;
             // Weather

Source/RunActivity/Viewer3D/MSTSSky.cs

@@ -57,7 +57,6 @@ public class MSTSSkyDrawer
         // Classes reqiring instantiation
         public MSTSSkyMesh MSTSSkyMesh;
         WorldLatLon mstsskyworldLoc; // Access to latitude and longitude calcs (MSTS routes only)
-        SunMoonPos MSTSSkyVectors;
 
         int mstsskyseasonType; //still need to remember it as MP now can change it.
         #region Class variables
@@ -66,9 +65,9 @@ public class MSTSSkyDrawer
         public double mstsskylatitude, mstsskylongitude;
         // Date of activity
 
-        public Orts.Viewer3D.SkyViewer.Date date;
+        public Orts.Viewer3D.SkyViewer.SkyDate date;
 
-        private SkySteps skySteps = new SkySteps();
+        private SkyInterpolation skySteps = new SkyInterpolation();
 
         // Phase of the moon
         public int mstsskymoonPhase;
@@ -100,7 +99,6 @@ public MSTSSkyDrawer(Viewer viewer)
             MSTSSkyMaterial = viewer.MaterialManager.Load("MSTSSky");
             // Instantiate classes
             MSTSSkyMesh = new MSTSSkyMesh(MSTSSkyViewer.RenderProcess);
-            MSTSSkyVectors = new SunMoonPos();
 
             //viewer.World.MSTSSky.MSTSSkyMaterial.Viewer.MaterialManager.sunDirection.Y < 0
             // Set starting value
@@ -134,11 +132,11 @@ public void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)
                 if (mstsskyseasonType != (int)MSTSSkyViewer.Simulator.Season)
                 {
                     mstsskyseasonType = (int)MSTSSkyViewer.Simulator.Season;
-                    date.ordinalDate = mstsskylatitude >= 0 ? 82 + mstsskyseasonType * 91 : (82 + (mstsskyseasonType + 2) * 91) % 365;
+                    date.OrdinalDate = mstsskylatitude >= 0 ? 82 + mstsskyseasonType * 91 : (82 + (mstsskyseasonType + 2) * 91) % 365;
                     // TODO: Set the following three externally from ORTS route files (future)
-                    date.month = 1 + date.ordinalDate / 30;
-                    date.day = 21;
-                    date.year = 2017;
+                    date.Month = 1 + date.OrdinalDate / 30;
+                    date.Day = 21;
+                    date.Year = 2017;
                 }
                 // Fill in the sun- and moon-position lookup tables
                 for (int i = 0; i < skySteps.MaxSteps; i++)
@@ -148,7 +146,7 @@ public void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)
                 }
                 // Phase of the moon is generated at random
                 mstsskymoonPhase = Viewer.Random.Next(8);
-                if (mstsskymoonPhase == 6 && date.ordinalDate > 45 && date.ordinalDate < 330)
+                if (mstsskymoonPhase == 6 && date.OrdinalDate > 45 && date.OrdinalDate < 330)
                     mstsskymoonPhase = 3; // Moon dog only occurs in winter
                 // Overcast factor: 0.0=almost no clouds; 0.1=wispy clouds; 1.0=total overcast
                 //mstsskyovercastFactor = MSTSSkyViewer.World.WeatherControl.overcastFactor;
@@ -206,7 +204,7 @@ public void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)
                 }
             }
 
-            skySteps.SetSunAndMoonDirection(ref mstsskysolarDirection, ref mstsskylunarDirection, ref mstsskysolarPosArray, ref mstsskylunarPosArray,
+            skySteps.SetSunAndMoonDirection(ref mstsskysolarDirection, ref mstsskylunarDirection, mstsskysolarPosArray, mstsskylunarPosArray,
                 MSTSSkyViewer.Simulator.ClockTime);
 
             frame.AddPrimitive(MSTSSkyMaterial, MSTSSkyMesh, RenderPrimitiveGroup.Sky, ref XNASkyWorldLocation);
@@ -218,10 +216,10 @@ public void LoadPrep()
             // Get the current latitude and longitude coordinates
             mstsskyworldLoc.ConvertWTC(MSTSSkyViewer.Camera.TileX, MSTSSkyViewer.Camera.TileZ, MSTSSkyViewer.Camera.Location, ref mstsskylatitude, ref mstsskylongitude);
             mstsskyseasonType = (int)MSTSSkyViewer.Simulator.Season;
-            date.ordinalDate = mstsskylatitude >= 0 ? 82 + mstsskyseasonType * 91 : (82 + (mstsskyseasonType + 2) * 91) % 365;
-            date.month = 1 + date.ordinalDate / 30;
-            date.day = 21;
-            date.year = 2017;
+            date.OrdinalDate = mstsskylatitude >= 0 ? 82 + mstsskyseasonType * 91 : (82 + (mstsskyseasonType + 2) * 91) % 365;
+            date.Month = 1 + date.OrdinalDate / 30;
+            date.Day = 21;
+            date.Year = 2017;
             float fractClockTime = (float)MSTSSkyViewer.Simulator.ClockTime / 86400;
             mstsskysolarDirection = SunMoonPos.SolarAngle(mstsskylatitude, mstsskylongitude, fractClockTime, date);
             mstsskyworldLoc = null;

Source/RunActivity/Viewer3D/Materials.cs

@@ -445,7 +445,7 @@ public void LoadPrep()
             if (Viewer.Settings.UseMSTSEnv == false)
             {
                 Viewer.World.Sky.LoadPrep();
-                sunDirection = Viewer.World.Sky.solarDirection;
+                sunDirection = Viewer.World.Sky.SolarDirection;
             }
             else
             {
@@ -472,7 +472,7 @@ public string GetStatus()
         internal void UpdateShaders()
         {
             if(Viewer.Settings.UseMSTSEnv == false)
-                sunDirection = Viewer.World.Sky.solarDirection;
+                sunDirection = Viewer.World.Sky.SolarDirection;
             else
                 sunDirection = Viewer.World.MSTSSky.mstsskysolarDirection;
 

Source/RunActivity/Viewer3D/ParticleEmitter.cs

@@ -472,7 +472,7 @@ public override void SetState(GraphicsDevice graphicsDevice, Material previousMa
         {
             var shader = Viewer.MaterialManager.ParticleEmitterShader;
             if (Viewer.Settings.UseMSTSEnv == false)
-                shader.LightVector = Viewer.World.Sky.solarDirection;
+                shader.LightVector = Viewer.World.Sky.SolarDirection;
             else
                 shader.LightVector = Viewer.World.MSTSSky.mstsskysolarDirection; 
 

Source/RunActivity/Viewer3D/Precipitation.cs

@@ -519,7 +519,7 @@ public override void SetState(GraphicsDevice graphicsDevice, Material previousMa
             shader.CurrentTechnique = shader.Techniques["Pricipitation"];
             if (ShaderPasses == null) ShaderPasses = shader.Techniques["Pricipitation"].Passes.GetEnumerator();
 
-            shader.LightVector.SetValue(Viewer.Settings.UseMSTSEnv ? Viewer.World.MSTSSky.mstsskysolarDirection : Viewer.World.Sky.solarDirection);
+            shader.LightVector.SetValue(Viewer.Settings.UseMSTSEnv ? Viewer.World.MSTSSky.mstsskysolarDirection : Viewer.World.Sky.SolarDirection);
             shader.particleSize.SetValue(1f);
             if (Viewer.Simulator.Weather.PrecipitationLiquidity == 0 || Viewer.Simulator.Weather.PrecipitationLiquidity == 1)
             {

Source/RunActivity/Viewer3D/RenderFrame.cs

@@ -503,7 +503,7 @@ public void PrepareFrame(Viewer viewer)
                 RenderSurfaceMaterial = new SpriteBatchMaterial(viewer, BlendState.Opaque);
 
             if (viewer.Settings.UseMSTSEnv == false)
-                SolarDirection = viewer.World.Sky.solarDirection;
+                SolarDirection = viewer.World.Sky.SolarDirection;
             else
                 SolarDirection = viewer.World.MSTSSky.mstsskysolarDirection;
 

Source/RunActivity/Viewer3D/Signals.cs

@@ -354,7 +354,7 @@ public void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime, Matrix xnaT
 
                     bool isDay;
                     if (Viewer.Settings.UseMSTSEnv == false)
-                        isDay = Viewer.World.Sky.solarDirection.Y > 0;
+                        isDay = Viewer.World.Sky.SolarDirection.Y > 0;
                     else
                         isDay = Viewer.World.MSTSSky.mstsskysolarDirection.Y > 0;
                     bool isPoorVisibility = Viewer.Simulator.Weather.FogDistance < 200;
@@ -746,7 +746,7 @@ public override void SetState(GraphicsDevice graphicsDevice, Material previousMa
             const float startNightTrans = 0.1f;
             const float finishNightTrans = -0.1f;
 
-            var sunDirection = Viewer.Settings.UseMSTSEnv ? Viewer.World.MSTSSky.mstsskysolarDirection : Viewer.World.Sky.solarDirection;
+            var sunDirection = Viewer.Settings.UseMSTSEnv ? Viewer.World.MSTSSky.mstsskysolarDirection : Viewer.World.Sky.SolarDirection;
             NightEffect = 1 - MathHelper.Clamp((sunDirection.Y - finishNightTrans) / (startNightTrans - finishNightTrans), 0, 1);
         }