Fix clip planes for OpenGL

KSP-RO · Dec 7, 2021 · 3c45a66 · 3c45a66
1 parent 4ff7002
commit 3c45a66
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 26 deletions.
diff --git a/GameData/RealSolarSystem/Plugins/RealSolarSystem.dll b/GameData/RealSolarSystem/Plugins/RealSolarSystem.dll
diff --git a/GameData/RealSolarSystem/Readme_RSS.txt b/GameData/RealSolarSystem/Readme_RSS.txt
@@ -42,9 +42,13 @@ FINAL NOTES:
 You really should play with the recommended mods. See the Realism Overhaul thread for details.
 
 ===========================
+Changelog
+v18.4.0
+* Fix clip planes for OpenGL, @siimav
+
 Changelog
 v18.3.0
-* Fix too low clip plane value which caused artifacts to appear near the horizon, @siimav 
+* Fix too low clip plane value which caused artifacts to appear near the horizon, @siimav
 * Fix KSC runway becoming bumpy if KK is installed, @NathanKell
 
 v18.2.0

diff --git a/GameData/RealSolarSystem/RealSolarSystem.cfg b/GameData/RealSolarSystem/RealSolarSystem.cfg
@@ -6,7 +6,17 @@ REALSOLARSYSTEM
 {
 	overrideCommNetParams = True
 
-	cam00FarClip = 1250000
+	ClipPlanes
+	{
+		DX11
+		{
+			cam00FarClip = 1250000
+		}
+		Other
+		{
+			cam01FarClip = 1250000
+		}
+	}
 
 	timeWarpRates
 	{

diff --git a/GameData/RealSolarSystem/RealSolarSystem.version b/GameData/RealSolarSystem/RealSolarSystem.version
@@ -3,7 +3,7 @@
   "URL": "https://github.com/KSP-RO/RealSolarSystem/raw/master/GameData/RealSolarSystem/RealSolarSystem.version",
   "VERSION": {
     "MAJOR": 18,
-    "MINOR": 3,
+    "MINOR": 4,
     "PATCH": 0
   },
   "KSP_VERSION_MIN": {

diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs
@@ -35,8 +35,8 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("18.3.0.0")]
-[assembly: AssemblyFileVersion("18.3.0.0")]
+[assembly: AssemblyVersion("18.4.0.0")]
+[assembly: AssemblyFileVersion("18.4.0.0")]
 
 [assembly: KSPAssemblyDependency("Kopernicus", 1, 0)]
 [assembly: KSPAssemblyDependency("Kopernicus.Parser", 1, 0)]
diff --git a/Source/Watchdogs.cs b/Source/Watchdogs.cs
@@ -1,4 +1,5 @@
 using UnityEngine;
+using UnityEngine.Rendering;
 
 namespace RealSolarSystem
 {
@@ -38,67 +39,78 @@ public void Update()
 
             delayCounter += Time.deltaTime;
 
-            if(delayCounter < initialDelay)
+            if (delayCounter < initialDelay)
                 return;
 
             watchdogRun = true;
 
             Camera[] cameras = Camera.allCameras;
             string bodyName = FlightGlobals.getMainBody().name;
 
+            ConfigNode clipPlaneSettings;
+            if (SystemInfo.graphicsDeviceType == GraphicsDeviceType.Direct3D11 ||
+                SystemInfo.graphicsDeviceType == GraphicsDeviceType.Direct3D12)
+            {
+                clipPlaneSettings = rssSettings.GetNode("ClipPlanes")?.GetNode("DX11");
+            }
+            else
+            {
+                clipPlaneSettings = rssSettings.GetNode("ClipPlanes")?.GetNode("Other");
+            }
+
+            if (clipPlaneSettings == null) return;
+
             foreach (Camera cam in cameras)
             {
                 float farClip = -1;
                 float nearClip = -1;
 
                 if (cam.name.Equals("Camera 00"))
                 {
-                    rssSettings.TryGetValue("cam00FarClip", ref farClip);
+                    clipPlaneSettings.TryGetValue("cam00FarClip", ref farClip);
 
-                    if (rssSettings.HasNode(bodyName))
-                        rssSettings.GetNode(bodyName).TryGetValue("cam00FarClip", ref farClip);
+                    if (clipPlaneSettings.HasNode(bodyName))
+                        clipPlaneSettings.GetNode(bodyName).TryGetValue("cam00FarClip", ref farClip);
 
-                    rssSettings.TryGetValue("cam00NearClip", ref nearClip);
+                    clipPlaneSettings.TryGetValue("cam00NearClip", ref nearClip);
 
-                    if (rssSettings.HasNode(bodyName))
-                        rssSettings.GetNode(bodyName).TryGetValue("cam00NearClip", ref nearClip);
+                    if (clipPlaneSettings.HasNode(bodyName))
+                        clipPlaneSettings.GetNode(bodyName).TryGetValue("cam00NearClip", ref nearClip);
                 }
                 else if (cam.name.Equals("Camera 01"))
                 {
-                    rssSettings.TryGetValue("cam01FarClip", ref farClip);
+                    clipPlaneSettings.TryGetValue("cam01FarClip", ref farClip);
 
-                    if (rssSettings.HasNode(bodyName))
-                        rssSettings.GetNode(bodyName).TryGetValue("cam01FarClip", ref farClip);
+                    if (clipPlaneSettings.HasNode(bodyName))
+                        clipPlaneSettings.GetNode(bodyName).TryGetValue("cam01FarClip", ref farClip);
 
-                    rssSettings.TryGetValue("cam01NearClip", ref nearClip);
+                    clipPlaneSettings.TryGetValue("cam01NearClip", ref nearClip);
 
-                    if (rssSettings.HasNode(bodyName))
-                        rssSettings.GetNode(bodyName).TryGetValue("cam01NearClip", ref nearClip);
+                    if (clipPlaneSettings.HasNode(bodyName))
+                        clipPlaneSettings.GetNode(bodyName).TryGetValue("cam01NearClip", ref nearClip);
                 }
                 else if (cam.name.Equals("Camera ScaledSpace"))
                 {
-                    rssSettings.TryGetValue("camScaledSpaceFarClip", ref farClip);
+                    clipPlaneSettings.TryGetValue("camScaledSpaceFarClip", ref farClip);
 
-                    if (rssSettings.HasNode(bodyName))
-                        rssSettings.GetNode(bodyName).TryGetValue("camScaledSpaceFarClip", ref farClip);
+                    if (clipPlaneSettings.HasNode(bodyName))
+                        clipPlaneSettings.GetNode(bodyName).TryGetValue("camScaledSpaceFarClip", ref farClip);
 
-                    rssSettings.TryGetValue("camScaledSpaceNearClip", ref nearClip);
+                    clipPlaneSettings.TryGetValue("camScaledSpaceNearClip", ref nearClip);
 
-                    if (rssSettings.HasNode(bodyName))
-                        rssSettings.GetNode(bodyName).TryGetValue("camScaledSpaceNearClip", ref nearClip);
+                    if (clipPlaneSettings.HasNode(bodyName))
+                        clipPlaneSettings.GetNode(bodyName).TryGetValue("camScaledSpaceNearClip", ref nearClip);
                 }
 
                 if (nearClip > 0)
                 {
                     cam.nearClipPlane = nearClip;
-
                     Debug.Log($"[RealSolarSystem] Watchdog: Setting camera {cam.name} near clip to {nearClip} so camera now has {cam.nearClipPlane}");
                 }
 
                 if (farClip > 0)
                 {
                     cam.farClipPlane = farClip;
-
                     Debug.Log($"[RealSolarSystem] Watchdog: Setting camera {cam.name} far clip to {farClip} so camera now has {cam.farClipPlane}");
                 }
             }