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

Move orbit geometry onto runtime owner

Browse source
This commit is contained in:
Meta Vens 2026-06-14 19:43:48 +01:00
commit 7d176f4dc3
5 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
.voidbot/state/aetheria.cc
View file

Binary file not shown.

10
Assets/Scripts/ServerShared/Zone.cs
View file

@ -153,7 +153,7 @@ public class Zone
if (orbit.Period > .01f)
{
var phase = (float) frac(_time / orbit.Period);
pos = OrbitData.Evaluate(frac(phase + orbit.Phase)) * orbit.Distance;
pos = Orbit.Evaluate(frac(phase + orbit.Phase)) * orbit.Distance;
if (float.IsNaN(pos.x))
{
@ -221,7 +221,7 @@ public class Zone
else size = Settings.AsteroidSize.Evaluate(asteroid.Size);
var rot = (float) (_time * asteroid.RotationSpeed % (PI * 2));
var pos = OrbitData.Evaluate((float) frac(_time / Settings.OrbitPeriod.Evaluate(asteroid.Distance) +
var pos = Orbit.Evaluate((float) frac(_time / Settings.OrbitPeriod.Evaluate(asteroid.Distance) +
asteroid.Phase)) * asteroid.Distance + belt.NewOrbitPosition;
//belt.NewPositions[i] = float3(pos.x, GetHeight(pos) + Settings.AsteroidVerticalOffset, pos.y);
belt.NewTransforms[i] = float4(pos.x, pos.y, rot, size);
@ -552,6 +552,12 @@ public class Orbit
public float2 PreviousPosition = float2.zero;
public float Period;
public static float2 Evaluate(float phase)
{
phase *= PI * 2;
return new float2(cos(phase), sin(phase));
}
public Orbit(PlanetSettings settings, OrbitData data)
{
ID = data.ID;

5
Assets/Scripts/ServerShared/ZoneData.cs
View file

@ -115,9 +115,4 @@ public class OrbitData
public float2 FixedPosition = float2.zero;
public static float2 Evaluate(float phase)
{
phase *= PI * 2;
return new float2(cos(phase), sin(phase));
}
}

2
Assets/Scripts/ServerShared/ZoneGenerator.cs
View file

@ -511,7 +511,7 @@ public class GeneratorPlanet
var p0 = new float2(0, dist);
// Position of second child
var p1 = OrbitData.Evaluate(1.0f / vertices) * dist;
var p1 = Orbit.Evaluate(1.0f / vertices) * dist;
// Maximum child distance is half the distance to the neighbor minus the neighbor's radius
var p0ChildDist = (distance(p0, p1) * proportion - Settings.PlanetSafetyRadius.Evaluate(sharedMass * (1 - proportion))) * .75f;

3
docs/aetheria-perfect-machine-map.md
View file

@ -1028,6 +1028,9 @@ First Aetheria surfaces to publish:
`OrbitData`; `Zone`, `ActionGameManager`, and `ZoneRenderer` consume
`Orbit` runtime properties, and the old `Orbit.ToData()` construction
capture bridge is deleted.
- Done: move orbit phase evaluation off `OrbitData`; runtime zone updates,
asteroid transforms, and generator rosette spacing now use `Orbit.Evaluate`,
leaving `OrbitData` as a construction row only.
- Done: move live asteroid-belt simulation, scanning, and mesh setup reads
off `AsteroidBeltData`; `Zone`, `ResourceScanner`, and `AsteroidBeltUI`
consume `AsteroidBelt` runtime asteroid/resource/orbit properties, and