Gittes-archive/new-horizons
2
0
Fork 0
mirror of https://github.com/Outer-Wilds-New-Horizons/new-horizons.git synced 2025-12-11 20:15:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Midway though json implementation

Browse Source
This commit is contained in:
Mister_Nebula 2020-04-12 00:47:08 +01:00
parent a892af13c0
commit 6188af8d89
3 changed files with 44 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
Marshmallow/Main.cs
View File

@ -13,7 +13,6 @@ namespace Marshmallow
{ {
public class Main : ModBehaviour public class Main : ModBehaviour
{ {
GameObject generatedPlanet;
public static OWRigidbody OWRB; public static OWRigidbody OWRB;
public static Sector SECTOR; public static Sector SECTOR;
public static SpawnPoint SPAWN; public static SpawnPoint SPAWN;
@ -32,11 +31,19 @@ namespace Marshmallow
foreach (var file in Directory.GetFiles(ModHelper.Manifest.ModFolderPath + @"planets\")) foreach (var file in Directory.GetFiles(ModHelper.Manifest.ModFolderPath + @"planets\"))
{ {
planetList.Add(ModHelper.Storage.Load<PlanetConfig>(file)); var config = ModHelper.Storage.Load<PlanetConfig>(file);
planetList.Add(config);
} }
if (planetList.Count != 0)
{
Main.Log("Loaded [" + planetList.Count + "] planet config files."); Main.Log("Loaded [" + planetList.Count + "] planet config files.");
} }
else
{
Main.Log("ERROR! - No planet config files found!");
}
}
private void OnEvent(MonoBehaviour behaviour, Events ev) private void OnEvent(MonoBehaviour behaviour, Events ev)
{ {
@ -46,6 +53,18 @@ namespace Marshmallow
foreach (var config in planetList) foreach (var config in planetList)
{ {
var planet = GenerateBody(config); var planet = GenerateBody(config);
if (config.GetSettingsValue<AstroObject>("primaryBody") == Locator.GetAstroObject(AstroObject.Name.Sun))
{
planet.transform.parent = Locator.GetRootTransform();
}
else
{
planet.transform.parent = config.GetSettingsValue<AstroObject>("primaryBody").transform;
}
planet.transform.position = config.GetSettingsValue<Vector3>("position");
planet.SetActive(true);
} }
PlanetStructure inputStructure = new PlanetStructure PlanetStructure inputStructure = new PlanetStructure
@ -81,71 +100,60 @@ namespace Marshmallow
hasOrbit = true hasOrbit = true
}; };
generatedPlanet = GenerateBody(inputStructure);
if (inputStructure.primaryBody = Locator.GetAstroObject(AstroObject.Name.Sun))
{
generatedPlanet.transform.parent = Locator.GetRootTransform();
}
else
{
generatedPlanet.transform.parent = inputStructure.primaryBody.transform;
}
generatedPlanet.transform.position = inputStructure.position;
generatedPlanet.SetActive(true);
} }
} }
private GameObject GenerateBody(PlanetConfig config) private GameObject GenerateBody(PlanetConfig config)
{ {
Main.Log("Begin generation sequence of planet [" + planet.name + "] ..."); Main.Log("Begin generation sequence of planet [" + config.GetSettingsValue<string>("name") + "] ...");
float groundScale = 400f; float groundScale = 400f;
var name = config.GetSettingsValue<string>("name");
var topCloudSize = config.GetSettingsValue<float>("topCloudSize");
var bottomCloudSize = config.GetSettingsValue<float>("topCloudSize");
GameObject body; GameObject body;
body = new GameObject(); body = new GameObject(name);
body.name = planet.name;
body.SetActive(false); body.SetActive(false);
Body.MakeGeometry.Make(body, groundScale); Body.MakeGeometry.Make(body, groundScale);
General.MakeOrbitingAstroObject.Make(body, planet.primaryBody, 0.02f, planet.hasGravity, planet.surfaceAccel, groundScale); General.MakeOrbitingAstroObject.Make(body, config.GetSettingsValue<AstroObject>("primaryBody"), 0.02f, config.GetSettingsValue<bool>("hasGravity"), config.GetSettingsValue<float>("surfaceAcceleration"), groundScale);
General.MakeRFVolume.Make(body); General.MakeRFVolume.Make(body);
if (planet.hasMapMarker) if (config.GetSettingsValue<bool>("hasMapMarker"))
{ {
General.MakeMapMarker.Make(body, planet.name); General.MakeMapMarker.Make(body, name);
} }
SECTOR = Body.MakeSector.Make(body, planet.topCloudSize.Value); SECTOR = Body.MakeSector.Make(body, topCloudSize);
if (planet.hasClouds) if (config.GetSettingsValue<bool>("hasClouds"))
{ {
Atmosphere.MakeClouds.Make(body, planet.topCloudSize.Value, planet.bottomCloudSize.Value, planet.cloudTint.Value); Atmosphere.MakeClouds.Make(body, topCloudSize, bottomCloudSize, config.GetSettingsValue<Color>("cloudTint"));
Atmosphere.MakeSunOverride.Make(body, planet.topCloudSize.Value, planet.bottomCloudSize.Value, planet.waterSize.Value); Atmosphere.MakeSunOverride.Make(body, topCloudSize, bottomCloudSize, config.GetSettingsValue<float>("waterSize"));
} }
Atmosphere.MakeAir.Make(body, planet.topCloudSize.Value / 2, planet.hasRain); Atmosphere.MakeAir.Make(body, topCloudSize / 2, config.GetSettingsValue<bool>("hasRain"));
if (planet.hasWater) if (config.GetSettingsValue<bool>("hasWater"))
{ {
Body.MakeWater.Make(body, planet.waterSize.Value); Body.MakeWater.Make(body, config.GetSettingsValue<float>("waterSize"));
} }
Atmosphere.MakeBaseEffects.Make(body); Atmosphere.MakeBaseEffects.Make(body);
Atmosphere.MakeVolumes.Make(body, groundScale, planet.topCloudSize.Value); Atmosphere.MakeVolumes.Make(body, groundScale, topCloudSize);
General.MakeAmbientLight.Make(body); General.MakeAmbientLight.Make(body);
Atmosphere.MakeAtmosphere.Make(body, planet.topCloudSize.Value, planet.hasFog, planet.fogDensity, planet.fogTint); Atmosphere.MakeAtmosphere.Make(body, topCloudSize, config.GetSettingsValue<bool>("hasFog"), config.GetSettingsValue<float>("fogDensity"), config.GetSettingsValue<Color>("fogTint"));
if (planet.makeSpawnPoint) if (config.GetSettingsValue<bool>("makeSpawnPoint"))
{ {
SPAWN = General.MakeSpawnPoint.Make(body, new Vector3(0, groundScale+10, 0)); SPAWN = General.MakeSpawnPoint.Make(body, new Vector3(0, groundScale+10, 0));
} }
Main.Log("Generation of planet [" + planet.name + "] completed."); Main.Log("Generation of planet [" + name + "] completed.");
return body; return body;
} }

1
Marshmallow/Marshmallow.csproj
View File

@ -111,6 +111,7 @@
<Compile Include="MakeSunOverride.cs" /> <Compile Include="MakeSunOverride.cs" />
<Compile Include="MakeVolumes.cs" /> <Compile Include="MakeVolumes.cs" />
<Compile Include="MakeWater.cs" /> <Compile Include="MakeWater.cs" />
<Compile Include="PlanetConfig.cs" />
<Compile Include="PlanetStructure.cs" /> <Compile Include="PlanetStructure.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup> </ItemGroup>

1
Marshmallow/PlanetConfig.cs
View File

@ -14,6 +14,7 @@ namespace Marshmallow
public T GetSettingsValue<T>(string key) public T GetSettingsValue<T>(string key)
{ {
Main.Log("start");
bool flag = !this.Settings.ContainsKey(key); bool flag = !this.Settings.ContainsKey(key);
T result; T result;
if (flag) if (flag)