Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions NavMeshComponents/Scripts/NavMeshBuilder2d.cs
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,11 @@ public static void CollectSources(List<NavMeshBuildSource> sources, NavMeshBuild
{
if (builder.CollectGeometry == NavMeshCollectGeometry.PhysicsColliders)
{
var tilemap = modifier.GetComponent<Tilemap>();
if (tilemap != null)
{
CollectTileSources(sources, tilemap, area, builder, true);
}
var collider = modifier.GetComponent<Collider2D>();
if (collider != null)
{
Expand Down Expand Up @@ -286,7 +291,7 @@ public static void CollectSources(List<NavMeshBuildSource> sources, Collider2D c
builder.lookupCallback?.Invoke(collider.gameObject, src);
}

public static void CollectTileSources(List<NavMeshBuildSource> sources, Tilemap tilemap, int area, NavMeshBuilder2dState builder)
public static void CollectTileSources(List<NavMeshBuildSource> sources, Tilemap tilemap, int area, NavMeshBuilder2dState builder, bool onlyTileModifier = false)
{
var bound = tilemap.cellBounds;

Expand Down Expand Up @@ -323,11 +328,19 @@ public static void CollectTileSources(List<NavMeshBuildSource> sources, Tilemap
continue;
}

bool hadTileModifier = false;
CollectTile(tilemap, builder, vec3int, size, sharedMesh, rot, ref src);
if (modifierTilemap && modifierTilemap.TryGetTileModifier(vec3int, tilemap, out NavMeshModifierTilemap.TileModifier tileModifier))
{
src.area = tileModifier.overrideArea ? tileModifier.area : area;
}
hadTileModifier = tileModifier.overrideArea;
}

if (onlyTileModifier && !hadTileModifier)
{
continue;
}

sources.Add(src);

builder.lookupCallback?.Invoke(tilemap.GetInstantiatedObject(vec3int), src);
Expand Down