v8,2 FINAL

Fixed remaining loader issue Use 6.4x Kerbin PQSMod values for non-heightmap PQS Update readme.
NathanKell · Oct 21, 2014 · c94bf45 · c94bf45
1 parent 329ea4c
commit c94bf45
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 17 deletions.
diff --git a/RealSolarSystem/Plugins/RealSolarSystem.dll b/RealSolarSystem/Plugins/RealSolarSystem.dll
diff --git a/RealSolarSystem/Readme_RSS.txt b/RealSolarSystem/Readme_RSS.txt
@@ -46,6 +46,10 @@ Pluto is represented by Vall
 
 ===========================
 Changelog
+v8.2
+*Finally fixed (I trust) all remaining issues from the loader rewrite
+*Borrowed some PQSMod values from 6.4x Kerbin (kudos to Raptor831 et al)
+
 v8.1.2
 *Fixed normal map loading
 *Added ability to set both far and near clip planes in cfg, added cfg support for camScaledSpace (camScaledSpaceNearClip like cam01FarClip in cfg)

diff --git a/RealSolarSystem/RealSolarSystem.cfg b/RealSolarSystem/RealSolarSystem.cfg
@@ -796,27 +796,29 @@ REALSOLARSYSTEM
 
 				PQSMod_VertexSimplexHeightAbsolute // doubles
 				{
-					deformity = 900 //1000 // 485
-					persistence = 0.7 // 0.60000002384185791
-					frequency = 36 //12 // 24
+					deformity = 900 //1200
+                    persistence = 0.5 //0.38
+                    frequency = 32
 				}
 				PQSMod_VertexHeightNoiseVertHeightCurve2 // floats
 				{
-					deformity = 5000 //6000 // 4000
-					ridgedAddFrequency = 48 // 48
-					ridgedSubFrequency = 32 // 32
+					deformity = 7000
+                    ridgedAddFrequency = 64
+                    ridgedSubFrequency = 32
+                    simplexHeightStart = 6000
+                    simplexHeightEnd = 9500
+					simplexPersistance = 0.6
 					//ridgedAddOctaves = 8 // 6 INT
-					simplexHeightStart = 800 // 800
-					simplexHeightEnd = 9000 // 4600
 
 				}
 				PQSMod_VertexRidgedAltitudeCurve // floats
 				{
-					deformity = 950 // 1800 //1100 // 750
-					ridgedAddFrequency = 140 // 25 // 140
+					deformity = 1650
+                    ridgedAddFrequency = 140
+                    simplexHeightStart = 5000
+                    simplexHeightEnd = 9500
+					simplexPersistence = 0.5
 					//ridgedAddOctaves = 8 // 3 INT
-					simplexHeightStart = 500 // 0
-					simplexHeightEnd = 9000 // 6000
 				}
 				PQSMod_VertexHeightMap // doubles
 				{

diff --git a/Source/RealSolarSystem.cs b/Source/RealSolarSystem.cs
@@ -554,6 +554,7 @@ private IEnumerator<YieldInstruction> LoadFinishOrbits()
             // do final update for all SoIs and hillSpheres and periods
             guiMajor = "Final orbit pass";
             //OnGui();
+            print("*RSS* Doing final orbit pass");
             foreach (CelestialBody body in FlightGlobals.fetch.bodies)
             {
                 guiMinor = body.name;
@@ -564,6 +565,7 @@ private IEnumerator<YieldInstruction> LoadFinishOrbits()
                 {
                     if (body.referenceBody != null)
                     {
+                        print("Computing params for " + body.name);
                         body.hillSphere = body.orbit.semiMajorAxis * (1.0 - body.orbit.eccentricity) * Math.Pow(body.Mass / body.orbit.referenceBody.Mass, 1 / 3);
                         body.sphereOfInfluence = body.orbit.semiMajorAxis * Math.Pow(body.Mass / body.orbit.referenceBody.Mass, 0.4);
                         if (body.sphereOfInfluence < body.Radius * 1.5 || body.sphereOfInfluence < body.Radius + 20000.0)
@@ -1564,13 +1566,11 @@ private IEnumerator<YieldInstruction> LoadScaledSpace(ConfigNode node, Celestial
                                     break;
                                 }
                             }
-                            bool localLoad = false;
                             bool success = true;
                             yield return null;
                             if ((object)map == null)
                             {
                                 print("RSS Loading local texture " + path);
-                                localLoad = true;
                                 success = false;
                                 path = KSPUtil.ApplicationRootPath + path;
                                 if (File.Exists(path))
@@ -1618,12 +1618,10 @@ private IEnumerator<YieldInstruction> LoadScaledSpace(ConfigNode node, Celestial
                                     map = tex;
                                     break;
                                 }
-                            bool localLoad = false;
                             bool success = true;
                             yield return null;
                             if ((object)map == null)
                             {
-                                localLoad = true;
                                 print("RSS Loading local texture " + path);
                                 success = false;
                                 path = KSPUtil.ApplicationRootPath + path;
@@ -1980,7 +1978,8 @@ private IEnumerator<YieldInstruction> LoadRSS()
                 }
             }
             yield return null;
-            LoadFinishOrbits();
+            var retval2 = LoadFinishOrbits();
+			while(retval2.MoveNext()) yield return retval2.Current;
             yield return null;
             Resources.UnloadUnusedAssets();
             yield return null;