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

Reconcile volumetric fields after surface arrival

Browse source
This commit is contained in:
Meta Vens 2026-07-15 17:31:02 +01:00
commit 37d9f993e1
4 changed files with 47 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

21
ReleaseConsumerProject/Assets/Tests/PlayMode/GenericWorldCaptureTests.cs
View file

@ -8,6 +8,7 @@ using GameCult.Caching.MessagePack;
using GameCult.Eve.Surface;
using GameCult.Eve.UnityUIToolkit;
using GameCult.Eve.UnityScene;
using GameCult.Eve.UnityScene.Fields;
using NUnit.Framework;
using UnityEngine;
using UnityEngine.TestTools;
@ -666,6 +667,14 @@ namespace GameCult.EveUnity.GenericClient.PlayModeTests
Assert.That(beamRenderer.TryGetPower(beamPresentation.Id, out tractorReleasedPower), Is.True);
Assert.That(tractorReleasedPower, Is.Zero,
"Released held input did not return the daemon-authored tractor presentation to zero.");
var fieldVolume = root.GetComponent<EveUnityFieldsVolumeRenderer>();
Assert.That(fieldVolume, Is.Not.Null, "The generic client did not install its Fields volume lowerer.");
Assert.That(fieldVolume.PresentedFrameId, Is.GreaterThanOrEqualTo(0),
"The advertised Fields splat document never reached the generic volume lowerer.");
Assert.That(fieldVolume.PresentedLayerCount, Is.GreaterThan(0),
"The generic volume lowerer did not rasterize any advertised Fields layers.");
Assert.That(fieldVolume.CompositeCount, Is.GreaterThan(0),
"The generic volume lowerer never composited into the pilot camera.");
WriteWitnessFacts(
initialVersion,
runtime.ActiveVersion,
@ -677,6 +686,9 @@ namespace GameCult.EveUnity.GenericClient.PlayModeTests
(camera.cullingMask & (1 << mapLayer)) == 0,
(mapCamera.cullingMask & (1 << mapLayer)) != 0,
environmentPresentation,
fieldVolume.PresentedFrameId,
fieldVolume.PresentedLayerCount,
fieldVolume.CompositeCount,
movementReceipt,
lookReceipt,
focusReceipt,
@ -733,6 +745,9 @@ namespace GameCult.EveUnity.GenericClient.PlayModeTests
bool pilotCameraExcludesMapChannel,
bool mapCameraIncludesMapChannel,
bool environmentPresentation,
long fieldVolumeFrameId,
int fieldVolumeLayerCount,
long fieldVolumeCompositeCount,
WitnessReceipt movement,
WitnessReceipt look,
WitnessReceipt targeting,
@ -769,6 +784,9 @@ namespace GameCult.EveUnity.GenericClient.PlayModeTests
providerAdvertisement = true,
providerAssets = true,
environmentPresentation = environmentPresentation,
fieldVolumeFrameId = fieldVolumeFrameId,
fieldVolumeLayerCount = fieldVolumeLayerCount,
fieldVolumeCompositeCount = fieldVolumeCompositeCount,
movement = movement != null,
aimPresentation = look != null && aimDotDistance >= 49.9f,
targeting = targeting != null,
@ -828,6 +846,9 @@ namespace GameCult.EveUnity.GenericClient.PlayModeTests
public bool providerAdvertisement;
public bool providerAssets;
public bool environmentPresentation;
public long fieldVolumeFrameId;
public int fieldVolumeLayerCount;
public long fieldVolumeCompositeCount;
public bool movement;
public bool aimPresentation;
public bool targeting;

21
TestProject/Assets/Tests/PlayMode/GenericWorldCaptureTests.cs
View file

@ -8,6 +8,7 @@ using GameCult.Caching.MessagePack;
using GameCult.Eve.Surface;
using GameCult.Eve.UnityUIToolkit;
using GameCult.Eve.UnityScene;
using GameCult.Eve.UnityScene.Fields;
using NUnit.Framework;
using UnityEngine;
using UnityEngine.TestTools;
@ -666,6 +667,14 @@ namespace GameCult.EveUnity.GenericClient.PlayModeTests
Assert.That(beamRenderer.TryGetPower(beamPresentation.Id, out tractorReleasedPower), Is.True);
Assert.That(tractorReleasedPower, Is.Zero,
"Released held input did not return the daemon-authored tractor presentation to zero.");
var fieldVolume = root.GetComponent<EveUnityFieldsVolumeRenderer>();
Assert.That(fieldVolume, Is.Not.Null, "The generic client did not install its Fields volume lowerer.");
Assert.That(fieldVolume.PresentedFrameId, Is.GreaterThanOrEqualTo(0),
"The advertised Fields splat document never reached the generic volume lowerer.");
Assert.That(fieldVolume.PresentedLayerCount, Is.GreaterThan(0),
"The generic volume lowerer did not rasterize any advertised Fields layers.");
Assert.That(fieldVolume.CompositeCount, Is.GreaterThan(0),
"The generic volume lowerer never composited into the pilot camera.");
WriteWitnessFacts(
initialVersion,
runtime.ActiveVersion,
@ -677,6 +686,9 @@ namespace GameCult.EveUnity.GenericClient.PlayModeTests
(camera.cullingMask & (1 << mapLayer)) == 0,
(mapCamera.cullingMask & (1 << mapLayer)) != 0,
environmentPresentation,
fieldVolume.PresentedFrameId,
fieldVolume.PresentedLayerCount,
fieldVolume.CompositeCount,
movementReceipt,
lookReceipt,
focusReceipt,
@ -733,6 +745,9 @@ namespace GameCult.EveUnity.GenericClient.PlayModeTests
bool pilotCameraExcludesMapChannel,
bool mapCameraIncludesMapChannel,
bool environmentPresentation,
long fieldVolumeFrameId,
int fieldVolumeLayerCount,
long fieldVolumeCompositeCount,
WitnessReceipt movement,
WitnessReceipt look,
WitnessReceipt targeting,
@ -769,6 +784,9 @@ namespace GameCult.EveUnity.GenericClient.PlayModeTests
providerAdvertisement = true,
providerAssets = true,
environmentPresentation = environmentPresentation,
fieldVolumeFrameId = fieldVolumeFrameId,
fieldVolumeLayerCount = fieldVolumeLayerCount,
fieldVolumeCompositeCount = fieldVolumeCompositeCount,
movement = movement != null,
aimPresentation = look != null && aimDotDistance >= 49.9f,
targeting = targeting != null,
@ -828,6 +846,9 @@ namespace GameCult.EveUnity.GenericClient.PlayModeTests
public bool providerAdvertisement;
public bool providerAssets;
public bool environmentPresentation;
public long fieldVolumeFrameId;
public int fieldVolumeLayerCount;
public long fieldVolumeCompositeCount;
public bool movement;
public bool aimPresentation;
public bool targeting;

4
packages/org.gamecult.eve.unity-scene/Runtime/Fields/EveUnityFieldsVolumeRenderer.cs
View file

@ -25,6 +25,7 @@ namespace GameCult.Eve.UnityScene.Fields
public long PresentedFrameId { get; private set; } = -1;
public int PresentedLayerCount => _targets.Count(target => target.TargetTexture != null);
public long CompositeCount { get; private set; }
public void Bind(EveUnityPlayableWorldClientHost host, IEveUnityFieldsSplatsDocumentSource? source)
{
@ -77,6 +78,7 @@ namespace GameCult.Eve.UnityScene.Fields
if (_host == null || _document == null || camera == null ||
_host.ActiveCameraTransform != camera.transform)
return;
if (PresentedLayerCount == 0) RenderLayers(_document);
var field = ActiveField();
if (field == null || !EnsureMaterial(field)) return;
ApplyFieldBindings(field, _document);
@ -113,6 +115,7 @@ namespace GameCult.Eve.UnityScene.Fields
_commands.SetRenderTarget(BuiltinRenderTextureType.CameraTarget);
_commands.DrawProcedural(Matrix4x4.identity, _material!, compositePass, MeshTopology.Triangles, 3, 1);
context.ExecuteCommandBuffer(_commands);
CompositeCount++;
}
private EveUnityFieldVolumeProjection? ActiveField() =>
@ -218,6 +221,7 @@ namespace GameCult.Eve.UnityScene.Fields
_sourceShader = null;
_activeNodeId = "";
PresentedFrameId = -1;
CompositeCount = 0;
}
private void SetMatrix(EveUnityFieldVolumeProjection field, string propKey, Matrix4x4 value)

2
packages/org.gamecult.eve.unity-scene/package.json
View file

@ -1,7 +1,7 @@
{
"name": "org.gamecult.eve.unity-scene",
"displayName": "Eve Unity Scene Lowering",
"version": "0.3.33",
"version": "0.3.34",
"unity": "2021.3",
"description": "Provider-agnostic Unity scene shell for gamecult.eve.surface.v1 interactive world surfaces.",
"dependencies": {