Performance Optimization
Asteroid belts are now processed without GC allocations Fog Raymarching shader now discards samples far from fog surface Gravity depth calculation avoids some expensive operations
This commit is contained in:
parent
88ae36d137
commit
76eca26972
13 changed files with 2842 additions and 2879 deletions
|
|
@ -7,13 +7,14 @@ using UniRx;
|
|||
using UnityEngine;
|
||||
using static Unity.Mathematics.math;
|
||||
using Unity.Mathematics;
|
||||
using UnityEngine.Serialization;
|
||||
using Random = UnityEngine.Random;
|
||||
|
||||
public class SectorRenderer : MonoBehaviour
|
||||
{
|
||||
public Transform FogCameraParent;
|
||||
public GameSettings Settings;
|
||||
public Transform SectorRoot;
|
||||
public Transform ZoneRoot;
|
||||
public Transform SectorBrushes;
|
||||
public MeshRenderer SectorBoundaryBrush;
|
||||
public MeshRenderer MinimapGravityQuad;
|
||||
|
|
@ -24,11 +25,14 @@ public class SectorRenderer : MonoBehaviour
|
|||
public float FogFarFadeFraction = .125f;
|
||||
public float FarPlaneDistanceMultiplier = 2;
|
||||
public InstancedMesh[] AsteroidMeshes;
|
||||
public int AsteroidSpritesheetWidth = 4;
|
||||
public int AsteroidSpritesheetHeight = 4;
|
||||
|
||||
// public Mesh[] AsteroidMeshes;
|
||||
// public Material AsteroidMaterial;
|
||||
|
||||
|
||||
[Header("Prefabs")]
|
||||
// public MeshFilter AsteroidBeltUI;
|
||||
public PlanetObject Planet;
|
||||
public GasGiantObject GasGiant;
|
||||
public SunObject Sun;
|
||||
|
|
@ -37,8 +41,11 @@ public class SectorRenderer : MonoBehaviour
|
|||
public Texture2D PlanetoidIcon;
|
||||
public Texture2D PlanetIcon;
|
||||
|
||||
// private Dictionary<Guid, AsteroidBeltUI> _beltObjects = new Dictionary<Guid, AsteroidBeltUI>();
|
||||
private Dictionary<Guid, PlanetObject> _planets = new Dictionary<Guid, PlanetObject>();
|
||||
private Dictionary<Guid, InstancedMesh[]> _beltMeshes = new Dictionary<Guid, InstancedMesh[]>();
|
||||
private Dictionary<Guid, Matrix4x4[][]> _beltMatrices = new Dictionary<Guid, Matrix4x4[][]>();
|
||||
private Dictionary<Guid, float3[]> _beltAsteroidPositions = new Dictionary<Guid, float3[]>();
|
||||
private Zone _zone;
|
||||
private float _viewDistance;
|
||||
private float _maxDepth;
|
||||
|
|
@ -97,6 +104,7 @@ public class SectorRenderer : MonoBehaviour
|
|||
}
|
||||
_planets.Clear();
|
||||
_beltMeshes.Clear();
|
||||
_beltMatrices.Clear();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -108,6 +116,19 @@ public class SectorRenderer : MonoBehaviour
|
|||
while(meshes.Count > Settings.AsteroidMeshCount)
|
||||
meshes.RemoveAt(Random.Range(0,meshes.Count));
|
||||
_beltMeshes[planetData.ID] = meshes.ToArray();
|
||||
_beltMatrices[planetData.ID] = new Matrix4x4[meshes.Count][];
|
||||
_beltAsteroidPositions[planetData.ID] = new float3[beltData.Asteroids.Length];
|
||||
var count = beltData.Asteroids.Length / meshes.Count;
|
||||
var remainder = beltData.Asteroids.Length - count * meshes.Count;
|
||||
for (int i = 0; i < meshes.Count; i++)
|
||||
{
|
||||
_beltMatrices[planetData.ID][i] = new Matrix4x4[i<meshes.Count-1 ? count : count+remainder];
|
||||
}
|
||||
|
||||
// var beltObject = Instantiate(AsteroidBeltUI, ZoneRoot);
|
||||
// var collider = beltObject.GetComponent<MeshCollider>();
|
||||
// var belt = new AsteroidBeltUI(_zone, _zone.AsteroidBelts[beltData.ID], beltObject, collider, AsteroidSpritesheetWidth, AsteroidSpritesheetHeight, Settings.MinimapAsteroidSize);
|
||||
// _beltObjects[beltData.ID] = belt;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -116,14 +137,14 @@ public class SectorRenderer : MonoBehaviour
|
|||
{
|
||||
if (planetData is SunData sunData)
|
||||
{
|
||||
planet = Instantiate(Sun, SectorRoot);
|
||||
planet = Instantiate(Sun, ZoneRoot);
|
||||
var sun = (SunObject) planet;
|
||||
sunData.LightColor.Subscribe(c => sun.Light.color = c);
|
||||
sunData.Mass.Subscribe(m => sun.Light.range = Settings.PlanetSettings.LightRadius.Evaluate(m));
|
||||
sunData.FogTintColor.Subscribe(c => sun.FogTint.material.SetColor("_Color", c));
|
||||
sunData.Mass.Subscribe(m => sun.FogTint.transform.localScale = Settings.PlanetSettings.FogTintRadius.Evaluate(m) * Vector3.one);
|
||||
}
|
||||
else planet = Instantiate(GasGiant, SectorRoot);
|
||||
else planet = Instantiate(GasGiant, ZoneRoot);
|
||||
|
||||
var gas = (GasGiantObject) planet;
|
||||
var gasGiant = _zone.PlanetInstances[planetData.ID] as GasGiant;
|
||||
|
|
@ -140,7 +161,7 @@ public class SectorRenderer : MonoBehaviour
|
|||
}
|
||||
else
|
||||
{
|
||||
planet = Instantiate(Planet, SectorRoot);
|
||||
planet = Instantiate(Planet, ZoneRoot);
|
||||
//planet.Icon.material.mainTexture = planetData.Mass > Context.GlobalData.PlanetMass ? PlanetIcon : PlanetoidIcon;
|
||||
}
|
||||
|
||||
|
|
@ -153,7 +174,7 @@ public class SectorRenderer : MonoBehaviour
|
|||
planet.GravityWell.material.SetFloat("_Depth", f);
|
||||
});
|
||||
|
||||
_planets.Add(planetData.ID, planet);
|
||||
_planets[planetData.ID] = planet;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -161,18 +182,25 @@ public class SectorRenderer : MonoBehaviour
|
|||
{
|
||||
foreach(var belt in _zone.AsteroidBelts)
|
||||
{
|
||||
// _beltObjects[belt.Key].Update();
|
||||
var meshes = _beltMeshes[belt.Key];
|
||||
for (int i = 0; i < _beltAsteroidPositions[belt.Key].Length; i++)
|
||||
_beltAsteroidPositions[belt.Key][i] = float3(belt.Value.Transforms[i].x, _zone.GetHeight(belt.Value.Transforms[i].xy), belt.Value.Transforms[i].y);
|
||||
var count = belt.Value.Transforms.Length / meshes.Length;
|
||||
for (int i = 0; i < meshes.Length; i++)
|
||||
{
|
||||
var matrices = belt.Value.Transforms
|
||||
.Skip((int) (((float)i / meshes.Length) * belt.Value.Transforms.Length))
|
||||
.Take((int) (1f / meshes.Length * belt.Value.Transforms.Length))
|
||||
.Select((v, x) => Matrix4x4.TRS(
|
||||
new Vector3(v.x, _zone.GetHeight(v.xy), v.y),
|
||||
Quaternion.Euler(cos(v.z + (float) i / meshes.Length) * 100, sin(v.z + (float) i / meshes.Length) * 100, (float)x/belt.Value.Transforms.Length * 360),
|
||||
Vector3.one * v.w))
|
||||
.ToArray();
|
||||
Graphics.DrawMeshInstanced(meshes[i].Mesh, 0, meshes[i].Material, matrices);
|
||||
for (int t = 0; t < _beltMatrices[belt.Key][i].Length; t++)
|
||||
{
|
||||
var tx = t + i * count;
|
||||
_beltMatrices[belt.Key][i][t] = Matrix4x4.TRS(_beltAsteroidPositions[belt.Key][tx],
|
||||
Quaternion.Euler(
|
||||
cos(belt.Value.Transforms[tx].z + (float) i / meshes.Length) * 100,
|
||||
sin(belt.Value.Transforms[tx].z + (float) i / meshes.Length) * 100,
|
||||
(float) tx / belt.Value.Transforms.Length * 360),
|
||||
Vector3.one * belt.Value.Transforms[tx].w);
|
||||
}
|
||||
|
||||
Graphics.DrawMeshInstanced(meshes[i].Mesh, 0, meshes[i].Material, _beltMatrices[belt.Key][i]);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -213,3 +241,91 @@ public class InstancedMesh
|
|||
public Mesh Mesh;
|
||||
public Material Material;
|
||||
}
|
||||
|
||||
public class AsteroidBeltUI
|
||||
{
|
||||
private MeshFilter _filter;
|
||||
private MeshCollider _collider;
|
||||
private Vector3[] _vertices;
|
||||
private Vector3[] _normals;
|
||||
private Vector2[] _uvs;
|
||||
private int[] _indices;
|
||||
private Guid _orbitParent;
|
||||
private Mesh _mesh;
|
||||
private float _size;
|
||||
private Zone _zone;
|
||||
private AsteroidBelt _belt;
|
||||
private float _scale;
|
||||
|
||||
public AsteroidBeltUI(Zone zone, AsteroidBelt belt, MeshFilter meshFilter, MeshCollider collider, int spritesheetWidth, int spritesheetHeight, float scale)
|
||||
{
|
||||
_belt = belt;
|
||||
_zone = zone;
|
||||
_filter = meshFilter;
|
||||
_collider = collider;
|
||||
var orbit = zone.Orbits[belt.Data.Orbit];
|
||||
_orbitParent = orbit.Data.Parent;
|
||||
_vertices = new Vector3[_belt.Data.Asteroids.Length*4];
|
||||
_normals = new Vector3[_belt.Data.Asteroids.Length*4];
|
||||
_uvs = new Vector2[_belt.Data.Asteroids.Length*4];
|
||||
_indices = new int[_belt.Data.Asteroids.Length*6];
|
||||
_scale = scale;
|
||||
|
||||
var maxDist = 0f;
|
||||
var spriteSize = float2(1f / spritesheetWidth, 1f / spritesheetHeight);
|
||||
// vertex order: bottom left, top left, top right, bottom right
|
||||
for (var i = 0; i < belt.Data.Asteroids.Length; i++)
|
||||
{
|
||||
if (belt.Data.Asteroids[i].Distance > maxDist)
|
||||
maxDist = belt.Data.Asteroids[i].Distance;
|
||||
var spriteX = Random.Range(0, spritesheetWidth);
|
||||
var spriteY = Random.Range(0, spritesheetHeight);
|
||||
|
||||
_uvs[i * 4] = new Vector2(spriteX * spriteSize.x, spriteY * spriteSize.y);
|
||||
_uvs[i * 4 + 1] = new Vector2(spriteX * spriteSize.x, spriteY * spriteSize.y + spriteSize.y);
|
||||
_uvs[i * 4 + 2] = new Vector2(spriteX * spriteSize.x + spriteSize.x, spriteY * spriteSize.y + spriteSize.y);
|
||||
_uvs[i * 4 + 3] = new Vector2(spriteX * spriteSize.x + spriteSize.x, spriteY * spriteSize.y);
|
||||
|
||||
_indices[i * 6] = i * 4;
|
||||
_indices[i * 6 + 1] = i * 4 + 1;
|
||||
_indices[i * 6 + 2] = i * 4 + 3;
|
||||
_indices[i * 6 + 3] = i * 4 + 3;
|
||||
_indices[i * 6 + 4] = i * 4 + 1;
|
||||
_indices[i * 6 + 5] = i * 4 + 2;
|
||||
}
|
||||
|
||||
for (var i = 0; i < _normals.Length; i++)
|
||||
{
|
||||
_normals[i] = -Vector3.forward;
|
||||
}
|
||||
|
||||
_mesh = new Mesh();
|
||||
_mesh.vertices = _vertices;
|
||||
_mesh.uv = _uvs;
|
||||
_mesh.triangles = _indices;
|
||||
_mesh.normals = _normals;
|
||||
_mesh.bounds = new Bounds(Vector3.zero, Vector3.one * maxDist);
|
||||
_size = maxDist;
|
||||
|
||||
_filter.mesh = _mesh;
|
||||
//_collider.sharedMesh = _mesh;
|
||||
}
|
||||
|
||||
public void Update()
|
||||
{
|
||||
var parentPosition = _zone.GetOrbitPosition(_orbitParent);
|
||||
for (var i = 0; i < _belt.Data.Asteroids.Length; i++)
|
||||
{
|
||||
var rotation = Quaternion.Euler(90, _belt.Transforms[i].z, 0);
|
||||
var position = new Vector3(_belt.Transforms[i].x, _zone.GetHeight(parentPosition), _belt.Transforms[i].y);
|
||||
_vertices[i * 4] = rotation * new Vector3(-_belt.Transforms[i].w * _scale,-_belt.Transforms[i].w * _scale,0) + position;
|
||||
_vertices[i * 4 + 1] = rotation * new Vector3(-_belt.Transforms[i].w * _scale,_belt.Transforms[i].w * _scale,0) + position;
|
||||
_vertices[i * 4 + 2] = rotation * new Vector3(_belt.Transforms[i].w * _scale,_belt.Transforms[i].w * _scale,0) + position;
|
||||
_vertices[i * 4 + 3] = rotation * new Vector3(_belt.Transforms[i].w * _scale,-_belt.Transforms[i].w * _scale,0) + position;
|
||||
}
|
||||
|
||||
_mesh.bounds = new Bounds((Vector2) parentPosition, Vector3.one * (_size * 2));
|
||||
_mesh.vertices = _vertices;
|
||||
_collider.sharedMesh = _mesh;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in a new issue