GameCult/Aetheria
Watch
9
0
Fork
You've already forked Aetheria
 0
Code Issues Pull requests 3 Projects Releases Packages Wiki Activity Actions

Keep orbit consumer edges on typed keys

Browse source
This commit is contained in:
Meta Vens 2026-06-16 16:13:54 +01:00
commit be3db3d734
7 changed files with 101 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Assets/Scripts/Gameplay/ActionGameManager.cs
View file

@ -2901,20 +2901,21 @@ public class ActionGameManager : MonoBehaviour
{
ZoneRenderer.PerspectiveEntity = ship;
var entityPosition = ship.Position.xz;
var followOrbit = Zone.Orbits.Keys.MinBy(o => lengthsq(Zone.GetOrbitPosition(o) - entityPosition));
var followPlanetId = Zone.PlanetInstances.Values.First(planet => planet.OrbitId == followOrbit).ID;
var followOrbit = Zone.Orbits.Values.MinBy(orbit => lengthsq(Zone.GetOrbitPosition(orbit.OrbitKey) - entityPosition));
var followPlanetId = Zone.PlanetInstances.Values.First(planet => planet.OrbitKey == followOrbit.OrbitKey).ID;
var followPlanet = ZoneRenderer.Planets[followPlanetId];
DockCamera.Follow = followPlanet.Body.transform;
var rootOrbit = followOrbit;
while (Zone.Orbits[rootOrbit].Parent != Guid.Empty)
rootOrbit = Zone.Orbits[rootOrbit].Parent;
var rootPlanetId = Zone.PlanetInstances.Values.First(planet => planet.OrbitId == rootOrbit).ID;
while (!string.IsNullOrWhiteSpace(rootOrbit.ParentOrbitKey) &&
Zone.TryGetOrbit(rootOrbit.ParentOrbitKey, out var parentOrbit))
rootOrbit = parentOrbit;
var rootPlanetId = Zone.PlanetInstances.Values.First(planet => planet.OrbitKey == rootOrbit.OrbitKey).ID;
var rootPlanet = ZoneRenderer.Planets[rootPlanetId];
DockCamera.LookAt = rootPlanet.Body.transform;
var shipVelocity = ship.GetBehavior<VelocityLimit>().Limit;
var followOrbitPosition = Zone.GetOrbitPosition(followOrbit);
var shipDirection = normalize(Zone.GetOrbitPosition(rootOrbit) - followOrbitPosition);
var followOrbitPosition = Zone.GetOrbitPosition(followOrbit.OrbitKey);
var shipDirection = normalize(Zone.GetOrbitPosition(rootOrbit.OrbitKey) - followOrbitPosition);
ship.Position.xz = followOrbitPosition - shipDirection * shipVelocity * IntroDuration;
var startTime = Time.time;

2
Assets/Scripts/ServerShared/Behaviors/ResourceScanner.cs
View file

@ -75,7 +75,7 @@ public class ResourceScanner : Behavior, IAlwaysUpdatedBehavior
}
else if (Entity.Zone.TryGetPlanet(ScanTargetBodyKey, out var planet))
{
if(length(Entity.Position.xz - Entity.Zone.GetOrbitPosition(planet.OrbitId)) < Range)
if(length(Entity.Position.xz - Entity.Zone.GetOrbitPosition(planet.OrbitKey)) < Range)
{
_scanTime += dt;
if (_scanTime > ScanDuration)

11
Assets/Scripts/Zone Display/ZoneRenderer.cs
View file

@ -191,14 +191,14 @@ public class ZoneRenderer : MonoBehaviour
SlimeRenderer.ZoneRadius = zone.Radius;
foreach (var orbit in zone.Orbits.Values)
{
var planet = zone.PlanetInstances.Values.FirstOrDefault(body => body.OrbitId == orbit.ID);
var planet = zone.PlanetInstances.Values.FirstOrDefault(body => body.OrbitKey == orbit.OrbitKey);
if (planet != null)
{
LoadPlanet(planet);
continue;
}
var belt = zone.AsteroidBelts.Values.FirstOrDefault(body => body.Orbit == orbit.ID);
var belt = zone.AsteroidBelts.Values.FirstOrDefault(body => body.OrbitKey == orbit.OrbitKey);
if (belt != null) LoadAsteroidBelt(belt);
}
@ -506,7 +506,7 @@ public class ZoneRenderer : MonoBehaviour
foreach (var planet in Planets)
{
var planetInstance = Zone.PlanetInstances[planet.Key];
var p = Zone.GetOrbitPosition(planetInstance.OrbitId);
var p = Zone.GetOrbitPosition(planetInstance.OrbitKey);
var height = Zone.GetHeight(p);
if (-height > maxDepth) maxDepth = -height;
planet.Value.transform.position = new Vector3(p.x, 0, p.y);
@ -517,7 +517,7 @@ public class ZoneRenderer : MonoBehaviour
Zone.Time * ((GasGiant) Zone.PlanetInstances[planet.Key]).GravityWavesSpeed);
if (!(planet.Value is SunObject))
{
var toParent = normalize(Zone.GetOrbitPosition(Zone.Orbits[planetInstance.OrbitId].Parent) - p);
var toParent = normalize(Zone.GetOrbitPosition(planetInstance.Orbit.ParentOrbitKey) - p);
gasGiantObject.SunMaterial.LightingDirection = new Vector3(toParent.x, 0, toParent.y);
}
}
@ -628,7 +628,6 @@ public class AsteroidBeltUI
private Vector3[] _normals;
private Vector2[] _uvs;
private int[] _indices;
private Guid _orbitParent;
private Mesh _mesh;
private float _size;
private Zone _zone;
@ -647,8 +646,6 @@ public class AsteroidBeltUI
_zone = zone;
Filter = meshFilter;
_collider = collider;
var orbit = zone.Orbits[belt.Orbit];
_orbitParent = orbit.Parent;
_vertices = new Vector3[_belt.AsteroidCount * 4];
_normals = new Vector3[_belt.AsteroidCount * 4];
_uvs = new Vector2[_belt.AsteroidCount * 4];