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

Fix bad merges

Browse Source
This commit is contained in:
xen-42 2025-02-14 22:48:55 -05:00
parent b4e02146e6
commit 65fd7abba7
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NewHorizons/Builder/Body/HeightMapBuilder.cs
View File

@ -11,8 +11,7 @@ namespace NewHorizons.Builder.Body
{ {
public static class HeightMapBuilder public static class HeightMapBuilder
{ {
private static Shader _planetShader; public static Shader PlanetShader;
public static Shader PlanetShader => _planetShader ??= Main.NHAssetBundle.LoadAsset<Shader>("Assets/Shaders/SphereTextureWrapperTriplanar.shader");
// I hate nested functions okay // I hate nested functions okay
private static IModBehaviour _currentMod; private static IModBehaviour _currentMod;

4
NewHorizons/Builder/Body/ProcGenBuilder.cs
View File

@ -12,8 +12,8 @@ namespace NewHorizons.Builder.Body
public static GameObject Make(GameObject planetGO, Sector sector, ProcGenModule module) public static GameObject Make(GameObject planetGO, Sector sector, ProcGenModule module)
{ {
quantumMaterial ??= SearchUtilities.FindResourceOfTypeAndName<Material>("Rock_QM_EyeRock_mat"); if (quantumMaterial == null) quantumMaterial = SearchUtilities.FindResourceOfTypeAndName<Material>("Rock_QM_EyeRock_mat");
iceMaterial ??= SearchUtilities.FindResourceOfTypeAndName<Material>("Rock_BH_IceSpike_mat"); if (iceMaterial == null) iceMaterial = SearchUtilities.FindResourceOfTypeAndName<Material>("Rock_BH_IceSpike_mat");
var icosphere = new GameObject("Icosphere"); var icosphere = new GameObject("Icosphere");
icosphere.SetActive(false); icosphere.SetActive(false);