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

Integrate Aetheria reactive state worktree

Browse source
This commit is contained in:
Meta Vens 2026-06-28 01:18:21 +01:00
commit 65133ac8a0
61 changed files with 3427 additions and 402 deletions
Download patch file Download diff file Expand all files Collapse all files

39
Assets/Scripts/Zone Display/MapView.cs
View file

@ -5,6 +5,7 @@
using System;
using System.Collections;
using System.Collections.Generic;
using GameCult.Aetheria.State.Verse;
using UnityEngine;
using UnityEngine.InputSystem;
using UnityEngine.Serialization;
@ -15,6 +16,7 @@ public class MapView : MonoBehaviour
public Camera MinimapGravity;
public Camera Minimap;
public MeshRenderer GravityRenderer;
public AetheriaUnityRenderSplatViewportSource GravitySplatSource;
public float ZoomSpeed;
[FormerlySerializedAs("SectorRenderer")] public ZoneRenderer ZoneRenderer;
@ -26,7 +28,6 @@ public class MapView : MonoBehaviour
private RenderTexture _minimapGravityTexture;
private Transform _gravityRendererTransform;
private CopyTransform _gravityRendererCopyTransform;
private RenderTexture _fullscreenGravityTexture;
private AetheriaInput.UIActions _input;
private float _viewDistance = 1024;
private float _aspectRatio;
@ -49,9 +50,14 @@ public class MapView : MonoBehaviour
_gravityRendererCopyTransform.enabled = false;
_previousGravityRendererScale = _gravityRendererTransform.localScale;
_fullscreenGravityTexture = new RenderTexture(Screen.width / 2, Screen.height / 2, 1, RenderTextureFormat.RFloat);
GravityRenderer.material.mainTexture = _fullscreenGravityTexture;
MinimapGravity.targetTexture = _fullscreenGravityTexture;
GravitySplatSource = ResolveGravitySplatSource();
GravitySplatSource.SetLayerKey(AetheriaRuntimeRenderSplatLayerKeys.GravityHeight);
GravitySplatSource.SetViewport(
new Vector2(_minimapTransform.position.x, _minimapTransform.position.z),
new Vector2(_viewDistance * _aspectRatio * 2, _viewDistance * 2));
GravitySplatSource.RenderLatest();
GravityRenderer.material.mainTexture = GravitySplatSource.TargetTexture;
MinimapGravity.targetTexture = null;
Minimap.targetTexture = null;
SetZoom();
}
@ -61,6 +67,14 @@ public class MapView : MonoBehaviour
//ZoneRenderer.ViewDistance = _viewDistance * _aspectRatio;
Minimap.orthographicSize = MinimapGravity.orthographicSize = _viewDistance;
_gravityRendererTransform.localScale = new Vector3(_viewDistance*_aspectRatio*2, _viewDistance*2, 1);
if (GravitySplatSource != null && _minimapTransform != null)
{
GravitySplatSource.SetViewport(
new Vector2(_minimapTransform.position.x, _minimapTransform.position.z),
new Vector2(_viewDistance * _aspectRatio * 2, _viewDistance * 2));
GravitySplatSource.RenderLatest();
GravityRenderer.material.mainTexture = GravitySplatSource.TargetTexture;
}
}
// public void BindInput(AetheriaInput.UIActions input)
@ -91,6 +105,7 @@ public class MapView : MonoBehaviour
_gravityRendererTransform.position = gravPos;
Main.transform.position = _minimapTransform.position = _minimapGravityTransform.position = pos;
SetZoom();
}
}
@ -106,6 +121,20 @@ public class MapView : MonoBehaviour
Minimap.targetTexture = _minimapTexture;
MinimapGravity.targetTexture = _minimapGravityTexture;
GravityRenderer.material.mainTexture = _minimapGravityTexture;
_fullscreenGravityTexture.Release();
}
private AetheriaUnityRenderSplatViewportSource ResolveGravitySplatSource()
{
if (GravitySplatSource != null)
return GravitySplatSource;
GravitySplatSource = GetComponent<AetheriaUnityRenderSplatViewportSource>();
if (GravitySplatSource == null)
GravitySplatSource = gameObject.AddComponent<AetheriaUnityRenderSplatViewportSource>();
if (GetComponent<AetheriaRenderSplatLayerRenderer>() == null)
gameObject.AddComponent<AetheriaRenderSplatLayerRenderer>();
return GravitySplatSource;
}
}

51
Assets/Scripts/Zone Display/VolumeSampling.cs
View file

@ -3,6 +3,7 @@
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
using System;
using GameCult.Aetheria.State.Verse;
using UnityEngine;
using Unity.Mathematics;
using UnityEngine.Experimental.Rendering;
@ -26,6 +27,8 @@ public class VolumeSampling : MonoBehaviour
public RenderTexture NebulaPatchHeight;
public RenderTexture NebulaPatch;
public RenderTexture NebulaTint;
public AetheriaUnityRenderSplatViewportSource SplatViewportSource;
public AetheriaRenderSplatLayerRenderer SplatLayerRenderer;
private MeshRenderer _gridMeshRenderer;
private float _flowScroll;
@ -42,6 +45,8 @@ public class VolumeSampling : MonoBehaviour
if (GridMesh != null)
_gridMeshRenderer = GridMesh.GetComponent<MeshRenderer>();
ResolveSplatRenderers();
}
void Update()
@ -52,6 +57,8 @@ public class VolumeSampling : MonoBehaviour
if(GridCamera != null)
Shader.SetGlobalVector("_GridTransform", new Vector4(_gridTransform.position.x,_gridTransform.position.z,GridCamera.orthographicSize*2));
RenderSplatTextures();
var environment = Settings.DefaultEnvironment;
if (GridMesh != null)
@ -106,4 +113,48 @@ public class VolumeSampling : MonoBehaviour
Shader.SetKeyword(_keywordFlowSlope, environment.Flow.SlopeAmplitude != 0 || environment.Flow.SwirlAmplitude != 0);
Shader.SetKeyword(_keywordNoiseSlope, environment.Noise.SlopeExponent != 0);
}
private void RenderSplatTextures()
{
ResolveSplatRenderers();
if (SplatViewportSource == null)
return;
var size = GridCamera != null
? new Vector2(GridCamera.orthographicSize * 2, GridCamera.orthographicSize * 2)
: new Vector2(1024, 1024);
var center = _gridTransform != null
? new Vector2(_gridTransform.position.x, _gridTransform.position.z)
: Vector2.zero;
SplatViewportSource.SetViewport(center, size);
SplatViewportSource.RenderLatest();
if (SplatLayerRenderer == null)
return;
NebulaSurfaceHeight = ResolveLayerTexture(AetheriaRuntimeRenderSplatLayerKeys.FogSurfaceHeight, NebulaSurfaceHeight);
NebulaPatchHeight = ResolveLayerTexture(AetheriaRuntimeRenderSplatLayerKeys.FogPatchHeight, NebulaPatchHeight);
NebulaPatch = ResolveLayerTexture(AetheriaRuntimeRenderSplatLayerKeys.FogPatch, NebulaPatch);
NebulaTint = ResolveLayerTexture(AetheriaRuntimeRenderSplatLayerKeys.FogTint, NebulaTint);
}
private RenderTexture ResolveLayerTexture(string layerKey, RenderTexture fallback)
{
return SplatLayerRenderer.TryGetTexture(layerKey, out var texture) && texture != null
? texture
: fallback;
}
private void ResolveSplatRenderers()
{
if (SplatLayerRenderer == null)
SplatLayerRenderer = GetComponent<AetheriaRenderSplatLayerRenderer>();
if (SplatLayerRenderer == null)
SplatLayerRenderer = gameObject.AddComponent<AetheriaRenderSplatLayerRenderer>();
if (SplatViewportSource == null)
SplatViewportSource = GetComponent<AetheriaUnityRenderSplatViewportSource>();
if (SplatViewportSource == null)
SplatViewportSource = gameObject.AddComponent<AetheriaUnityRenderSplatViewportSource>();
}
}

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

@ -30,6 +30,7 @@ public class ZoneRenderer : MonoBehaviour
public CinemachineVirtualCamera SceneCamera;
public Camera[] FogCameras;
public Camera[] MinimapCameras;
public bool UseRenderSplatTextureLayers = true;
public Material FogMaterial;
public float FogFarFadeFraction = .125f;
public float FarPlaneDistanceMultiplier = 2;
@ -115,7 +116,8 @@ public class ZoneRenderer : MonoBehaviour
Array.Empty<AetheriaRuntimeZoneRenderBodyPose>();
private IReadOnlyList<AetheriaRuntimeZoneRenderAsteroidBeltPose> _zoneRenderAsteroidBeltPoses =
Array.Empty<AetheriaRuntimeZoneRenderAsteroidBeltPose>();
private AetheriaRuntimeGravityViewportDocument _daemonGravityViewport;
private IReadOnlyList<AetheriaRuntimeBodySnapshotCommit> _zoneRenderBodies =
Array.Empty<AetheriaRuntimeBodySnapshotCommit>();
private AetheriaClient _client;
private string _clientStatePath = "";
private AetheriaRuntimeCatalogSnapshot _catalog;
@ -146,11 +148,16 @@ public class ZoneRenderer : MonoBehaviour
set
{
_viewDistance = value;
foreach (var camera in FogCameras)
camera.orthographicSize = value;
SceneCamera.m_Lens.FarClipPlane = value * FarPlaneDistanceMultiplier;
FogMaterial.SetFloat("_DepthCeiling", value);
FogMaterial.SetFloat("_DepthBlend", FogFarFadeFraction * value);
foreach (var camera in FogCameras ?? Array.Empty<Camera>())
if (camera != null)
camera.orthographicSize = value;
if (SceneCamera != null)
SceneCamera.m_Lens.FarClipPlane = value * FarPlaneDistanceMultiplier;
if (FogMaterial != null)
{
FogMaterial.SetFloat("_DepthCeiling", value);
FogMaterial.SetFloat("_DepthBlend", FogFarFadeFraction * value);
}
}
}
@ -159,9 +166,11 @@ public class ZoneRenderer : MonoBehaviour
set
{
_minimapDistance = value;
foreach (var camera in MinimapCameras)
camera.orthographicSize = value;
SetIconSize((float)RenderSettings.ResolveMinimapIconSize(value));
foreach (var camera in MinimapCameras ?? Array.Empty<Camera>())
if (camera != null)
camera.orthographicSize = value;
if (RenderSettings != null)
SetIconSize((float)RenderSettings.ResolveMinimapIconSize(value));
// MinimapGravityQuad.transform.localScale = value * 2 * Vector3.one;
}
}
@ -235,6 +244,7 @@ public class ZoneRenderer : MonoBehaviour
_tourTimer = TourSwitchTime;
_transposer = SceneCamera.GetCinemachineComponent<CinemachineTransposer>();
DisableLegacyTextureCameras();
}
public void LoadDaemonZoneView(
@ -244,9 +254,6 @@ public class ZoneRenderer : MonoBehaviour
ClearZone();
_observedEntityFacadesByDaemonIndex = observedEntityFacadesByDaemonIndex;
ApplyZoneRender(render);
RefreshDaemonBodyPoses();
RefreshDaemonAsteroidBeltPoses();
SyncDaemonBodyViews();
RefreshDaemonVisibleEntityInstances();
SyncDaemonEntityInstances();
@ -260,11 +267,17 @@ public class ZoneRenderer : MonoBehaviour
_daemonSimulationTimeSeconds = render?.SimulationTimeSeconds ?? 0;
_zoneRenderBodyPoses = render?.BodyPoses ?? Array.Empty<AetheriaRuntimeZoneRenderBodyPose>();
_zoneRenderAsteroidBeltPoses = render?.AsteroidBeltPoses ?? Array.Empty<AetheriaRuntimeZoneRenderAsteroidBeltPose>();
_zoneRenderBodies = render?.Bodies ?? Array.Empty<AetheriaRuntimeBodySnapshotCommit>();
RefreshDaemonContactRows();
var zoneRenderRadius = (float)Math.Max(0, render?.ZoneRenderRadius ?? 2000);
SectorBrushes.localScale = zoneRenderRadius * 2 * Vector3.one;
SlimeGravityCamera.orthographicSize = zoneRenderRadius;
if (SlimeGravityCamera != null)
SlimeGravityCamera.orthographicSize = zoneRenderRadius;
SlimeRenderer.ZoneRadius = zoneRenderRadius;
DisableLegacyTextureCameras();
RefreshDaemonBodyPoses();
RefreshDaemonAsteroidBeltPoses();
SyncDaemonBodyViews();
_daemonWormholeExits.Clear();
foreach (var exit in render?.WormholeExits ?? Array.Empty<AetheriaRuntimeZoneRenderWormholeExit>())
{
@ -673,30 +686,23 @@ public class ZoneRenderer : MonoBehaviour
private void SyncDaemonBodyViews()
{
try
{
var viewport = ToViewportBounds(ResolveDaemonRenderViewport());
var gravity = ResolveClient()
.GravityViewportAsync(viewport)
.GetAwaiter()
.GetResult();
_daemonGravityViewport = gravity;
}
catch (Exception ex)
{
Debug.LogWarning($"Failed to read Aetheria gravity viewport for zone renderer terrain: {ex.Message}");
}
_daemonBodyViews.Clear();
foreach (var bodyView in _daemonGravityViewport?.Bodies ?? Array.Empty<AetheriaRuntimeRtsBodyView>())
var bodySnapshotsByBodyKey = _zoneRenderBodies
.Where(body => body != null && !string.IsNullOrWhiteSpace(body.BodyKey))
.ToDictionary(body => body.BodyKey, StringComparer.Ordinal);
foreach (var bodyPose in _zoneRenderBodyPoses ?? Array.Empty<AetheriaRuntimeZoneRenderBodyPose>())
{
if (bodyView?.Body == null || string.IsNullOrWhiteSpace(bodyView.BodyKey))
if (bodyPose == null ||
string.IsNullOrWhiteSpace(bodyPose.BodyKey) ||
!bodySnapshotsByBodyKey.TryGetValue(bodyPose.BodyKey, out var body))
{
continue;
}
_daemonBodyViews.Add(new AetheriaRuntimeDaemonBodyView(
bodyView.Body,
ToDaemonBodyPose(bodyView),
bodyView.IsAsteroidBelt));
body,
ToDaemonBodyPose(bodyPose),
IsAsteroidBelt(body)));
}
var beltPosesByBodyKey = _daemonAsteroidBeltPoses
.Where(pose => !string.IsNullOrWhiteSpace(pose.BodyKey))
@ -739,6 +745,19 @@ public class ZoneRenderer : MonoBehaviour
_suns = _bodyViewsByBodyKey.Values.Where(p => p is SunObject).ToArray();
}
private void DisableLegacyTextureCameras()
{
if (!UseRenderSplatTextureLayers)
return;
foreach (var camera in FogCameras ?? Array.Empty<Camera>())
if (camera != null)
camera.gameObject.SetActive(false);
if (SlimeGravityCamera != null)
SlimeGravityCamera.gameObject.SetActive(false);
}
private AetheriaRuntimeXzRect ResolveDaemonRenderViewport()
{
var center = PerspectiveEntity?.CultPositionXZ ?? default;
@ -960,42 +979,31 @@ public class ZoneRenderer : MonoBehaviour
private double EvaluateGravityTerrainHeight(double positionX, double positionZ)
{
var gravity = _daemonGravityViewport;
if (gravity == null)
return 0;
var height = 0.0;
if (gravity.TerrainRadius > 0 && gravity.TerrainDepth != 0)
foreach (var body in _zoneRenderBodies ?? Array.Empty<AetheriaRuntimeBodySnapshotCommit>())
{
var distance = Math.Sqrt(positionX * positionX + positionZ * positionZ);
height -= PowerPulse(
distance / (gravity.TerrainRadius * 2.0),
Math.Max(0.0001, gravity.TerrainDepthExponent)) * gravity.TerrainDepth;
}
foreach (var brush in gravity.GravityInfluences ?? Array.Empty<AetheriaRuntimeRtsGravityInfluence>())
{
if (brush == null)
if (body == null)
continue;
var dx = positionX - brush.X;
var dz = positionZ - brush.Y;
var dx = positionX - body.GravityInfluenceCenterX;
var dz = positionZ - body.GravityInfluenceCenterZ;
var distance = Math.Sqrt(dx * dx + dz * dz);
if (brush.Radius > 0 && distance < brush.Radius && brush.GravityDepth != 0)
var radius = ResolveGravityRadius(body);
if (radius > 0 && distance < radius && body.GravityWellDepth != 0)
{
height -= PowerPulse(
distance / brush.Radius,
Math.Max(0.0001, brush.GravityDepthExponent)) * brush.GravityDepth;
distance / radius,
Math.Max(0.0001, body.GravityDepthExponent)) * body.GravityWellDepth;
}
if (brush.WaveRadius > 0 && distance < brush.WaveRadius && brush.WaveDepth != 0)
if (body.GravityWaveRadius > 0 && distance < body.GravityWaveRadius && body.GravityWaveDepth != 0)
{
height -= RadialWaves(
distance / brush.WaveRadius,
distance / body.GravityWaveRadius,
8.0,
1.25,
gravity.TerrainWaveFrequency,
DaemonSimulationTimeSeconds * brush.WaveSpeed) * brush.WaveDepth;
1.0,
DaemonSimulationTimeSeconds * body.GravityWaveSpeed) * body.GravityWaveDepth;
}
}
@ -1006,33 +1014,45 @@ public class ZoneRenderer : MonoBehaviour
double minimapGravityRange,
double maxDepth)
{
var gravity = _daemonGravityViewport;
if (gravity == null)
return new AetheriaRuntimeGravityTerrainBand(0, Math.Max(0, maxDepth));
var startDepth = PowerPulse(
minimapGravityRange,
Math.Max(0.0001, gravity.TerrainDepthExponent)) * gravity.TerrainDepth;
var terrainDepth = (_zoneRenderBodies ?? Array.Empty<AetheriaRuntimeBodySnapshotCommit>())
.Where(body => body != null)
.Select(body => Math.Max(0, body.GravityWellDepth))
.DefaultIfEmpty(0)
.Max();
var startDepth = Math.Min(terrainDepth, Math.Max(0, minimapGravityRange));
return new AetheriaRuntimeGravityTerrainBand(
startDepth,
gravity.TerrainDepth - startDepth + maxDepth);
Math.Max(0, terrainDepth - startDepth) + maxDepth);
}
private static AetheriaRuntimeDaemonBodyPose ToDaemonBodyPose(AetheriaRuntimeRtsBodyView bodyView)
private static AetheriaRuntimeDaemonBodyPose ToDaemonBodyPose(AetheriaRuntimeZoneRenderBodyPose bodyPose)
{
if (bodyView == null)
if (bodyPose == null)
return default;
return new AetheriaRuntimeDaemonBodyPose(
bodyView.BodyKey,
bodyView.OrbitKey,
"",
bodyView.Kind,
bodyView.X,
bodyView.Y,
0,
0,
bodyView.Body?.GravityWaveSpeed ?? 0);
bodyPose.BodyKey,
bodyPose.OrbitKey,
bodyPose.ParentOrbitKey,
bodyPose.Kind,
bodyPose.CenterX,
bodyPose.CenterZ,
bodyPose.ParentCenterX,
bodyPose.ParentCenterZ,
bodyPose.GravityWaveSpeed);
}
private static bool IsAsteroidBelt(AetheriaRuntimeBodySnapshotCommit body)
{
return (body?.Kind ?? "").IndexOf("asteroid", StringComparison.OrdinalIgnoreCase) >= 0;
}
private static double ResolveGravityRadius(AetheriaRuntimeBodySnapshotCommit body)
{
if (body != null && double.IsFinite(body.GravityInfluenceRadius) && body.GravityInfluenceRadius > 0)
return body.GravityInfluenceRadius;
return Math.Max(32, (body?.BodyRadiusMultiplier ?? 1) * 70);
}
private static double PowerPulse(double x, double exponent)