From da8ee10a2a3e1e2309efea55a87f7f862c93d0b7 Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Mon, 11 May 2026 22:29:22 +0100 Subject: [PATCH] Fix per-body proxy indexing --- src/Aquarium.Engine/Render/D3D12Renderer.cs | 34 ++++++++++--------- .../Render/Shaders/D3D12BodyAgent.hlsl | 2 ++ .../Render/Shaders/D3D12BodyCommon.hlsli | 6 ++-- .../Render/Shaders/D3D12CursorBody.hlsl | 2 ++ .../Render/Shaders/D3D12EyesAgent.hlsl | 2 ++ .../Render/Shaders/D3D12FaceAgent.hlsl | 2 ++ .../Render/Shaders/D3D12HandsAgent.hlsl | 2 ++ .../Render/Shaders/D3D12ImaginationAgent.hlsl | 2 ++ .../Render/Shaders/D3D12LifeAgent.hlsl | 2 ++ .../Render/Shaders/D3D12Post.hlsl | 9 ++--- .../Render/Shaders/D3D12SelfBody.hlsl | 2 ++ .../Render/Shaders/D3D12SoulAgent.hlsl | 2 ++ state/evidence.jsonl | 2 ++ 13 files changed, 46 insertions(+), 23 deletions(-) diff --git a/src/Aquarium.Engine/Render/D3D12Renderer.cs b/src/Aquarium.Engine/Render/D3D12Renderer.cs index ffbdc66..4d0bf0d 100644 --- a/src/Aquarium.Engine/Render/D3D12Renderer.cs +++ b/src/Aquarium.Engine/Render/D3D12Renderer.cs @@ -27,9 +27,10 @@ public sealed class D3D12Renderer : IAquariumRenderer private const Format SceneDepthFormat = Format.D32_Float; private const int RoleAgentCount = 7; private const int AgentVisualCount = RoleAgentCount + 2; - private const int SelfObjectIndex = RoleAgentCount; + private const int SelfObjectIndex = 0; + private const int RoleAgentBaseIndex = 1; private const int CursorObjectIndex = AgentVisualCount - 1; - private const int GridHeightBrushCount = AgentVisualCount - 1; + private const int GridHeightBrushCount = RoleAgentCount + 1; private const int BodyLightCount = 8; private const float GridTransparentMinZ = -1.85f; private const float GridTransparentMaxZ = 0.45f; @@ -915,7 +916,7 @@ public sealed class D3D12Renderer : IAquariumRenderer for (var bodyIndex = 0; bodyIndex < AgentVisualCount; bodyIndex++) { context.CommandList.SetPipelineState(bodyProxyPipelineStates[bodyIndex]!); - context.CommandList.DrawInstanced(6, 1, 0, (uint)bodyIndex); + context.CommandList.DrawInstanced(6, 1, 0, 0); } } finally @@ -1117,7 +1118,7 @@ public sealed class D3D12Renderer : IAquariumRenderer 0.82f, 1.25f); - for (var index = 0; index < SelfObjectIndex; index++) + for (var index = 0; index < RoleAgentCount; index++) { var radius = AgentRadius(index); var center = AgentAnchor(index, frame.TimeSeconds); @@ -1137,8 +1138,16 @@ public sealed class D3D12Renderer : IAquariumRenderer private void BuildAgentVisualTable(AquariumFrame frame) { Array.Clear(agentVisuals); - for (var index = 0; index < SelfObjectIndex; index++) + var selfCenter = BodyCenterAtGridHeight(frame, Vector2.Zero, SunRadius); + agentVisuals[SelfObjectIndex] = new AgentVisualGpu( + new Vector4(selfCenter, SunRadius), + new Vector4(selfCenter, 0.0f), + new Vector4(1.0f, 1.0f, 0.0f, 0.0f), + new Vector4(0.0f, SelfObjectIndex, 1.0f, 0.0f)); + + for (var index = 0; index < RoleAgentCount; index++) { + var visualIndex = RoleAgentBaseIndex + index; var radius = AgentRadius(index); var center = AgentCenterAtGridHeight(index, frame.TimeSeconds); var previousCenter = AgentCenterAtGridHeight(index, previousTimeSeconds); @@ -1149,20 +1158,13 @@ public sealed class D3D12Renderer : IAquariumRenderer var expression = Math.Abs(roleId - 2.0f) < 0.01f || Math.Abs(roleId - 4.0f) < 0.01f ? 0.72f : 0.38f; var lod = 1.0f; - agentVisuals[index] = new AgentVisualGpu( + agentVisuals[visualIndex] = new AgentVisualGpu( new Vector4(center, radius), new Vector4(previousCenter, roleId), new Vector4(activity, heartbeat, pressure, expression), - new Vector4(lod, index, 0.0f, 0.0f)); + new Vector4(lod, visualIndex, 0.0f, 0.0f)); } - var selfCenter = BodyCenterAtGridHeight(frame, Vector2.Zero, SunRadius); - agentVisuals[SelfObjectIndex] = new AgentVisualGpu( - new Vector4(selfCenter, SunRadius), - new Vector4(selfCenter, 0.0f), - new Vector4(1.0f, 1.0f, 0.0f, 0.0f), - new Vector4(0.0f, SelfObjectIndex, 1.0f, 0.0f)); - var cursorCenter = new Vector3(frame.CursorWorld, CursorBodyRadius); var previousCursorCenter = new Vector3(previousCursorWorld, CursorBodyRadius); agentVisuals[CursorObjectIndex] = new AgentVisualGpu( @@ -1893,7 +1895,7 @@ public sealed class D3D12Renderer : IAquariumRenderer * MathF.Sin((world.X * -0.04f + world.Y * 0.07f) - timeSeconds * 0.19f) * 0.035f; height += GridBrushHeight(world, Vector2.Zero, SelfGravityRadius, 2.85f, -1.34f, 0.18f, MathF.Tau, 0.82f, 1.25f, timeSeconds); - for (var index = 0; index < SelfObjectIndex; index++) + for (var index = 0; index < RoleAgentCount; index++) { var radius = AgentRadius(index); height += GridBrushHeight(world, AgentAnchor(index, timeSeconds), 3.8f + radius * 2.5f, 2.1f, -0.42f, 0.022f, 2.4f, 1.35f, 0.0f, timeSeconds); @@ -2095,6 +2097,7 @@ public sealed class D3D12Renderer : IAquariumRenderer shaderPath(BodyCommonShaderRelativePath), shaderPath(BodyProxyShaderRelativePath), [ + shaderPath(SelfBodyShaderRelativePath), shaderPath(FaceAgentShaderRelativePath), shaderPath(ImaginationAgentShaderRelativePath), shaderPath(EyesAgentShaderRelativePath), @@ -2102,7 +2105,6 @@ public sealed class D3D12Renderer : IAquariumRenderer shaderPath(HandsAgentShaderRelativePath), shaderPath(SoulAgentShaderRelativePath), shaderPath(LifeAgentShaderRelativePath), - shaderPath(SelfBodyShaderRelativePath), shaderPath(CursorBodyShaderRelativePath), ], shaderPath(SdfMathShaderRelativePath), diff --git a/src/Aquarium.Engine/Render/Shaders/D3D12BodyAgent.hlsl b/src/Aquarium.Engine/Render/Shaders/D3D12BodyAgent.hlsl index 0d70e6e..e9f63e5 100644 --- a/src/Aquarium.Engine/Render/Shaders/D3D12BodyAgent.hlsl +++ b/src/Aquarium.Engine/Render/Shaders/D3D12BodyAgent.hlsl @@ -1,3 +1,5 @@ +static const int BODY_INDEX = 4; + #include "D3D12BodyCommon.hlsli" #include "D3D12SdfMath.hlsli" #include "D3D12AgentCharacters.hlsli" diff --git a/src/Aquarium.Engine/Render/Shaders/D3D12BodyCommon.hlsli b/src/Aquarium.Engine/Render/Shaders/D3D12BodyCommon.hlsli index 7c915ab..ebee925 100644 --- a/src/Aquarium.Engine/Render/Shaders/D3D12BodyCommon.hlsli +++ b/src/Aquarium.Engine/Render/Shaders/D3D12BodyCommon.hlsli @@ -44,7 +44,7 @@ StructuredBuffer agentVisuals : register(t24); static const int ROLE_AGENT_COUNT = 7; static const int AGENT_VISUAL_COUNT = ROLE_AGENT_COUNT + 2; -static const int SELF_OBJECT_INDEX = ROLE_AGENT_COUNT; +static const int SELF_OBJECT_INDEX = 0; static const int CURSOR_OBJECT_INDEX = AGENT_VISUAL_COUNT - 1; static const float FIELD_ID_SELF = 2.0; static const float FIELD_ID_GRID = 4.0; @@ -244,7 +244,7 @@ AgentProxyVertexOut D3D12AgentProxyVS(uint vertexId : SV_VertexID, uint instance float2(-1.0, 1.0), }; - AgentVisual agent = agentVisuals[instanceId]; + AgentVisual agent = agentVisuals[BODY_INDEX]; float3 forward; float3 right; float3 up; @@ -260,6 +260,6 @@ AgentProxyVertexOut D3D12AgentProxyVS(uint vertexId : SV_VertexID, uint instance AgentProxyVertexOut output; output.position = float4(clipCenter + corners[vertexId] * clipRadius, 0.0, 1.0); - output.agentIndex = (float)instanceId; + output.agentIndex = (float)BODY_INDEX; return output; } diff --git a/src/Aquarium.Engine/Render/Shaders/D3D12CursorBody.hlsl b/src/Aquarium.Engine/Render/Shaders/D3D12CursorBody.hlsl index 63e599e..8cce6d4 100644 --- a/src/Aquarium.Engine/Render/Shaders/D3D12CursorBody.hlsl +++ b/src/Aquarium.Engine/Render/Shaders/D3D12CursorBody.hlsl @@ -1,3 +1,5 @@ +static const int BODY_INDEX = 8; + #include "D3D12BodyCommon.hlsli" #include "D3D12SdfMath.hlsli" diff --git a/src/Aquarium.Engine/Render/Shaders/D3D12EyesAgent.hlsl b/src/Aquarium.Engine/Render/Shaders/D3D12EyesAgent.hlsl index e6400fd..3d55bf6 100644 --- a/src/Aquarium.Engine/Render/Shaders/D3D12EyesAgent.hlsl +++ b/src/Aquarium.Engine/Render/Shaders/D3D12EyesAgent.hlsl @@ -1,3 +1,5 @@ +static const int BODY_INDEX = 3; + #include "D3D12BodyCommon.hlsli" #include "D3D12SdfMath.hlsli" #include "D3D12AgentCharacters.hlsli" diff --git a/src/Aquarium.Engine/Render/Shaders/D3D12FaceAgent.hlsl b/src/Aquarium.Engine/Render/Shaders/D3D12FaceAgent.hlsl index e6400fd..f58ea18 100644 --- a/src/Aquarium.Engine/Render/Shaders/D3D12FaceAgent.hlsl +++ b/src/Aquarium.Engine/Render/Shaders/D3D12FaceAgent.hlsl @@ -1,3 +1,5 @@ +static const int BODY_INDEX = 1; + #include "D3D12BodyCommon.hlsli" #include "D3D12SdfMath.hlsli" #include "D3D12AgentCharacters.hlsli" diff --git a/src/Aquarium.Engine/Render/Shaders/D3D12HandsAgent.hlsl b/src/Aquarium.Engine/Render/Shaders/D3D12HandsAgent.hlsl index e6400fd..f8542cd 100644 --- a/src/Aquarium.Engine/Render/Shaders/D3D12HandsAgent.hlsl +++ b/src/Aquarium.Engine/Render/Shaders/D3D12HandsAgent.hlsl @@ -1,3 +1,5 @@ +static const int BODY_INDEX = 5; + #include "D3D12BodyCommon.hlsli" #include "D3D12SdfMath.hlsli" #include "D3D12AgentCharacters.hlsli" diff --git a/src/Aquarium.Engine/Render/Shaders/D3D12ImaginationAgent.hlsl b/src/Aquarium.Engine/Render/Shaders/D3D12ImaginationAgent.hlsl index bd472b5..3638ebd 100644 --- a/src/Aquarium.Engine/Render/Shaders/D3D12ImaginationAgent.hlsl +++ b/src/Aquarium.Engine/Render/Shaders/D3D12ImaginationAgent.hlsl @@ -1,3 +1,5 @@ +static const int BODY_INDEX = 2; + #include "D3D12BodyCommon.hlsli" #include "D3D12SdfMath.hlsli" #include "D3D12AgentCharacters.hlsli" diff --git a/src/Aquarium.Engine/Render/Shaders/D3D12LifeAgent.hlsl b/src/Aquarium.Engine/Render/Shaders/D3D12LifeAgent.hlsl index e6400fd..4167851 100644 --- a/src/Aquarium.Engine/Render/Shaders/D3D12LifeAgent.hlsl +++ b/src/Aquarium.Engine/Render/Shaders/D3D12LifeAgent.hlsl @@ -1,3 +1,5 @@ +static const int BODY_INDEX = 7; + #include "D3D12BodyCommon.hlsli" #include "D3D12SdfMath.hlsli" #include "D3D12AgentCharacters.hlsli" diff --git a/src/Aquarium.Engine/Render/Shaders/D3D12Post.hlsl b/src/Aquarium.Engine/Render/Shaders/D3D12Post.hlsl index bfc91e2..3f9ef40 100644 --- a/src/Aquarium.Engine/Render/Shaders/D3D12Post.hlsl +++ b/src/Aquarium.Engine/Render/Shaders/D3D12Post.hlsl @@ -62,7 +62,8 @@ struct ResolveOut }; static const float SUN_RADIUS = 1.12; -static const int AGENT_VISUAL_COUNT = 7; +static const int ROLE_AGENT_COUNT = 7; +static const int AGENT_VISUAL_COUNT = ROLE_AGENT_COUNT + 2; static const float FIELD_ID_SELF = 2.0; static const float FIELD_ID_GRID = 4.0; static const float FIELD_ID_CURSOR = 5.0; @@ -178,7 +179,7 @@ float gridHeightAt(float2 world, float sampleTime) height += gridBrushHeight(world, 0.0, SELF_GRAVITY_RADIUS, 2.85, -1.34, 0.18, 6.28318530718, 0.82, 1.25, sampleTime); [unroll] - for (int index = 0; index < AGENT_VISUAL_COUNT; index++) + for (int index = 0; index < ROLE_AGENT_COUNT; index++) { float radius = planetRadius(index); height += gridBrushHeight(world, planetAnchorAt(index, sampleTime), 3.8 + radius * 2.5, 2.1, -0.42, 0.022, 2.4, 1.35, 0.0, sampleTime); @@ -227,8 +228,8 @@ float3 temporalPreviousWorldPosition(float3 worldPosition, float fieldId) if (abs(fieldId - FIELD_ID_CURSOR) < 0.25) { - float3 currentCenter = bodyCenterAtGridHeight(cursorWorlds.xy, 0.56, timeSeconds); - float3 previousCenter = bodyCenterAtGridHeight(cursorWorlds.zw, 0.56, previousTimeSeconds); + float3 currentCenter = float3(cursorWorlds.xy, 0.56); + float3 previousCenter = float3(cursorWorlds.zw, 0.56); return previousCenter + (worldPosition - currentCenter); } diff --git a/src/Aquarium.Engine/Render/Shaders/D3D12SelfBody.hlsl b/src/Aquarium.Engine/Render/Shaders/D3D12SelfBody.hlsl index b34034c..ee8ca74 100644 --- a/src/Aquarium.Engine/Render/Shaders/D3D12SelfBody.hlsl +++ b/src/Aquarium.Engine/Render/Shaders/D3D12SelfBody.hlsl @@ -1,3 +1,5 @@ +static const int BODY_INDEX = 0; + #include "D3D12BodyCommon.hlsli" #include "D3D12SdfMath.hlsli" diff --git a/src/Aquarium.Engine/Render/Shaders/D3D12SoulAgent.hlsl b/src/Aquarium.Engine/Render/Shaders/D3D12SoulAgent.hlsl index e6400fd..2cb4ccf 100644 --- a/src/Aquarium.Engine/Render/Shaders/D3D12SoulAgent.hlsl +++ b/src/Aquarium.Engine/Render/Shaders/D3D12SoulAgent.hlsl @@ -1,3 +1,5 @@ +static const int BODY_INDEX = 6; + #include "D3D12BodyCommon.hlsli" #include "D3D12SdfMath.hlsli" #include "D3D12AgentCharacters.hlsli" diff --git a/state/evidence.jsonl b/state/evidence.jsonl index 3c7dab4..18c0457 100644 --- a/state/evidence.jsonl +++ b/state/evidence.jsonl @@ -30,3 +30,5 @@ {"timestamp":"2026-05-11T22:07:07+01:00","topic":"shader-boundary-body-pass","lesson":"D3D12Scene is now environment/Grid only. Bounded body proxy draws compile from D3D12Bodies.hlsl, reusable SDF math lives in D3D12SdfMath.hlsli, current agent character organs live in D3D12AgentCharacters.hlsli, and D3D12Renderer expands local includes before D3DCompile because the Vortice convenience compile path does not provide a usable include handler here. The cursor is now a luminous three-lobed hibiscus anchored on XY with its contact tip at Grid z=0.","files":["src/Aquarium.Engine/Render/D3D12Renderer.cs","src/Aquarium.Engine/Render/Shaders/D3D12Scene.hlsl","src/Aquarium.Engine/Render/Shaders/D3D12Bodies.hlsl","src/Aquarium.Engine/Render/Shaders/D3D12SdfMath.hlsli","src/Aquarium.Engine/Render/Shaders/D3D12AgentCharacters.hlsli","docs/hlsl-renderer.md","state/map.yaml","state/memory.json"],"source":"user architecture correction"} {"timestamp":"2026-05-11T22:17:28+01:00","topic":"per-body-shader-boundary","lesson":"Body proxy rendering now uses one shader file and one proxy pipeline per visible body slot: Face, Imagination, Eyes, Body, Hands, Self, and Cursor. Shared proxy plumbing lives in D3D12BodyCommon.hlsli and D3D12BodyProxy.hlsli, but body identity SDF and material code should stay split by body rather than collapsing into a single role or Self bucket.","files":["src/Aquarium.Engine/Render/D3D12Renderer.cs","src/Aquarium.Engine/Render/Shaders/D3D12BodyCommon.hlsli","src/Aquarium.Engine/Render/Shaders/D3D12BodyProxy.hlsli","src/Aquarium.Engine/Render/Shaders/D3D12FaceAgent.hlsl","src/Aquarium.Engine/Render/Shaders/D3D12ImaginationAgent.hlsl","src/Aquarium.Engine/Render/Shaders/D3D12EyesAgent.hlsl","src/Aquarium.Engine/Render/Shaders/D3D12BodyAgent.hlsl","src/Aquarium.Engine/Render/Shaders/D3D12HandsAgent.hlsl","src/Aquarium.Engine/Render/Shaders/D3D12SelfBody.hlsl","src/Aquarium.Engine/Render/Shaders/D3D12CursorBody.hlsl","docs/hlsl-renderer.md","state/map.yaml","state/memory.json"],"source":"user architecture correction"} {"timestamp":"2026-05-11T22:18:54+01:00","topic":"eight-agent-body-table","lesson":"The visible Epiphany agent body table is Self, Face, Imagination, Eyes, Body, Hands, Soul, and Life. Cursor remains a separate non-agent body. Renderer constants, body shader paths, proxy pipelines, and post reprojection counts should track seven role agents plus Self plus cursor, not the older five-role provisional slice.","files":["src/Aquarium.Engine/Render/D3D12Renderer.cs","src/Aquarium.Engine/Render/Shaders/D3D12Post.hlsl","src/Aquarium.Engine/Render/Shaders/D3D12SoulAgent.hlsl","src/Aquarium.Engine/Render/Shaders/D3D12LifeAgent.hlsl","docs/hlsl-renderer.md","state/map.yaml","state/memory.json"],"source":"user role table correction"} +{"timestamp":"2026-05-11T22:29:04+01:00","topic":"per-body-proxy-indexing","lesson":"Per-body proxy shaders must not rely on DrawInstanced StartInstanceLocation reaching SV_InstanceID for body identity. Each body shader now declares a shader-local BODY_INDEX constant, and shared proxy VS/PS use that constant for AgentVisualGpu lookup, proxy rectangle placement, and raymarch selection. This keeps per-body shader files transform-locked to their own visual row.","files":["src/Aquarium.Engine/Render/D3D12Renderer.cs","src/Aquarium.Engine/Render/Shaders/D3D12BodyCommon.hlsli","src/Aquarium.Engine/Render/Shaders/D3D12FaceAgent.hlsl","src/Aquarium.Engine/Render/Shaders/D3D12ImaginationAgent.hlsl","src/Aquarium.Engine/Render/Shaders/D3D12EyesAgent.hlsl","src/Aquarium.Engine/Render/Shaders/D3D12BodyAgent.hlsl","src/Aquarium.Engine/Render/Shaders/D3D12HandsAgent.hlsl","src/Aquarium.Engine/Render/Shaders/D3D12SoulAgent.hlsl","src/Aquarium.Engine/Render/Shaders/D3D12LifeAgent.hlsl","src/Aquarium.Engine/Render/Shaders/D3D12SelfBody.hlsl","src/Aquarium.Engine/Render/Shaders/D3D12CursorBody.hlsl"],"source":"visible transform bug report"} +{"timestamp":"2026-05-11T22:32:12+01:00","topic":"canonical-agent-visual-order","lesson":"AgentVisualGpu row order is canonical and must match shader BODY_INDEX constants, body pipeline order, Grid brush indexing, and temporal reprojection: 0 Self, 1 Face, 2 Imagination, 3 Eyes, 4 Body, 5 Hands, 6 Soul, 7 Life, 8 Cursor. Roles-first buffer ordering breaks transforms even if each shader has its own file.","files":["src/Aquarium.Engine/Render/D3D12Renderer.cs","src/Aquarium.Engine/Render/Shaders/D3D12BodyCommon.hlsli","src/Aquarium.Engine/Render/Shaders/D3D12Post.hlsl","src/Aquarium.Engine/Render/Shaders/D3D12SelfBody.hlsl","src/Aquarium.Engine/Render/Shaders/D3D12FaceAgent.hlsl","src/Aquarium.Engine/Render/Shaders/D3D12ImaginationAgent.hlsl","src/Aquarium.Engine/Render/Shaders/D3D12EyesAgent.hlsl","src/Aquarium.Engine/Render/Shaders/D3D12BodyAgent.hlsl","src/Aquarium.Engine/Render/Shaders/D3D12HandsAgent.hlsl","src/Aquarium.Engine/Render/Shaders/D3D12SoulAgent.hlsl","src/Aquarium.Engine/Render/Shaders/D3D12LifeAgent.hlsl"],"source":"visible transform bug report"}