From 6b36835953780ff7c2b3ddd67d9d5e2f1c590665 Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Fri, 9 Oct 2026 23:29:32 +0200 Subject: [PATCH] Ballistic flight r3: name CultMath.float2x2.Rotate in full (the math.float2x2 method shadows the type) The previous commit (2dcb7b20) does not build: DrawAhead.cs CS0119. Co-Authored-By: Claude Opus 5.5 --- Assets/Scripts/ServerShared/DrawAhead.cs | 2 +- tests/Aetheria.Shared.Tests/BallisticFlightTests.cs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Assets/Scripts/ServerShared/DrawAhead.cs b/Assets/Scripts/ServerShared/DrawAhead.cs index 98b70656e..13da8aae9 100644 --- a/Assets/Scripts/ServerShared/DrawAhead.cs +++ b/Assets/Scripts/ServerShared/DrawAhead.cs @@ -63,7 +63,7 @@ public static class DrawAhead { var at = Position(target, lead); var offset = target.ToWorldPoint((float2) cell) - target.Position.xz; - var turned = mul(offset, float2x2.Rotate(Turn(target, lead))); + var turned = mul(offset, CultMath.float2x2.Rotate(Turn(target, lead))); return float3(at.x + turned.x, at.y, at.z + turned.y); } diff --git a/tests/Aetheria.Shared.Tests/BallisticFlightTests.cs b/tests/Aetheria.Shared.Tests/BallisticFlightTests.cs index 61a733e3a..79c787a74 100644 --- a/tests/Aetheria.Shared.Tests/BallisticFlightTests.cs +++ b/tests/Aetheria.Shared.Tests/BallisticFlightTests.cs @@ -9,7 +9,6 @@ using UniRx; using Xunit; using static CultMath.math; using float2 = CultMath.float2; -using float2x2 = CultMath.float2x2; using float3 = CultMath.float3; using int2 = CultMath.int2; @@ -429,7 +428,7 @@ public sealed partial class FireControlCut124Tests var position = e.Target.Position; var direction = e.Target.Direction; e.Target.Position += float3(e.Target.Velocity.x, 0, e.Target.Velocity.y) * lead; - e.Target.Direction = mul(e.Target.Direction, float2x2.Rotate(e.Target.TurnRate * lead)); + e.Target.Direction = mul(e.Target.Direction, CultMath.float2x2.Rotate(e.Target.TurnRate * lead)); var cellPoint = e.Target.ToWorldPoint((float2) cell); var expected = float3(cellPoint.x, e.Target.Position.y, cellPoint.y); e.Target.Position = position;