erik/acdream
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(app): Phase B.2 — strip diagnostic logging + fix indoor-transition test

Browse source 
Removes all [PLAYER], [PLAYER-INIT], [PLAYER-ANIM] diagnostic dump
lines now that walking, camera, and animation are verified working.

Updates PhysicsEngineTests.Resolve_EnterIndoorCell to match the new
behavior (outdoor→indoor transition disabled in the B.2 MVP): the
test now asserts the player stays outdoor at terrain Z instead of
transitioning to the indoor cell.

265 tests green.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Erik 2026-04-12 15:27:49 +02:00
parent 980e79dae9
commit 228eecbb31
2 changed files with 16 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/AcDream.App/Rendering/GameWindow.cs
View file

@ -220,11 +220,6 @@ public sealed class GameWindow : IDisposable
1f - 2f * (q.Y * q.Y + q.Z * q.Z));
_playerController.Yaw = yaw;
Console.WriteLine($"[PLAYER-INIT] entityPos=({playerEntity.Position.X:F1},{playerEntity.Position.Y:F1},{playerEntity.Position.Z:F1}) " +
$"entityRot=({q.X:F3},{q.Y:F3},{q.Z:F3},{q.W:F3}) " +
$"initCellId=0x{(pinitCellId & 0xFFFFu):X4} " +
$"yaw={yaw:F3} " +
$"physics landblocks={_physicsEngine.LandblockCount}");
_chaseCamera = new AcDream.App.Rendering.ChaseCamera
{
Aspect = _window!.Size.X / (float)_window.Size.Y,
@ -1505,16 +1500,6 @@ public sealed class GameWindow : IDisposable
var result = _playerController.Update((float)dt, input);
// DIAG: dump player state every ~60 frames to see what's happening.
if (_perfFrameCount % 60 == 0)
{
Console.WriteLine($"[PLAYER] pos=({result.Position.X:F1},{result.Position.Y:F1},{result.Position.Z:F1}) " +
$"cell=0x{result.CellId:X8} ground={result.IsOnGround} " +
$"yaw={_playerController.Yaw:F2} " +
$"fwdCmd={result.ForwardCommand?.ToString("X8") ?? "idle"} " +
$"stateChanged={result.MotionStateChanged}");
}
// Update the player entity's position + rotation so it renders at
// the physics-resolved location each frame.
if (_entitiesByServerGuid.TryGetValue(_playerServerGuid, out var pe))
@ -1812,16 +1797,19 @@ public sealed class GameWindow : IDisposable
_animatedEntities[pe.Id] = ae;
}
// The motion table cycle key is (style << 16) | (command & 0xFFFFFF).
// Without a stance override, the resolver uses the table default
// (which always maps to the idle/Ready cycle regardless of command).
// Pass the NonCombat stance (0x003D) so the resolver builds the
// correct cycle key for walk/run/turn commands.
ushort cmdOverride = (ushort)(animCommand & 0xFFFFu);
const ushort NonCombatStance = 0x003D;
var cycle = AcDream.Core.Meshing.MotionResolver.GetIdleCycle(
ae.Setup, _dats,
motionTableIdOverride: _playerMotionTableId,
stanceOverride: NonCombatStance,
commandOverride: cmdOverride);
Console.WriteLine($"[PLAYER-ANIM] cmd=0x{animCommand:X8} cmdOverride=0x{cmdOverride:X4} " +
$"cycle={(cycle is null ? "NULL" : $"fr={cycle.Framerate:F1} low={cycle.LowFrame} high={cycle.HighFrame}")} " +
$"setup=0x{pe.SourceGfxObjOrSetupId:X8} mtable=0x{(uint)ae.Setup.DefaultMotionTable:X8}");
if (cycle is null || cycle.Framerate == 0f || cycle.HighFrame <= cycle.LowFrame) return;
ae.Animation = cycle.Animation;

14
tests/AcDream.Core.Tests/Physics/PhysicsEngineTests.cs
View file

@ -91,12 +91,16 @@ public class PhysicsEngineTests
}
[Fact]
public void Resolve_EnterIndoorCell_TransitionsToCell()
public void Resolve_EnterIndoorCell_StaysOutdoor_BecauseTransitionDisabled()
{
// Phase B.2 MVP: outdoor→indoor transitions are disabled because
// CellSurface floor polygons are too aggressive (building
// footprints/roofs capture the player). Walking over a cell's XY
// area stays on the outdoor terrain Z. Indoor transitions will be
// re-enabled when portal-based detection lands in Phase E.
var engine = new PhysicsEngine();
var terrain = new TerrainSurface(FlatHeightmap(50), LinearHeightTable());
// Indoor cell with a floor at Z=55 covering (40..60, 40..60).
var cellVerts = new Dictionary<ushort, Vector3>
{
[0] = new(40f, 40f, 55f),
@ -115,9 +119,9 @@ public class PhysicsEngineTests
new Vector3(30f, 50f, 50f), cellId: 0x0001, delta: new Vector3(20f, 0f, 0f),
stepUpHeight: 10f);
// Should transition to the indoor cell and snap to its floor Z.
Assert.Equal(0x0100u, result.CellId);
Assert.Equal(55f, result.Position.Z, precision: 1);
// Should stay outdoor (transition disabled) at terrain Z = 50.
Assert.True(result.CellId < 0x0100u);
Assert.Equal(50f, result.Position.Z, precision: 1);
Assert.True(result.IsOnGround);
}