From c94bf45279f8b77adda0f983b5dd136070abd4c5 Mon Sep 17 00:00:00 2001 From: NathanKell Date: Mon, 20 Oct 2014 22:54:50 -0400 Subject: [PATCH] v8,2 FINAL Fixed remaining loader issue Use 6.4x Kerbin PQSMod values for non-heightmap PQS Update readme. --- RealSolarSystem/Plugins/RealSolarSystem.dll | Bin 115712 -> 116224 bytes RealSolarSystem/Readme_RSS.txt | 4 +++ RealSolarSystem/RealSolarSystem.cfg | 26 +++++++++++--------- Source/RealSolarSystem.cs | 9 +++---- 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/RealSolarSystem/Plugins/RealSolarSystem.dll b/RealSolarSystem/Plugins/RealSolarSystem.dll index f2cc635c285b35cb4d431d100ff405748a1e3001..8031ac1ede0a080c6fcc63c474c64513626d1949 100644 GIT binary patch delta 8947 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 UNBAEu(j9As_DlYd7ssgoA8q!jPyhe` diff --git a/RealSolarSystem/Readme_RSS.txt b/RealSolarSystem/Readme_RSS.txt index 6c809ac3..5617e26b 100644 --- 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 index 378a9de1..c865f548 100644 --- 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 index a05f1f79..89d1c144 100644 --- a/Source/RealSolarSystem.cs +++ b/Source/RealSolarSystem.cs @@ -554,6 +554,7 @@ private IEnumerator 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 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 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 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 LoadRSS() } } yield return null; - LoadFinishOrbits(); + var retval2 = LoadFinishOrbits(); + while(retval2.MoveNext()) yield return retval2.Current; yield return null; Resources.UnloadUnusedAssets(); yield return null;