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

Merge pull request #247 from xen-42/dev

Browse Source 
1.4.2
This commit is contained in:
Nick 2022-07-25 12:08:57 -04:00 committed by GitHub
commit a77dbd161a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
NewHorizons/Builder/Atmosphere/FogBuilder.cs
View File

@ -44,9 +44,12 @@ namespace NewHorizons.Builder.Atmosphere
var colorRampTexture = atmo.fogTint == null ? _ramp : ImageUtilities.TintImage(_ramp, atmo.fogTint.ToColor()); var colorRampTexture = atmo.fogTint == null ? _ramp : ImageUtilities.TintImage(_ramp, atmo.fogTint.ToColor());
PFC.fogColorRampTexture = colorRampTexture; PFC.fogColorRampTexture = colorRampTexture;
PFC.fogColorRampIntensity = 1f; PFC.fogColorRampIntensity = 1f;
PFC.fogTint = atmo.fogTint.ToColor(); if (atmo.fogTint != null)
{
PFC.fogTint = atmo.fogTint.ToColor();
MR.material.SetColor(Tint, atmo.fogTint.ToColor()); MR.material.SetColor(Tint, atmo.fogTint.ToColor());
}
MR.material.SetFloat(Radius, atmo.fogSize); MR.material.SetFloat(Radius, atmo.fogSize);
MR.material.SetFloat(Density, atmo.fogDensity); MR.material.SetFloat(Density, atmo.fogDensity);
MR.material.SetFloat(DensityExponent, 1); MR.material.SetFloat(DensityExponent, 1);

3
NewHorizons/Builder/Body/Geometry/CubeSphere.cs
View File

@ -132,7 +132,8 @@ namespace NewHorizons.Builder.Body.Geometry
float sampleX = heightMap.width * longitude / 360f; float sampleX = heightMap.width * longitude / 360f;
float sampleY = heightMap.height * latitude / 180f; float sampleY = heightMap.height * latitude / 180f;
if (sampleX > heightMap.width) sampleX -= heightMap.width; // TODO: find out if this actually does anything if (sampleX > heightMap.width) sampleX -= heightMap.width;
if (sampleX < 0) sampleX += heightMap.width;
float relativeHeight = heightMap.GetPixel((int)sampleX, (int)sampleY).r; float relativeHeight = heightMap.GetPixel((int)sampleX, (int)sampleY).r;

13
NewHorizons/Patches/PlayerFogWarpDetectorPatches.cs
View File

@ -1,5 +1,4 @@
using HarmonyLib; using HarmonyLib;
using UnityEngine;
namespace NewHorizons.Patches namespace NewHorizons.Patches
{ {
@ -9,24 +8,22 @@ namespace NewHorizons.Patches
// Morbius moment: they only let fog go away if there is a fog controller on the planet near you // Morbius moment: they only let fog go away if there is a fog controller on the planet near you
// However you can leave these volumes with fog on your screen, or have fog applied by a bramble node on a fogless planet // However you can leave these volumes with fog on your screen, or have fog applied by a bramble node on a fogless planet
[HarmonyPrefix] [HarmonyPostfix]
[HarmonyPatch(typeof(PlayerFogWarpDetector), nameof(PlayerFogWarpDetector.LateUpdate))] [HarmonyPatch(typeof(PlayerFogWarpDetector), nameof(PlayerFogWarpDetector.LateUpdate))]
public static bool PlayerFogWarpDetector_LateUpdate(PlayerFogWarpDetector __instance) public static void PlayerFogWarpDetector_LateUpdate(PlayerFogWarpDetector __instance)
{ {
if (PlanetaryFogController.GetActiveFogSphere() == null) if (PlanetaryFogController.GetActiveFogSphere() == null)
{ {
float num = __instance._targetFogFraction; __instance._fogFraction = 0;
if (__instance._playerEffectBubbleController != null) if (__instance._playerEffectBubbleController != null)
{ {
__instance._playerEffectBubbleController.SetFogFade(0, __instance._fogColor); __instance._playerEffectBubbleController.SetFogFade(__instance._fogFraction, __instance._fogColor);
} }
if (__instance._shipLandingCamEffectBubbleController != null) if (__instance._shipLandingCamEffectBubbleController != null)
{ {
__instance._shipLandingCamEffectBubbleController.SetFogFade(0, __instance._fogColor); __instance._shipLandingCamEffectBubbleController.SetFogFade(__instance._fogFraction, __instance._fogColor);
} }
return false;
} }
return true;
} }
} }
} }

2
NewHorizons/Utility/CoordinateUtilities.cs
View File

@ -28,7 +28,7 @@ namespace NewHorizons.Utility
var longitude = Mathf.Rad2Deg * Mathf.Atan2(y, x); var longitude = Mathf.Rad2Deg * Mathf.Atan2(y, x);
// phi // phi
float latitude = (Mathf.Rad2Deg * Mathf.Acos(z / dist)); float latitude = Mathf.Rad2Deg * Mathf.Acos(z / dist);
return new Vector3(longitude, latitude, dist); return new Vector3(longitude, latitude, dist);
} }

2
NewHorizons/manifest.json
View File

@ -4,7 +4,7 @@
"author": "xen, Bwc9876, clay, MegaPiggy, John, Book", "author": "xen, Bwc9876, clay, MegaPiggy, John, Book",
"name": "New Horizons", "name": "New Horizons",
"uniqueName": "xen.NewHorizons", "uniqueName": "xen.NewHorizons",
"version": "1.4.1", "version": "1.4.2",
"owmlVersion": "2.5.2", "owmlVersion": "2.5.2",
"conflicts": [ "Raicuparta.QuantumSpaceBuddies", "PacificEngine.OW_Randomizer" ], "conflicts": [ "Raicuparta.QuantumSpaceBuddies", "PacificEngine.OW_Randomizer" ],
"pathsToPreserve": [ "planets", "systems", "translations" ] "pathsToPreserve": [ "planets", "systems", "translations" ]