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 #241 from xen-42/height-map-resolution

Browse Source 
Height map resolution

merge time
This commit is contained in:
Will Corby 2022-07-21 16:24:35 -07:00 committed by GitHub
commit b7465809f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 58 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,7 @@
using NewHorizons.Builder.Body.Geometry;
using NewHorizons.External.Configs;
using NewHorizons.External.Modules;
using NewHorizons.Handlers;
using NewHorizons.Utility;
using OWML.Common;
using System;
@ -11,7 +13,7 @@ namespace NewHorizons.Builder.Body
{
public static Shader PlanetShader;
public static void Make(GameObject planetGO, Sector sector, HeightMapModule module, IModBehaviour mod, int resolution)
public static void Make(GameObject planetGO, Sector sector, HeightMapModule module, IModBehaviour mod, int resolution, bool useLOD = false)
{
var deleteHeightmapFlag = false;
@ -51,24 +53,35 @@ namespace NewHorizons.Builder.Body
GameObject cubeSphere = new GameObject("CubeSphere");
cubeSphere.SetActive(false);
cubeSphere.transform.parent = sector?.transform ?? planetGO.transform;
cubeSphere.transform.rotation = Quaternion.Euler(90, 0, 0);
Vector3 stretch = module.stretch != null ? (Vector3)module.stretch : Vector3.one;
Mesh mesh = CubeSphere.Build(resolution, heightMap, module.minHeight, module.maxHeight, stretch);
cubeSphere.AddComponent<MeshFilter>();
cubeSphere.GetComponent<MeshFilter>().mesh = mesh;
if (PlanetShader == null) PlanetShader = Main.NHAssetBundle.LoadAsset<Shader>("Assets/Shaders/SphereTextureWrapper.shader");
var cubeSphereMR = cubeSphere.AddComponent<MeshRenderer>();
var material = new Material(PlanetShader);
cubeSphereMR.material = material;
material.name = textureMap.name;
material.mainTexture = textureMap;
Vector3 stretch = module.stretch != null ? (Vector3)module.stretch : Vector3.one;
var level1 = MakeLODTerrain(cubeSphere, heightMap, textureMap, module.minHeight, module.maxHeight, resolution, stretch);
var cubeSphereMC = cubeSphere.AddComponent<MeshCollider>();
cubeSphereMC.sharedMesh = mesh;
cubeSphereMC.sharedMesh = level1.gameObject.GetComponent<MeshFilter>().mesh;
if (useLOD)
{
var level2Res = (int)Mathf.Clamp(resolution / 2f, 35, 100);
var level2 = MakeLODTerrain(cubeSphere, heightMap, textureMap, module.minHeight, module.maxHeight, level2Res, stretch);
var LODGroup = cubeSphere.AddComponent<LODGroup>();
LODGroup.size = module.maxHeight;
LODGroup.SetLODs(new LOD[]
{
new LOD(1 / 3f, new Renderer[] { level1 }),
new LOD(0, new Renderer[] { level2 })
});
level1.name += "0";
level2.name += "1";
LODGroup.RecalculateBounds();
}
var cubeSphereSC = cubeSphere.AddComponent<SphereCollider>();
cubeSphereSC.radius = Mathf.Min(module.minHeight, module.maxHeight);
@ -86,5 +99,26 @@ namespace NewHorizons.Builder.Body
// Now that we've made the mesh we can delete the heightmap texture
if (deleteHeightmapFlag) ImageUtilities.DeleteTexture(mod, module.heightMap, heightMap);
}
public static MeshRenderer MakeLODTerrain(GameObject root, Texture2D heightMap, Texture2D textureMap, float minHeight, float maxHeight, int resolution, Vector3 stretch)
{
var LODCubeSphere = new GameObject("LODCubeSphere");
Mesh mesh = CubeSphere.Build(resolution, heightMap, minHeight, maxHeight, stretch);
LODCubeSphere.AddComponent<MeshFilter>();
LODCubeSphere.GetComponent<MeshFilter>().mesh = mesh;
var cubeSphereMR = LODCubeSphere.AddComponent<MeshRenderer>();
var material = new Material(PlanetShader);
cubeSphereMR.material = material;
material.name = textureMap.name;
material.mainTexture = textureMap;
LODCubeSphere.transform.parent = root.transform;
LODCubeSphere.transform.localPosition = Vector3.zero;
return cubeSphereMR;
}
}
}

2
NewHorizons/External/Modules/HeightMapModule.cs vendored
View File

@ -33,7 +33,6 @@ namespace NewHorizons.External.Modules
/// </summary>
public string textureMap;
/*
/// <summary>
/// Resolution of the heightmap.
/// Higher values means more detail but also more memory/cpu/gpu usage.
@ -42,6 +41,5 @@ namespace NewHorizons.External.Modules
[Range(1 * 4, 500 * 4)]
[DefaultValue(51 * 4)]
public int resolution = 51 * 4;
*/
}
}

5
NewHorizons/Handlers/PlanetCreationHandler.cs
View File

@ -466,13 +466,10 @@ namespace NewHorizons.Handlers
if (body.Config.HeightMap != null)
{
/*
// resolution = tris on edge per face
// divide by 4 to account for all the way around the equator
var res = body.Config.HeightMap.resolution / 4;
HeightMapBuilder.Make(go, sector, body.Config.HeightMap, body.Mod, res);
*/
HeightMapBuilder.Make(go, sector, body.Config.HeightMap, body.Mod, 51);
HeightMapBuilder.Make(go, sector, body.Config.HeightMap, body.Mod, res, true);
}
if (body.Config.ProcGen != null)

8
NewHorizons/Schemas/body_schema.json
View File

@ -710,6 +710,14 @@
"textureMap": {
"type": "string",
"description": "Relative filepath to the texture used for the terrain."
},
"resolution": {
"type": "integer",
"description": "Resolution of the heightmap.\nHigher values means more detail but also more memory/cpu/gpu usage.\nThis value will be 1:1 with the heightmap texture width, but only at the equator.",
"format": "int32",
"default": 204,
"maximum": 2000.0,
"minimum": 4.0
}
}
},

4
NewHorizons/Utility/CoordinateUtilities.cs
View File

@ -25,9 +25,7 @@ namespace NewHorizons.Utility
float dist = Mathf.Sqrt(x * x + y * y + z * z);
// theta
float longitude = 180f;
if (x > 0) longitude = Mathf.Rad2Deg * Mathf.Atan(y / x);
if (x < 0) longitude = Mathf.Rad2Deg * (Mathf.Atan(y / x) + Mathf.PI);
var longitude = Mathf.Rad2Deg * Mathf.Atan2(y, x);
// phi
float latitude = (Mathf.Rad2Deg * Mathf.Acos(z / dist));