Bootstrap temporal volume history at provider quality
This commit is contained in:
parent
7588763999
commit
887de62db8
3 changed files with 61 additions and 5 deletions
|
|
@ -137,6 +137,7 @@ namespace GameCult.Eve.UnityScene.Fields
|
|||
camera.depthTextureMode |= DepthTextureMode.Depth;
|
||||
EnsureVolumeTextures(camera, field);
|
||||
if (_raymarchTexture == null || !ApplyViewportTextureScaleBindings(field, camera)) return;
|
||||
ApplyQuality(field, _historyTextureIndex < 0);
|
||||
|
||||
var gpuProjection = GL.GetGPUProjectionMatrix(camera.projectionMatrix, true);
|
||||
var viewProjection = gpuProjection * camera.worldToCameraMatrix;
|
||||
|
|
@ -244,10 +245,6 @@ namespace GameCult.Eve.UnityScene.Fields
|
|||
SetTexturePort(binding.Value, texture);
|
||||
}
|
||||
}
|
||||
var quality = Prop(field, "quality").Trim().ToLowerInvariant();
|
||||
if (TryProgramValue($"unity.volume.quality.{quality}.keyword", out var keyword) &&
|
||||
!string.IsNullOrWhiteSpace(keyword))
|
||||
_material.EnableKeyword(keyword);
|
||||
foreach (var feature in Prop(field, "features").Split(';'))
|
||||
{
|
||||
var logicalFeature = feature.Trim();
|
||||
|
|
@ -259,6 +256,34 @@ namespace GameCult.Eve.UnityScene.Fields
|
|||
return true;
|
||||
}
|
||||
|
||||
private void ApplyQuality(EveUnityFieldVolumeProjection field, bool bootstrap)
|
||||
{
|
||||
if (_material == null || _programMetadata == null) return;
|
||||
foreach (var binding in _programMetadata)
|
||||
{
|
||||
if (binding.Key.StartsWith("unity.volume.quality.", StringComparison.Ordinal) &&
|
||||
binding.Key.EndsWith(".keyword", StringComparison.Ordinal) &&
|
||||
!string.IsNullOrWhiteSpace(binding.Value))
|
||||
_material.DisableKeyword(binding.Value);
|
||||
}
|
||||
var quality = ResolveQuality(_programMetadata, Prop(field, "quality"), bootstrap);
|
||||
if (TryProgramValue($"unity.volume.quality.{quality}.keyword", out var keyword) &&
|
||||
!string.IsNullOrWhiteSpace(keyword))
|
||||
_material.EnableKeyword(keyword);
|
||||
}
|
||||
|
||||
public static string ResolveQuality(
|
||||
IReadOnlyDictionary<string, string>? metadata,
|
||||
string steadyQuality,
|
||||
bool bootstrap)
|
||||
{
|
||||
if (bootstrap && metadata != null &&
|
||||
metadata.TryGetValue("unity.volume.quality.bootstrap", out var bootstrapQuality) &&
|
||||
!string.IsNullOrWhiteSpace(bootstrapQuality))
|
||||
return bootstrapQuality.Trim().ToLowerInvariant();
|
||||
return (steadyQuality ?? "").Trim().ToLowerInvariant();
|
||||
}
|
||||
|
||||
private void ApplyFieldBindings(EveUnityFieldVolumeProjection field, EveFieldsSplatsDocument document)
|
||||
{
|
||||
if (_material == null) return;
|
||||
|
|
@ -560,6 +585,11 @@ namespace GameCult.Eve.UnityScene.Fields
|
|||
!string.Equals(semantic, "previous-view-projection.v1", StringComparison.Ordinal) &&
|
||||
!string.Equals(semantic, "current-projection.previous-view.v1", StringComparison.Ordinal))
|
||||
return Fail("Native volume temporal pass has an unsupported previous-view-projection semantic.", out error);
|
||||
if (metadata.TryGetValue("unity.volume.quality.bootstrap", out var bootstrapQuality) &&
|
||||
(!metadata.TryGetValue(
|
||||
$"unity.volume.quality.{bootstrapQuality.Trim().ToLowerInvariant()}.keyword",
|
||||
out var bootstrapKeyword) || string.IsNullOrWhiteSpace(bootstrapKeyword)))
|
||||
return Fail("Native volume temporal pass has no keyword for its bootstrap quality.", out error);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -376,6 +376,32 @@ namespace GameCult.Eve.UnityScene.Tests
|
|||
Assert.That(error, Does.Contain("previous-view-projection semantic"));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void VolumeRendererUsesAdvertisedBootstrapQualityOnlyForEmptyHistory()
|
||||
{
|
||||
var metadata = RequiredVolumeProgramMetadata();
|
||||
metadata["unity.volume.quality.bootstrap"] = "ultra";
|
||||
metadata["unity.volume.quality.ultra.keyword"] = "ULTRA_QUALITY";
|
||||
|
||||
Assert.That(EveUnityFieldsVolumeRenderer.ResolveQuality(metadata, "high", true), Is.EqualTo("ultra"));
|
||||
Assert.That(EveUnityFieldsVolumeRenderer.ResolveQuality(metadata, "high", false), Is.EqualTo("high"));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void VolumeProgramRejectsBootstrapQualityWithoutAdvertisedKeyword()
|
||||
{
|
||||
var metadata = RequiredVolumeProgramMetadata();
|
||||
metadata["unity.volume.pass.temporal"] = "1";
|
||||
metadata["unity.volume.texturePort.currentSample"] = "_CurrentVolume";
|
||||
metadata["unity.volume.texturePort.history"] = "_HistoryVolume";
|
||||
metadata["unity.volume.matrixPort.previousViewProjection"] = "_PreviousViewProjection";
|
||||
metadata["unity.volume.floatPort.resetHistory"] = "_ResetHistory";
|
||||
metadata["unity.volume.quality.bootstrap"] = "ultra";
|
||||
|
||||
Assert.That(EveUnityFieldsVolumeRenderer.TryValidateProgramMetadata(metadata, out var error), Is.False);
|
||||
Assert.That(error, Does.Contain("bootstrap quality"));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void VolumeProgramRejectsPartialTemporalLifecycle()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "org.gamecult.eve.unity-scene",
|
||||
"displayName": "Eve Unity Scene Lowering",
|
||||
"version": "0.3.60",
|
||||
"version": "0.3.61",
|
||||
"unity": "6000.0",
|
||||
"description": "Provider-agnostic Unity scene shell for gamecult.eve.surface.v1 interactive world surfaces.",
|
||||
"dependencies": {
|
||||
|
|
|
|||
Reference in a new issue