Skip to content

Commit

Permalink
Final touches before large search&replace.
Browse files Browse the repository at this point in the history
  • Loading branch information
@awgil
awgil committed Apr 30, 2024
1 parent d58e970 commit e066434
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 16 deletions.
4 changes: 2 additions & 2 deletions BossMod/BossModule/AIHintsVisualizer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public void Draw(UITree tree)

private MapVisualizer BuildZoneVisualizer(Func<WPos, float> shape)
{
var map = hints.Bounds.PathfindMap();
var map = hints.Bounds.PathfindMap(hints.Center);
map.BlockPixelsInside(shape, 0, NavigationDecision.DefaultForbiddenZoneCushion);
return new MapVisualizer(map, 0, player.Position);
}
Expand All @@ -61,7 +61,7 @@ private MapVisualizer BuildPathfindingVisualizer()
_navi = BuildPathfind(targeting.enemy, targeting.range, targeting.pos, targeting.tank);
if (_navi.Map == null)
{
_navi.Map = hints.Bounds.PathfindMap();
_navi.Map = hints.Bounds.PathfindMap(hints.Center);
var imm = NavigationDecision.ImminentExplosionTime(ws.CurrentTime);
foreach (var (shape, activation) in hints.ForbiddenZones)
NavigationDecision.AddBlockerZone(_navi.Map, imm, activation, shape, NavigationDecision.DefaultForbiddenZoneCushion);
Expand Down
16 changes: 8 additions & 8 deletions BossMod/BossModule/ArenaBounds.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public float ScreenHalfSize
}

protected abstract PolygonClipper.Operand BuildClipPoly();
public abstract Pathfinding.Map PathfindMap(); // if implementation caches a map, it should return a clone
public abstract Pathfinding.Map PathfindMap(WPos center); // if implementation caches a map, it should return a clone
public abstract bool Contains(WDir offset);
public abstract float IntersectRay(WDir originOffset, WDir dir);
public abstract WDir ClampToBounds(WDir offset);
Expand Down Expand Up @@ -103,7 +103,7 @@ public record class ArenaBoundsCircle(WPos Center, float Radius, float MapResolu
private Pathfinding.Map? _cachedMap;

protected override PolygonClipper.Operand BuildClipPoly() => new(CurveApprox.Circle(Radius, MaxApproxError));
public override Pathfinding.Map PathfindMap() => (_cachedMap ??= BuildMap()).Clone();
public override Pathfinding.Map PathfindMap(WPos center) => (_cachedMap ??= BuildMap()).Clone(center);
public override bool Contains(WDir offset) => offset.LengthSq() <= Radius * Radius;
public override float IntersectRay(WDir originOffset, WDir dir) => Intersect.RayCircle(originOffset, dir, Radius);

Expand All @@ -116,8 +116,8 @@ public override WDir ClampToBounds(WDir offset)

private Pathfinding.Map BuildMap()
{
var map = new Pathfinding.Map(MapResolution, Center, Radius, Radius);
map.BlockPixelsInside(ShapeDistance.InvertedCircle(Center, Radius), 0, 0);
var map = new Pathfinding.Map(MapResolution, default, Radius, Radius);
map.BlockPixelsInside(ShapeDistance.InvertedCircle(default, Radius), 0, 0);
return map;
}
}
Expand All @@ -127,7 +127,7 @@ public record class ArenaBoundsSquare(WPos Center, float Radius, float MapResolu
public float HalfWidth => Radius;

protected override PolygonClipper.Operand BuildClipPoly() => new(CurveApprox.Rect(new(Radius, 0), new(0, Radius)));
public override Pathfinding.Map PathfindMap() => new(MapResolution, Center, Radius, Radius);
public override Pathfinding.Map PathfindMap(WPos center) => new(MapResolution, center, Radius, Radius);
public override bool Contains(WDir offset) => offset.AlmostZero(Radius);
public override float IntersectRay(WDir originOffset, WDir dir) => Intersect.RayAABB(originOffset, dir, Radius, Radius);

Expand All @@ -147,7 +147,7 @@ public record class ArenaBoundsRect(WPos Center, float HalfWidth, float HalfHeig
private WDir _orientation = Rotation.ToDirection();

protected override PolygonClipper.Operand BuildClipPoly() => new(CurveApprox.Rect(_orientation, HalfWidth, HalfHeight));
public override Pathfinding.Map PathfindMap() => new(MapResolution, Center, HalfWidth, HalfHeight, Rotation);
public override Pathfinding.Map PathfindMap(WPos center) => new(MapResolution, center, HalfWidth, HalfHeight, Rotation);
public override bool Contains(WDir offset) => offset.InRect(_orientation, HalfHeight, HalfHeight, HalfWidth);
public override float IntersectRay(WDir originOffset, WDir dir) => Intersect.RayRect(originOffset, dir, _orientation, HalfWidth, HalfHeight);

Expand All @@ -169,7 +169,7 @@ public record class ArenaBoundsCustom(WPos Center, float Radius, RelSimplifiedCo
private Pathfinding.Map? _cachedMap;

protected override PolygonClipper.Operand BuildClipPoly() => new(Poly);
public override Pathfinding.Map PathfindMap() => (_cachedMap ??= BuildMap()).Clone();
public override Pathfinding.Map PathfindMap(WPos center) => (_cachedMap ??= BuildMap()).Clone(center);
public override bool Contains(WDir offset) => Poly.Contains(offset);
public override float IntersectRay(WDir originOffset, WDir dir) => Intersect.RayPolygon(originOffset, dir, Poly);
public override WDir ClampToBounds(WDir offset)
Expand All @@ -182,7 +182,7 @@ public override WDir ClampToBounds(WDir offset)

private Pathfinding.Map BuildMap()
{
var map = new Pathfinding.Map(MapResolution, Center, Radius, Radius);
var map = new Pathfinding.Map(MapResolution, default, Radius, Radius);
var tri = ShapeDistance.TriList(default, Poly.Triangulate());
map.BlockPixelsInside(p => -tri(p), 0, 0);
return map;
Expand Down
5 changes: 3 additions & 2 deletions BossMod/Pathfinding/Map.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public struct Pixel
public int Height { get; private init; } // always even
public Pixel[] Pixels;

public WPos Center { get; set; } // position of map center in world units
public WPos Center { get; private set; } // position of map center in world units
public Angle Rotation { get; private init; } // rotation relative to world space (=> ToDirection() is equal to direction of local 'height' axis in world space)
private WDir LocalZDivRes { get; init; }

Expand All @@ -44,11 +44,12 @@ public struct Pixel
LocalZDivRes = rotation.ToDirection() / Resolution;
}

public Map Clone()
public Map Clone(WPos center)
{
var res = (Map)MemberwiseClone();
res.Pixels = new Pixel[Pixels.Length];
Array.Copy(Pixels, res.Pixels, Pixels.Length);
res.Center = center;
return res;
}

Expand Down
8 changes: 4 additions & 4 deletions BossMod/Pathfinding/NavigationDecision.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@ public static NavigationDecision Build(WorldState ws, AIHints hints, Actor playe
// we're in forbidden zone => find path to safety (and ideally to uptime zone)
// if such a path can't be found (that's always the case if we're inside imminent forbidden zone, but can also happen in other cases), try instead to find a path to safety that doesn't enter any other zones that we're not inside
// first build a map with zones that we're outside of as blockers
var map = hints.Bounds.PathfindMap();
var map = hints.Bounds.PathfindMap(hints.Center);
foreach (var (zf, inside) in hints.ForbiddenZones.Zip(inZone))
if (!inside)
AddBlockerZone(map, imminent, zf.activation, zf.shapeDistance, forbiddenZoneCushion);

bool inImminentForbiddenZone = inZone.Take(numImminentZones).Any(inside => inside);
if (!inImminentForbiddenZone)
{
var map2 = map.Clone();
var map2 = map.Clone(map.Center);
foreach (var (zf, inside) in hints.ForbiddenZones.Zip(inZone))
if (inside)
AddBlockerZone(map2, imminent, zf.activation, zf.shapeDistance, forbiddenZoneCushion);
Expand Down Expand Up @@ -88,7 +88,7 @@ public static NavigationDecision Build(WorldState ws, AIHints hints, Actor playe
if (!player.Position.InCircle(targetPos.Value, targetRadius))
{
// we're not in uptime zone, just run to it, avoiding any aoes
var map = hints.Bounds.PathfindMap();
var map = hints.Bounds.PathfindMap(hints.Center);
foreach (var (shape, activation) in hints.ForbiddenZones)
AddBlockerZone(map, imminent, activation, shape, forbiddenZoneCushion);
int maxGoal = AddTargetGoal(map, targetPos.Value, targetRadius, targetRot, Positional.Any, 0);
Expand Down Expand Up @@ -130,7 +130,7 @@ public static NavigationDecision Build(WorldState ws, AIHints hints, Actor playe
if (!inPositional)
{
// we're in uptime zone, but not in correct quadrant - move there, avoiding all aoes and staying within uptime zone
var map = hints.Bounds.PathfindMap();
var map = hints.Bounds.PathfindMap(hints.Center);
map.BlockPixelsInside(ShapeDistance.InvertedCircle(targetPos.Value, targetRadius), 0, 0);
foreach (var (shape, activation) in hints.ForbiddenZones)
AddBlockerZone(map, imminent, activation, shape, forbiddenZoneCushion);
Expand Down

0 comments on commit e066434

Please sign in to comment.