From b353652316b9fd90ef7c822bb4a52497a2a64a19 Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Sun, 21 Jun 2026 15:47:39 +0100 Subject: [PATCH] Query asteroid render poses from daemon state --- Aetheria.State.Verify/Program.cs | 12 +- Assets/Scripts/Gameplay/ActionGameManager.cs | 2 - Assets/Scripts/ServerShared/Entity.cs | 1 - .../Tests/DaemonRuntimeDocumentTests.cs | 86 +++++++++++++- Assets/Scripts/Zone Display/ZoneRenderer.cs | 71 +++++++----- .../AetheriaRuntimeDaemonRenderQueries.cs | 107 +++++++++++++++++- 6 files changed, 245 insertions(+), 34 deletions(-) diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index 4d8bc67d3..86d7e06f2 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -1822,6 +1822,10 @@ static void RequireDaemonRenderQueryAuthority(string root) "AetheriaRuntimeDaemonAsteroidBeltPose", "public static AetheriaRuntimeDaemonAsteroidBeltPose[] QueryAsteroidBeltPoses(", "public static int QueryAsteroidBeltPoses(", + "AetheriaRuntimeDaemonAsteroidInstancePose", + "public static AetheriaRuntimeDaemonAsteroidInstancePose[] QueryAsteroidInstancePoses(", + "public static int QueryAsteroidInstancePoses(", + "TryResolveAsteroidBeltCenter(body, orbitPositions, orbits, out var center)", "ResolveAsteroidBeltRadius(body)" }; @@ -1908,10 +1912,11 @@ static void RequireDaemonRenderQueryAuthority(string root) } if (zoneRenderer.Contains("belt.OrbitPosition", StringComparison.Ordinal) || - zoneRenderer.Contains("belt.Radius", StringComparison.Ordinal)) + zoneRenderer.Contains("belt.Radius", StringComparison.Ordinal) || + zoneRenderer.Contains("belt.Transforms", StringComparison.Ordinal)) { throw new InvalidOperationException( - "ZoneRenderer frame updates must read asteroid belt pose and radius from daemon belt poses instead of mirrored Unity asteroid belts."); + "ZoneRenderer frame updates must read asteroid belt and instance poses from daemon render queries instead of mirrored Unity asteroid belts."); } if (zoneRenderer.Contains("_zoneSubscriptions", StringComparison.Ordinal) || @@ -1925,7 +1930,6 @@ static void RequireDaemonRenderQueryAuthority(string root) var requiredZoneRendererSymbols = new[] { "private AetheriaRuntimeZoneSnapshotCommit _daemonZoneSnapshot;", - "private readonly Dictionary _entityInstancesByDaemonKey", "private readonly List _daemonBodyPoses", "private readonly Dictionary _daemonBodyPosesByBodyKey", "private readonly List _daemonAsteroidBeltPoses", @@ -1933,6 +1937,7 @@ static void RequireDaemonRenderQueryAuthority(string root) "public void LoadZone(Zone zone, AetheriaRuntimeZoneSnapshotCommit daemonZone = null)", "_daemonZoneSnapshot = daemonZone;", "AetheriaRuntimeDaemonRenderQueries.EvaluateGravityTerrainHeight(", + "private readonly List _visibleAsteroidInstancePoses", "foreach (var pose in _daemonBodyPoses)", "zone.PlanetInstances.TryGetValue(pose.BodyKey, out var planet)", "zone.AsteroidBelts.TryGetValue(pose.BodyKey, out var belt)", @@ -1941,6 +1946,7 @@ static void RequireDaemonRenderQueryAuthority(string root) "foreach (var entity in EntityInstances.Keys.ToArray())", "AetheriaRuntimeDaemonRenderQueries.QueryBodyPoses(_daemonZoneSnapshot, _daemonBodyPoses);", "AetheriaRuntimeDaemonRenderQueries.QueryAsteroidBeltPoses(_daemonZoneSnapshot, _daemonAsteroidBeltPoses);", + "AetheriaRuntimeDaemonRenderQueries.QueryAsteroidInstancePoses(", "_daemonBodyPosesByBodyKey.TryGetValue(planet.Key, out var pose)", "_daemonAsteroidBeltPosesByBodyKey.TryGetValue(key, out var beltPose)", "pose.GravityWaveSpeed" diff --git a/Assets/Scripts/Gameplay/ActionGameManager.cs b/Assets/Scripts/Gameplay/ActionGameManager.cs index 8ddff5a11..0f9feb95a 100644 --- a/Assets/Scripts/Gameplay/ActionGameManager.cs +++ b/Assets/Scripts/Gameplay/ActionGameManager.cs @@ -2693,7 +2693,6 @@ public class ActionGameManager : MonoBehaviour if (!_authoritativeDaemonEntities.TryGetValue(entitySnapshot.RecordKey, out var entity)) continue; - entity.DaemonRecordKey = entitySnapshot.RecordKey ?? ""; entity.DaemonEntityIndex = EntityIndexFromRecordKey(entitySnapshot.RecordKey); entity.Name = entitySnapshot.Name ?? ""; entity.CultPosition = new CultMath.float3((float)entitySnapshot.PositionX, (float)entitySnapshot.PositionY, (float)entitySnapshot.PositionZ); @@ -2768,7 +2767,6 @@ public class ActionGameManager : MonoBehaviour entity.OverrideShutdown = entitySnapshot.OverrideShutdown; entity.TractorPower = (float)entitySnapshot.TractorPower; entity.RestoreActiveState(entitySnapshot.IsActive); - entity.DaemonRecordKey = entitySnapshot.RecordKey ?? ""; entity.DaemonEntityIndex = EntityIndexFromRecordKey(entitySnapshot.RecordKey); entity.Zone = Zone; Zone.Entities.Add(entity); diff --git a/Assets/Scripts/ServerShared/Entity.cs b/Assets/Scripts/ServerShared/Entity.cs index 2fcf45e14..c5914fbe2 100644 --- a/Assets/Scripts/ServerShared/Entity.cs +++ b/Assets/Scripts/ServerShared/Entity.cs @@ -43,7 +43,6 @@ public abstract class Entity public Faction Faction; public EquippableItem Hull; public EquippedItem EquippedHull; - public string DaemonRecordKey = ""; public int DaemonEntityIndex = -1; public float3 Position; diff --git a/Assets/Scripts/Tests/DaemonRuntimeDocumentTests.cs b/Assets/Scripts/Tests/DaemonRuntimeDocumentTests.cs index 05983dfea..a9963397f 100644 --- a/Assets/Scripts/Tests/DaemonRuntimeDocumentTests.cs +++ b/Assets/Scripts/Tests/DaemonRuntimeDocumentTests.cs @@ -795,9 +795,15 @@ public class DaemonRuntimeDocumentTests { new AetheriaRuntimeOrbitSnapshotCommit { - OrbitKey = "orbit:belt", + OrbitKey = "orbit:parent", FixedPositionX = 11, FixedPositionY = -4 + }, + new AetheriaRuntimeOrbitSnapshotCommit + { + OrbitKey = "orbit:belt", + ParentOrbitKey = "orbit:parent", + Distance = 30 } }, Bodies = new[] @@ -834,6 +840,84 @@ public class DaemonRuntimeDocumentTests Assert.AreEqual(3, poses[0].AsteroidCount); } + [Test] + public void DaemonRenderQueriesPublishAsteroidInstancePosesForVisibleBelt() + { + var zone = new AetheriaRuntimeZoneSnapshotCommit + { + Orbits = new[] + { + new AetheriaRuntimeOrbitSnapshotCommit + { + OrbitKey = "orbit:parent", + FixedPositionX = 10, + FixedPositionY = 20 + }, + new AetheriaRuntimeOrbitSnapshotCommit + { + OrbitKey = "orbit:belt", + ParentOrbitKey = "orbit:parent", + Distance = 100 + } + }, + Bodies = new[] + { + new AetheriaRuntimeBodySnapshotCommit + { + BodyKey = "body:belt", + OrbitKey = "orbit:belt", + Kind = "asteroid_belt", + Asteroids = new[] + { + new AetheriaRuntimeAsteroidCommit + { + Distance = 5, + Phase = 0, + Size = 2, + RotationSpeed = 3 + }, + new AetheriaRuntimeAsteroidCommit + { + Distance = 7, + Phase = 0.25, + Size = 4, + Damage = 1, + RotationSpeed = 2 + }, + new AetheriaRuntimeAsteroidCommit + { + Distance = 11, + Phase = 0.5, + Size = 9, + RespawnTimer = 12 + } + } + }, + new AetheriaRuntimeBodySnapshotCommit + { + BodyKey = "body:other", + OrbitKey = "orbit:belt", + Kind = "asteroid_belt", + Asteroids = new[] { new AetheriaRuntimeAsteroidCommit { Distance = 99, Size = 99 } } + } + } + }; + + var poses = AetheriaRuntimeDaemonRenderQueries.QueryAsteroidInstancePoses(zone, "body:belt", 4); + + Assert.AreEqual(3, poses.Length); + Assert.AreEqual("body:belt", poses[0].BodyKey); + Assert.AreEqual(0, poses[0].AsteroidIndex); + Assert.AreEqual(15, poses[0].PositionX, 0.0001); + Assert.AreEqual(20, poses[0].PositionZ, 0.0001); + Assert.AreEqual(12, poses[0].Rotation, 0.0001); + Assert.AreEqual(2, poses[0].Size, 0.0001); + Assert.AreEqual(10, poses[1].PositionX, 0.0001); + Assert.AreEqual(27, poses[1].PositionZ, 0.0001); + Assert.AreEqual(3, poses[1].Size, 0.0001); + Assert.AreEqual(0, poses[2].Size, 0.0001); + } + [Test] public void SoaViewIndexRejectsInvalidRenderGroups() { diff --git a/Assets/Scripts/Zone Display/ZoneRenderer.cs b/Assets/Scripts/Zone Display/ZoneRenderer.cs index 5329f75ec..922dc7489 100644 --- a/Assets/Scripts/Zone Display/ZoneRenderer.cs +++ b/Assets/Scripts/Zone Display/ZoneRenderer.cs @@ -68,8 +68,6 @@ public class ZoneRenderer : MonoBehaviour [HideInInspector] public Dictionary EntityInstances = new Dictionary(); [HideInInspector] public Dictionary Planets = new Dictionary(StringComparer.Ordinal); - private readonly Dictionary _entityInstancesByDaemonKey = - new Dictionary(StringComparer.Ordinal); private Dictionary _beltObjects = new Dictionary(StringComparer.Ordinal); private Dictionary _beltMeshes = new Dictionary(StringComparer.Ordinal); private Dictionary _beltMatrices = new Dictionary(StringComparer.Ordinal); @@ -94,6 +92,8 @@ public class ZoneRenderer : MonoBehaviour new List(); private readonly Dictionary _daemonAsteroidBeltPosesByBodyKey = new Dictionary(StringComparer.Ordinal); + private readonly List _visibleAsteroidInstancePoses = + new List(); public Dictionary WormholeInstances = new Dictionary(); private List _loot = new List(); @@ -329,8 +329,6 @@ public class ZoneRenderer : MonoBehaviour instance.SetEntity(this, entity); EntityInstances.Add(entity, instance); - if (!string.IsNullOrWhiteSpace(entity.DaemonRecordKey)) - _entityInstancesByDaemonKey[entity.DaemonRecordKey] = instance; } public void UnloadEntity(Entity entity) @@ -349,8 +347,6 @@ public class ZoneRenderer : MonoBehaviour Destroy(instance.gameObject); EntityInstances.Remove(entity); - if (!string.IsNullOrWhiteSpace(entity.DaemonRecordKey)) - _entityInstancesByDaemonKey.Remove(entity.DaemonRecordKey); } void LoadAsteroidBelt(AsteroidBelt runtimeBelt) @@ -486,25 +482,41 @@ public class ZoneRenderer : MonoBehaviour var center = new float2((float)beltPose.CenterX, (float)beltPose.CenterZ); var height = GetTerrainHeight(center); - if(isVisible(new Bounds( + var beltIsVisible = isVisible(new Bounds( new Vector3(center.x,height,center.y), - new Vector3((float)beltPose.Radius * 2,100,(float)beltPose.Radius * 2)))) + new Vector3((float)beltPose.Radius * 2,100,(float)beltPose.Radius * 2))); + if (beltIsVisible || _showAsteroidUI) + { + AetheriaRuntimeDaemonRenderQueries.QueryAsteroidInstancePoses( + _daemonZoneSnapshot, + key, + Zone?.Time ?? 0, + _visibleAsteroidInstancePoses); + } + + if(beltIsVisible) { var meshes = _beltMeshes[key]; var matrices = _beltMatrices[key]; - var count = belt.Transforms.Length / meshes.Length; + var tx = 0; for (int i = 0; i < meshes.Length; i++) { for (int t = 0; t < matrices[i].Length; t++) { - var tx = t + i * count; - var transform = belt.Transforms[tx]; - matrices[i][t] = Matrix4x4.TRS(new Vector3(transform.x,0,transform.y), + if (tx >= _visibleAsteroidInstancePoses.Count) + { + matrices[i][t] = Matrix4x4.TRS(Vector3.zero, Quaternion.identity, Vector3.zero); + continue; + } + + var asteroidPose = _visibleAsteroidInstancePoses[tx]; + matrices[i][t] = Matrix4x4.TRS(new Vector3((float)asteroidPose.PositionX,0,(float)asteroidPose.PositionZ), Quaternion.Euler( - cos(transform.z + (float)i / meshes.Length) * 100, - sin(transform.z + (float)i / meshes.Length) * 100, - (float)tx / belt.Transforms.Length * 360), - Vector3.one * transform.w); + cos((float)asteroidPose.Rotation + (float)i / meshes.Length) * 100, + sin((float)asteroidPose.Rotation + (float)i / meshes.Length) * 100, + (float)tx / Math.Max(1, _visibleAsteroidInstancePoses.Count) * 360), + Vector3.one * (float)asteroidPose.Size); + tx++; } Graphics.DrawMeshInstanced(meshes[i].Mesh, 0, meshes[i].Material, matrices[i]); @@ -512,7 +524,7 @@ public class ZoneRenderer : MonoBehaviour } if(_showAsteroidUI) - _beltObjects[key].Update(belt.Transforms, center, height, (float)beltPose.Radius); + _beltObjects[key].Update(_visibleAsteroidInstancePoses, center, height, (float)beltPose.Radius); } foreach (var planet in Planets) @@ -736,17 +748,24 @@ public class AsteroidBeltUI //_collider.sharedMesh = _mesh; } - public void Update(float4[] transforms, float2 center, float height, float radius) + public void Update(IReadOnlyList poses, float2 center, float height, float radius) { - for (var i = 0; i < transforms.Length; i++) + var count = Math.Min(poses.Count, _vertices.Length / 4); + for (var i = 0; i < count; i++) { - var transform = transforms[i]; - var rotation = Quaternion.Euler(90, transform.z, 0); - var position = new Vector3(transform.x, height, transform.y); - _vertices[i * 4] = rotation * new Vector3(-transform.w * _scale, -transform.w * _scale, 0) + position; - _vertices[i * 4 + 1] = rotation * new Vector3(-transform.w * _scale, transform.w * _scale, 0) + position; - _vertices[i * 4 + 2] = rotation * new Vector3(transform.w * _scale, transform.w * _scale, 0) + position; - _vertices[i * 4 + 3] = rotation * new Vector3(transform.w * _scale, -transform.w * _scale, 0) + position; + var pose = poses[i]; + var size = (float)pose.Size; + var rotation = Quaternion.Euler(90, (float)pose.Rotation, 0); + var position = new Vector3((float)pose.PositionX, height, (float)pose.PositionZ); + _vertices[i * 4] = rotation * new Vector3(-size * _scale, -size * _scale, 0) + position; + _vertices[i * 4 + 1] = rotation * new Vector3(-size * _scale, size * _scale, 0) + position; + _vertices[i * 4 + 2] = rotation * new Vector3(size * _scale, size * _scale, 0) + position; + _vertices[i * 4 + 3] = rotation * new Vector3(size * _scale, -size * _scale, 0) + position; + } + + for (var i = count * 4; i < _vertices.Length; i++) + { + _vertices[i] = Vector3.zero; } var boundsRadius = Math.Max(_size, radius); diff --git a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeDaemonRenderQueries.cs b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeDaemonRenderQueries.cs index 7e70fd535..e37076353 100644 --- a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeDaemonRenderQueries.cs +++ b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeDaemonRenderQueries.cs @@ -130,6 +130,32 @@ namespace GameCult.Aetheria.State.Verse public int AsteroidCount { get; } } + public readonly struct AetheriaRuntimeDaemonAsteroidInstancePose + { + public AetheriaRuntimeDaemonAsteroidInstancePose( + string bodyKey, + int asteroidIndex, + double positionX, + double positionZ, + double rotation, + double size) + { + BodyKey = bodyKey ?? ""; + AsteroidIndex = Math.Max(0, asteroidIndex); + PositionX = positionX; + PositionZ = positionZ; + Rotation = rotation; + Size = Math.Max(0, size); + } + + public string BodyKey { get; } + public int AsteroidIndex { get; } + public double PositionX { get; } + public double PositionZ { get; } + public double Rotation { get; } + public double Size { get; } + } + public static class AetheriaRuntimeDaemonRenderQueries { public static AetheriaRuntimeGravityInfluenceBrush[] QueryGravityInfluences( @@ -242,11 +268,12 @@ namespace GameCult.Aetheria.State.Verse return 0; var orbitPositions = BuildOrbitPositions(zone); + var orbits = BuildOrbitMap(zone); foreach (var body in zone.Bodies ?? Array.Empty()) { if (body == null || !string.Equals(body.Kind, "asteroid_belt", StringComparison.OrdinalIgnoreCase) || - !TryResolveBodyCenter(body, orbitPositions, out var center)) + !TryResolveAsteroidBeltCenter(body, orbitPositions, orbits, out var center)) continue; poses.Add(new AetheriaRuntimeDaemonAsteroidBeltPose( @@ -261,6 +288,64 @@ namespace GameCult.Aetheria.State.Verse return poses.Count; } + public static AetheriaRuntimeDaemonAsteroidInstancePose[] QueryAsteroidInstancePoses( + AetheriaRuntimeZoneSnapshotCommit? zone, + string bodyKey, + double simulationTimeSeconds) + { + var poses = new List(); + QueryAsteroidInstancePoses(zone, bodyKey, simulationTimeSeconds, poses); + return poses.Count == 0 ? Array.Empty() : poses.ToArray(); + } + + public static int QueryAsteroidInstancePoses( + AetheriaRuntimeZoneSnapshotCommit? zone, + string bodyKey, + double simulationTimeSeconds, + List poses) + { + if (poses == null) throw new ArgumentNullException(nameof(poses)); + poses.Clear(); + if (zone == null) + return 0; + + var orbitPositions = BuildOrbitPositions(zone); + var orbits = BuildOrbitMap(zone); + foreach (var body in zone.Bodies ?? Array.Empty()) + { + if (body == null || + !string.Equals(body.BodyKey ?? "", bodyKey ?? "", StringComparison.Ordinal) || + !string.Equals(body.Kind, "asteroid_belt", StringComparison.OrdinalIgnoreCase) || + !TryResolveAsteroidBeltCenter(body, orbitPositions, orbits, out var center)) + continue; + + var asteroids = body.Asteroids ?? Array.Empty(); + for (var index = 0; index < asteroids.Count; index++) + { + var asteroid = asteroids[index]; + if (asteroid == null) + continue; + + var phase = Fraction(asteroid.Phase); + var x = center.x + Math.Cos(phase * Math.PI * 2.0) * asteroid.Distance; + var z = center.z + Math.Sin(phase * Math.PI * 2.0) * asteroid.Distance; + var size = asteroid.RespawnTimer > 0 + ? 0 + : Math.Max(0, asteroid.Size - asteroid.Damage); + var rotation = simulationTimeSeconds * asteroid.RotationSpeed; + poses.Add(new AetheriaRuntimeDaemonAsteroidInstancePose( + body.BodyKey ?? "", + index, + x, + z, + rotation, + size)); + } + } + + return poses.Count; + } + public static AetheriaRuntimeDaemonRenderGroupDocument[] QueryRenderGroups( AetheriaRuntimeDaemonSoaViewIndex? index, double minX, @@ -452,6 +537,21 @@ namespace GameCult.Aetheria.State.Verse return orbitPositions.TryGetValue(body.OrbitKey ?? "", out center); } + private static bool TryResolveAsteroidBeltCenter( + AetheriaRuntimeBodySnapshotCommit body, + Dictionary orbitPositions, + Dictionary orbits, + out AetheriaRuntimeXzPoint center) + { + if (orbits.TryGetValue(body.OrbitKey ?? "", out var orbit) && + orbitPositions.TryGetValue(orbit.ParentOrbitKey ?? "", out center)) + { + return true; + } + + return TryResolveBodyCenter(body, orbitPositions, out center); + } + private static double ResolveGravityRadius(AetheriaRuntimeBodySnapshotCommit body) { return body.GravityInfluenceRadius > 0 && IsFinite(body.GravityInfluenceRadius) @@ -506,6 +606,11 @@ namespace GameCult.Aetheria.State.Verse return Math.Pow((x + 1.0) * (1.0 - x), exponent); } + private static double Fraction(double value) + { + return value - Math.Floor(value); + } + private static double RadialWaves( double x, double maskExponent,