Skip to content

Commit c94bf45

Browse files
committed
v8,2 FINAL
Fixed remaining loader issue Use 6.4x Kerbin PQSMod values for non-heightmap PQS Update readme.
1 parent 329ea4c commit c94bf45

4 files changed

Lines changed: 22 additions & 17 deletions

File tree

512 Bytes
Binary file not shown.

RealSolarSystem/Readme_RSS.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ Pluto is represented by Vall
4646

4747
===========================
4848
Changelog
49+
v8.2
50+
*Finally fixed (I trust) all remaining issues from the loader rewrite
51+
*Borrowed some PQSMod values from 6.4x Kerbin (kudos to Raptor831 et al)
52+
4953
v8.1.2
5054
*Fixed normal map loading
5155
*Added ability to set both far and near clip planes in cfg, added cfg support for camScaledSpace (camScaledSpaceNearClip like cam01FarClip in cfg)

RealSolarSystem/RealSolarSystem.cfg

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -796,27 +796,29 @@ REALSOLARSYSTEM
796796

797797
PQSMod_VertexSimplexHeightAbsolute // doubles
798798
{
799-
deformity = 900 //1000 // 485
800-
persistence = 0.7 // 0.60000002384185791
801-
frequency = 36 //12 // 24
799+
deformity = 900 //1200
800+
persistence = 0.5 //0.38
801+
frequency = 32
802802
}
803803
PQSMod_VertexHeightNoiseVertHeightCurve2 // floats
804804
{
805-
deformity = 5000 //6000 // 4000
806-
ridgedAddFrequency = 48 // 48
807-
ridgedSubFrequency = 32 // 32
805+
deformity = 7000
806+
ridgedAddFrequency = 64
807+
ridgedSubFrequency = 32
808+
simplexHeightStart = 6000
809+
simplexHeightEnd = 9500
810+
simplexPersistance = 0.6
808811
//ridgedAddOctaves = 8 // 6 INT
809-
simplexHeightStart = 800 // 800
810-
simplexHeightEnd = 9000 // 4600
811812

812813
}
813814
PQSMod_VertexRidgedAltitudeCurve // floats
814815
{
815-
deformity = 950 // 1800 //1100 // 750
816-
ridgedAddFrequency = 140 // 25 // 140
816+
deformity = 1650
817+
ridgedAddFrequency = 140
818+
simplexHeightStart = 5000
819+
simplexHeightEnd = 9500
820+
simplexPersistence = 0.5
817821
//ridgedAddOctaves = 8 // 3 INT
818-
simplexHeightStart = 500 // 0
819-
simplexHeightEnd = 9000 // 6000
820822
}
821823
PQSMod_VertexHeightMap // doubles
822824
{

Source/RealSolarSystem.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -554,6 +554,7 @@ private IEnumerator<YieldInstruction> LoadFinishOrbits()
554554
// do final update for all SoIs and hillSpheres and periods
555555
guiMajor = "Final orbit pass";
556556
//OnGui();
557+
print("*RSS* Doing final orbit pass");
557558
foreach (CelestialBody body in FlightGlobals.fetch.bodies)
558559
{
559560
guiMinor = body.name;
@@ -564,6 +565,7 @@ private IEnumerator<YieldInstruction> LoadFinishOrbits()
564565
{
565566
if (body.referenceBody != null)
566567
{
568+
print("Computing params for " + body.name);
567569
body.hillSphere = body.orbit.semiMajorAxis * (1.0 - body.orbit.eccentricity) * Math.Pow(body.Mass / body.orbit.referenceBody.Mass, 1 / 3);
568570
body.sphereOfInfluence = body.orbit.semiMajorAxis * Math.Pow(body.Mass / body.orbit.referenceBody.Mass, 0.4);
569571
if (body.sphereOfInfluence < body.Radius * 1.5 || body.sphereOfInfluence < body.Radius + 20000.0)
@@ -1564,13 +1566,11 @@ private IEnumerator<YieldInstruction> LoadScaledSpace(ConfigNode node, Celestial
15641566
break;
15651567
}
15661568
}
1567-
bool localLoad = false;
15681569
bool success = true;
15691570
yield return null;
15701571
if ((object)map == null)
15711572
{
15721573
print("RSS Loading local texture " + path);
1573-
localLoad = true;
15741574
success = false;
15751575
path = KSPUtil.ApplicationRootPath + path;
15761576
if (File.Exists(path))
@@ -1618,12 +1618,10 @@ private IEnumerator<YieldInstruction> LoadScaledSpace(ConfigNode node, Celestial
16181618
map = tex;
16191619
break;
16201620
}
1621-
bool localLoad = false;
16221621
bool success = true;
16231622
yield return null;
16241623
if ((object)map == null)
16251624
{
1626-
localLoad = true;
16271625
print("RSS Loading local texture " + path);
16281626
success = false;
16291627
path = KSPUtil.ApplicationRootPath + path;
@@ -1980,7 +1978,8 @@ private IEnumerator<YieldInstruction> LoadRSS()
19801978
}
19811979
}
19821980
yield return null;
1983-
LoadFinishOrbits();
1981+
var retval2 = LoadFinishOrbits();
1982+
while(retval2.MoveNext()) yield return retval2.Current;
19841983
yield return null;
19851984
Resources.UnloadUnusedAssets();
19861985
yield return null;

0 commit comments

Comments
 (0)