diff --git a/src/DotRecast.Detour.Dynamic/DynamicNavMeshConfig.cs b/src/DotRecast.Detour.Dynamic/DynamicNavMeshConfig.cs index c7bd142..18cb2d3 100644 --- a/src/DotRecast.Detour.Dynamic/DynamicNavMeshConfig.cs +++ b/src/DotRecast.Detour.Dynamic/DynamicNavMeshConfig.cs @@ -27,7 +27,7 @@ namespace DotRecast.Detour.Dynamic public readonly int tileSizeZ; public readonly float cellSize; public PartitionType partitionType = PartitionType.WATERSHED; - public AreaModification walkableAreaModification = new AreaModification(1); + public RcAreaModification walkableAreaModification = new RcAreaModification(1); public float walkableHeight; public float walkableSlopeAngle; public float walkableRadius; diff --git a/src/DotRecast.Detour.Dynamic/Io/VoxelFile.cs b/src/DotRecast.Detour.Dynamic/Io/VoxelFile.cs index 3d9d7eb..bdaa3ea 100644 --- a/src/DotRecast.Detour.Dynamic/Io/VoxelFile.cs +++ b/src/DotRecast.Detour.Dynamic/Io/VoxelFile.cs @@ -63,7 +63,7 @@ namespace DotRecast.Detour.Dynamic.Io public RcConfig GetConfig(VoxelTile tile, PartitionType partitionType, int maxPolyVerts, int regionMergeSize, bool filterLowHangingObstacles, bool filterLedgeSpans, bool filterWalkableLowHeightSpans, - AreaModification walkbableAreaMod, bool buildMeshDetail, float detailSampleDist, float detailSampleMaxError) + RcAreaModification walkbableAreaMod, bool buildMeshDetail, float detailSampleDist, float detailSampleMaxError) { return new RcConfig(useTiles, tileSizeX, tileSizeZ, tile.borderSize, partitionType, cellSize, tile.cellHeight, walkableSlopeAngle, filterLowHangingObstacles, filterLedgeSpans, filterWalkableLowHeightSpans, walkableHeight, diff --git a/src/DotRecast.Recast.Demo/Draw/NavMeshRenderer.cs b/src/DotRecast.Recast.Demo/Draw/NavMeshRenderer.cs index 51d9a69..a6ad7fc 100644 --- a/src/DotRecast.Recast.Demo/Draw/NavMeshRenderer.cs +++ b/src/DotRecast.Recast.Demo/Draw/NavMeshRenderer.cs @@ -245,7 +245,7 @@ public class NavMeshRenderer _debugDraw.Begin(DebugDrawPrimitives.TRIS); - foreach (ConvexVolume vol in geom.ConvexVolumes()) + foreach (RcConvexVolume vol in geom.ConvexVolumes()) { int col = DebugDraw.DuTransCol(DebugDraw.AreaToCol(vol.areaMod.GetMaskedValue()), 32); for (int j = 0, k = vol.verts.Length - 3; j < vol.verts.Length; k = j, j += 3) @@ -270,7 +270,7 @@ public class NavMeshRenderer _debugDraw.End(); _debugDraw.Begin(DebugDrawPrimitives.LINES, 2.0f); - foreach (ConvexVolume vol in geom.ConvexVolumes()) + foreach (RcConvexVolume vol in geom.ConvexVolumes()) { int col = DebugDraw.DuTransCol(DebugDraw.AreaToCol(vol.areaMod.GetMaskedValue()), 220); for (int j = 0, k = vol.verts.Length - 3; j < vol.verts.Length; k = j, j += 3) @@ -289,7 +289,7 @@ public class NavMeshRenderer _debugDraw.End(); _debugDraw.Begin(DebugDrawPrimitives.POINTS, 3.0f); - foreach (ConvexVolume vol in geom.ConvexVolumes()) + foreach (RcConvexVolume vol in geom.ConvexVolumes()) { int col = DebugDraw.DuDarkenCol(DebugDraw.DuTransCol(DebugDraw.AreaToCol(vol.areaMod.GetMaskedValue()), 220)); for (int j = 0; j < vol.verts.Length; j += 3) diff --git a/src/DotRecast.Recast.Demo/Tools/ConvexVolumeTool.cs b/src/DotRecast.Recast.Demo/Tools/ConvexVolumeTool.cs index f2dc9b5..d7677b7 100644 --- a/src/DotRecast.Recast.Demo/Tools/ConvexVolumeTool.cs +++ b/src/DotRecast.Recast.Demo/Tools/ConvexVolumeTool.cs @@ -37,7 +37,7 @@ public class ConvexVolumeTool : IRcTool private readonly ConvexVolumeToolImpl _impl; private int areaTypeValue = SampleAreaModifications.SAMPLE_AREAMOD_GRASS.Value; - private AreaModification areaType = SampleAreaModifications.SAMPLE_AREAMOD_GRASS; + private RcAreaModification areaType = SampleAreaModifications.SAMPLE_AREAMOD_GRASS; private float boxHeight = 6f; private float boxDescent = 1f; private float polyOffset = 0f; diff --git a/src/DotRecast.Recast.DemoTool/Builder/SampleAreaModifications.cs b/src/DotRecast.Recast.DemoTool/Builder/SampleAreaModifications.cs index b99186c..c5063de 100644 --- a/src/DotRecast.Recast.DemoTool/Builder/SampleAreaModifications.cs +++ b/src/DotRecast.Recast.DemoTool/Builder/SampleAreaModifications.cs @@ -35,15 +35,15 @@ namespace DotRecast.Recast.DemoTool.Builder public const int SAMPLE_POLYAREA_TYPE_JUMP_AUTO = 0x6; public const int SAMPLE_POLYAREA_TYPE_WALKABLE = 0x3f; - public static readonly AreaModification SAMPLE_AREAMOD_WALKABLE = new AreaModification(SAMPLE_POLYAREA_TYPE_WALKABLE); - public static readonly AreaModification SAMPLE_AREAMOD_GROUND = new AreaModification(SAMPLE_POLYAREA_TYPE_GROUND); - public static readonly AreaModification SAMPLE_AREAMOD_WATER = new AreaModification(SAMPLE_POLYAREA_TYPE_WATER); - public static readonly AreaModification SAMPLE_AREAMOD_ROAD = new AreaModification(SAMPLE_POLYAREA_TYPE_ROAD); - public static readonly AreaModification SAMPLE_AREAMOD_GRASS = new AreaModification(SAMPLE_POLYAREA_TYPE_GRASS); - public static readonly AreaModification SAMPLE_AREAMOD_DOOR = new AreaModification(SAMPLE_POLYAREA_TYPE_DOOR); - public static readonly AreaModification SAMPLE_AREAMOD_JUMP = new AreaModification(SAMPLE_POLYAREA_TYPE_JUMP); + public static readonly RcAreaModification SAMPLE_AREAMOD_WALKABLE = new RcAreaModification(SAMPLE_POLYAREA_TYPE_WALKABLE); + public static readonly RcAreaModification SAMPLE_AREAMOD_GROUND = new RcAreaModification(SAMPLE_POLYAREA_TYPE_GROUND); + public static readonly RcAreaModification SAMPLE_AREAMOD_WATER = new RcAreaModification(SAMPLE_POLYAREA_TYPE_WATER); + public static readonly RcAreaModification SAMPLE_AREAMOD_ROAD = new RcAreaModification(SAMPLE_POLYAREA_TYPE_ROAD); + public static readonly RcAreaModification SAMPLE_AREAMOD_GRASS = new RcAreaModification(SAMPLE_POLYAREA_TYPE_GRASS); + public static readonly RcAreaModification SAMPLE_AREAMOD_DOOR = new RcAreaModification(SAMPLE_POLYAREA_TYPE_DOOR); + public static readonly RcAreaModification SAMPLE_AREAMOD_JUMP = new RcAreaModification(SAMPLE_POLYAREA_TYPE_JUMP); - public static readonly ImmutableArray Values = ImmutableArray.Create( + public static readonly ImmutableArray Values = ImmutableArray.Create( SAMPLE_AREAMOD_WALKABLE, SAMPLE_AREAMOD_GROUND, SAMPLE_AREAMOD_WATER, @@ -53,7 +53,7 @@ namespace DotRecast.Recast.DemoTool.Builder SAMPLE_AREAMOD_JUMP ); - public static AreaModification OfValue(int value) + public static RcAreaModification OfValue(int value) { return Values.FirstOrDefault(x => x.Value == value) ?? SAMPLE_AREAMOD_GRASS; } diff --git a/src/DotRecast.Recast.DemoTool/Geom/DemoInputGeomProvider.cs b/src/DotRecast.Recast.DemoTool/Geom/DemoInputGeomProvider.cs index ec7a3c4..1c57cfc 100644 --- a/src/DotRecast.Recast.DemoTool/Geom/DemoInputGeomProvider.cs +++ b/src/DotRecast.Recast.DemoTool/Geom/DemoInputGeomProvider.cs @@ -33,7 +33,7 @@ namespace DotRecast.Recast.DemoTool.Geom public readonly float[] normals; private readonly RcVec3f bmin; private readonly RcVec3f bmax; - private readonly List _convexVolumes = new List(); + private readonly List _convexVolumes = new List(); private readonly List offMeshConnections = new List(); private readonly RcTriMesh _mesh; @@ -122,7 +122,7 @@ namespace DotRecast.Recast.DemoTool.Geom } } - public IList ConvexVolumes() + public IList ConvexVolumes() { return _convexVolumes; } @@ -210,9 +210,9 @@ namespace DotRecast.Recast.DemoTool.Geom } - public void AddConvexVolume(float[] verts, float minh, float maxh, AreaModification areaMod) + public void AddConvexVolume(float[] verts, float minh, float maxh, RcAreaModification areaMod) { - ConvexVolume volume = new ConvexVolume(); + RcConvexVolume volume = new RcConvexVolume(); volume.verts = verts; volume.hmin = minh; volume.hmax = maxh; diff --git a/src/DotRecast.Recast.DemoTool/Tools/ConvexVolumeToolImpl.cs b/src/DotRecast.Recast.DemoTool/Tools/ConvexVolumeToolImpl.cs index 90978ac..926596f 100644 --- a/src/DotRecast.Recast.DemoTool/Tools/ConvexVolumeToolImpl.cs +++ b/src/DotRecast.Recast.DemoTool/Tools/ConvexVolumeToolImpl.cs @@ -23,13 +23,13 @@ namespace DotRecast.Recast.DemoTool.Tools return _sample; } - public ConvexVolume RemoveByPos(RcVec3f pos) + public RcConvexVolume RemoveByPos(RcVec3f pos) { var geom = _sample.GetInputGeom(); // Delete int nearestIndex = -1; - IList vols = geom.ConvexVolumes(); + IList vols = geom.ConvexVolumes(); for (int i = 0; i < vols.Count; ++i) { if (PolyUtils.PointInPoly(vols[i].verts, pos) && pos.y >= vols[i].hmin @@ -48,7 +48,7 @@ namespace DotRecast.Recast.DemoTool.Tools return removal; } - public void Add(List pts, List hull, AreaModification areaType, float boxDescent, float boxHeight, float polyOffset) + public void Add(List pts, List hull, RcAreaModification areaType, float boxDescent, float boxHeight, float polyOffset) { // if (hull.Count <= 2) diff --git a/src/DotRecast.Recast/Geom/IConvexVolumeProvider.cs b/src/DotRecast.Recast/Geom/IConvexVolumeProvider.cs index 2134cf7..98c750d 100644 --- a/src/DotRecast.Recast/Geom/IConvexVolumeProvider.cs +++ b/src/DotRecast.Recast/Geom/IConvexVolumeProvider.cs @@ -22,6 +22,6 @@ namespace DotRecast.Recast.Geom { public interface IConvexVolumeProvider { - IList ConvexVolumes(); + IList ConvexVolumes(); } } \ No newline at end of file diff --git a/src/DotRecast.Recast/Geom/SimpleInputGeomProvider.cs b/src/DotRecast.Recast/Geom/SimpleInputGeomProvider.cs index ee6927a..c2f06c2 100644 --- a/src/DotRecast.Recast/Geom/SimpleInputGeomProvider.cs +++ b/src/DotRecast.Recast/Geom/SimpleInputGeomProvider.cs @@ -32,7 +32,7 @@ namespace DotRecast.Recast.Geom public readonly float[] normals; private RcVec3f bmin; private RcVec3f bmax; - private readonly List volumes = new List(); + private readonly List volumes = new List(); private readonly RcTriMesh _mesh; public SimpleInputGeomProvider(List vertexPositions, List meshFaces) @@ -91,14 +91,14 @@ namespace DotRecast.Recast.Geom return bmax; } - public IList ConvexVolumes() + public IList ConvexVolumes() { return volumes; } - public void AddConvexVolume(float[] verts, float minh, float maxh, AreaModification areaMod) + public void AddConvexVolume(float[] verts, float minh, float maxh, RcAreaModification areaMod) { - ConvexVolume vol = new ConvexVolume(); + RcConvexVolume vol = new RcConvexVolume(); vol.hmin = minh; vol.hmax = maxh; vol.verts = verts; diff --git a/src/DotRecast.Recast/Geom/SingleTrimeshInputGeomProvider.cs b/src/DotRecast.Recast/Geom/SingleTrimeshInputGeomProvider.cs index 5df75c4..b703aba 100644 --- a/src/DotRecast.Recast/Geom/SingleTrimeshInputGeomProvider.cs +++ b/src/DotRecast.Recast/Geom/SingleTrimeshInputGeomProvider.cs @@ -59,9 +59,9 @@ namespace DotRecast.Recast.Geom return ImmutableArray.Create(_mesh); } - public IList ConvexVolumes() + public IList ConvexVolumes() { - return ImmutableArray.Empty; + return ImmutableArray.Empty; } } } \ No newline at end of file diff --git a/src/DotRecast.Recast/AreaModification.cs b/src/DotRecast.Recast/RcAreaModification.cs similarity index 91% rename from src/DotRecast.Recast/AreaModification.cs rename to src/DotRecast.Recast/RcAreaModification.cs index 5066359..abd33dc 100644 --- a/src/DotRecast.Recast/AreaModification.cs +++ b/src/DotRecast.Recast/RcAreaModification.cs @@ -20,7 +20,7 @@ freely, subject to the following restrictions: namespace DotRecast.Recast { - public class AreaModification + public class RcAreaModification { public const int RC_AREA_FLAGS_MASK = 0x3F; @@ -33,7 +33,7 @@ namespace DotRecast.Recast * @param value * The area id to apply. [Limit: <= #RC_AREA_FLAGS_MASK] */ - public AreaModification(int value) + public RcAreaModification(int value) { this.Value = value; Mask = RC_AREA_FLAGS_MASK; @@ -46,13 +46,13 @@ namespace DotRecast.Recast * @param mask * Bitwise mask used when applying value. [Limit: <= #RC_AREA_FLAGS_MASK] */ - public AreaModification(int value, int mask) + public RcAreaModification(int value, int mask) { this.Value = value; this.Mask = mask; } - public AreaModification(AreaModification other) + public RcAreaModification(RcAreaModification other) { Value = other.Value; Mask = other.Mask; diff --git a/src/DotRecast.Recast/RcConfig.cs b/src/DotRecast.Recast/RcConfig.cs index 045d4b3..5942d08 100644 --- a/src/DotRecast.Recast/RcConfig.cs +++ b/src/DotRecast.Recast/RcConfig.cs @@ -93,7 +93,7 @@ namespace DotRecast.Recast **/ public readonly float detailSampleMaxError; - public readonly AreaModification walkableAreaMod; + public readonly RcAreaModification walkableAreaMod; public readonly bool filterLowHangingObstacles; public readonly bool filterLedgeSpans; public readonly bool filterWalkableLowHeightSpans; @@ -119,7 +119,7 @@ namespace DotRecast.Recast public RcConfig(PartitionType partitionType, float cellSize, float cellHeight, float agentHeight, float agentRadius, float agentMaxClimb, float agentMaxSlope, int regionMinSize, int regionMergeSize, float edgeMaxLen, float edgeMaxError, int vertsPerPoly, float detailSampleDist, float detailSampleMaxError, - AreaModification walkableAreaMod) : this(partitionType, cellSize, cellHeight, agentMaxSlope, true, true, true, agentHeight, agentRadius, agentMaxClimb, + RcAreaModification walkableAreaMod) : this(partitionType, cellSize, cellHeight, agentMaxSlope, true, true, true, agentHeight, agentRadius, agentMaxClimb, regionMinSize, regionMergeSize, edgeMaxLen, edgeMaxError, vertsPerPoly, detailSampleDist, detailSampleMaxError, walkableAreaMod, true) { @@ -131,7 +131,7 @@ namespace DotRecast.Recast public RcConfig(PartitionType partitionType, float cellSize, float cellHeight, float agentMaxSlope, bool filterLowHangingObstacles, bool filterLedgeSpans, bool filterWalkableLowHeightSpans, float agentHeight, float agentRadius, float agentMaxClimb, int regionMinSize, int regionMergeSize, float edgeMaxLen, float edgeMaxError, - int vertsPerPoly, float detailSampleDist, float detailSampleMaxError, AreaModification walkableAreaMod, + int vertsPerPoly, float detailSampleDist, float detailSampleMaxError, RcAreaModification walkableAreaMod, bool buildMeshDetail) : this(false, 0, 0, 0, partitionType, cellSize, cellHeight, agentMaxSlope, filterLowHangingObstacles, filterLedgeSpans, filterWalkableLowHeightSpans, agentHeight, agentRadius, agentMaxClimb, regionMinSize * regionMinSize * cellSize * cellSize, regionMergeSize * regionMergeSize * cellSize * cellSize, @@ -144,7 +144,7 @@ namespace DotRecast.Recast float cellSize, float cellHeight, float agentMaxSlope, bool filterLowHangingObstacles, bool filterLedgeSpans, bool filterWalkableLowHeightSpans, float agentHeight, float agentRadius, float agentMaxClimb, float minRegionArea, float mergeRegionArea, float edgeMaxLen, float edgeMaxError, int vertsPerPoly, bool buildMeshDetail, - float detailSampleDist, float detailSampleMaxError, AreaModification walkableAreaMod) + float detailSampleDist, float detailSampleMaxError, RcAreaModification walkableAreaMod) { this.useTiles = useTiles; this.tileSizeX = tileSizeX; diff --git a/src/DotRecast.Recast/ConvexVolume.cs b/src/DotRecast.Recast/RcConvexVolume.cs similarity index 93% rename from src/DotRecast.Recast/ConvexVolume.cs rename to src/DotRecast.Recast/RcConvexVolume.cs index 6de8a43..591859b 100644 --- a/src/DotRecast.Recast/ConvexVolume.cs +++ b/src/DotRecast.Recast/RcConvexVolume.cs @@ -20,11 +20,11 @@ freely, subject to the following restrictions: namespace DotRecast.Recast { - public class ConvexVolume + public class RcConvexVolume { public float[] verts; public float hmin; public float hmax; - public AreaModification areaMod; + public RcAreaModification areaMod; } } \ No newline at end of file diff --git a/src/DotRecast.Recast/Recast.cs b/src/DotRecast.Recast/Recast.cs index 826f1d2..f19abff 100644 --- a/src/DotRecast.Recast/Recast.cs +++ b/src/DotRecast.Recast/Recast.cs @@ -67,7 +67,7 @@ namespace DotRecast.Recast /// See the #rcConfig documentation for more information on the configuration parameters. /// /// @see rcHeightfield, rcClearUnwalkableTriangles, rcRasterizeTriangles - public static int[] MarkWalkableTriangles(RcTelemetry ctx, float walkableSlopeAngle, float[] verts, int[] tris, int nt, AreaModification areaMod) + public static int[] MarkWalkableTriangles(RcTelemetry ctx, float walkableSlopeAngle, float[] verts, int[] tris, int nt, RcAreaModification areaMod) { int[] areas = new int[nt]; float walkableThr = (float)Math.Cos(walkableSlopeAngle / 180.0f * Math.PI); diff --git a/src/DotRecast.Recast/RecastArea.cs b/src/DotRecast.Recast/RecastArea.cs index b33f1d0..5da81c0 100644 --- a/src/DotRecast.Recast/RecastArea.cs +++ b/src/DotRecast.Recast/RecastArea.cs @@ -279,7 +279,7 @@ namespace DotRecast.Recast /// The value of spacial parameters are in world units. /// /// @see rcCompactHeightfield, rcMedianFilterWalkableArea - public static void MarkBoxArea(RcTelemetry ctx, float[] bmin, float[] bmax, AreaModification areaMod, RcCompactHeightfield chf) + public static void MarkBoxArea(RcTelemetry ctx, float[] bmin, float[] bmax, RcAreaModification areaMod, RcCompactHeightfield chf) { using var timer = ctx.ScopedTimer(RcTimerLabel.RC_TIMER_MARK_BOX_AREA); @@ -351,7 +351,7 @@ namespace DotRecast.Recast /// projected onto the xz-plane at @p hmin, then extruded to @p hmax. /// /// @see rcCompactHeightfield, rcMedianFilterWalkableArea - public static void MarkConvexPolyArea(RcTelemetry ctx, float[] verts, float hmin, float hmax, AreaModification areaMod, + public static void MarkConvexPolyArea(RcTelemetry ctx, float[] verts, float hmin, float hmax, RcAreaModification areaMod, RcCompactHeightfield chf) { using var timer = ctx.ScopedTimer(RcTimerLabel.RC_TIMER_MARK_CONVEXPOLY_AREA); @@ -427,7 +427,7 @@ namespace DotRecast.Recast /// The value of spacial parameters are in world units. /// /// @see rcCompactHeightfield, rcMedianFilterWalkableArea - public static void MarkCylinderArea(RcTelemetry ctx, float[] pos, float r, float h, AreaModification areaMod, RcCompactHeightfield chf) + public static void MarkCylinderArea(RcTelemetry ctx, float[] pos, float r, float h, RcAreaModification areaMod, RcCompactHeightfield chf) { using var timer = ctx.ScopedTimer(RcTimerLabel.RC_TIMER_MARK_CYLINDER_AREA); diff --git a/src/DotRecast.Recast/RecastBuilder.cs b/src/DotRecast.Recast/RecastBuilder.cs index 00998cf..0cd1a1e 100644 --- a/src/DotRecast.Recast/RecastBuilder.cs +++ b/src/DotRecast.Recast/RecastBuilder.cs @@ -294,7 +294,7 @@ namespace DotRecast.Recast // (Optional) Mark areas. if (volumeProvider != null) { - foreach (ConvexVolume vol in volumeProvider.ConvexVolumes()) + foreach (RcConvexVolume vol in volumeProvider.ConvexVolumes()) { RecastArea.MarkConvexPolyArea(ctx, vol.verts, vol.hmin, vol.hmax, vol.areaMod, chf); } diff --git a/test/DotRecast.Detour.Crowd.Test/SampleAreaModifications.cs b/test/DotRecast.Detour.Crowd.Test/SampleAreaModifications.cs index 7ec7b16..612b3aa 100644 --- a/test/DotRecast.Detour.Crowd.Test/SampleAreaModifications.cs +++ b/test/DotRecast.Detour.Crowd.Test/SampleAreaModifications.cs @@ -30,12 +30,12 @@ public class SampleAreaModifications public const int SAMPLE_POLYAREA_TYPE_GRASS = 0x5; public const int SAMPLE_POLYAREA_TYPE_JUMP = 0x6; - public static AreaModification SAMPLE_AREAMOD_GROUND = new AreaModification(SAMPLE_POLYAREA_TYPE_GROUND, SAMPLE_POLYAREA_TYPE_MASK); - public static AreaModification SAMPLE_AREAMOD_WATER = new AreaModification(SAMPLE_POLYAREA_TYPE_WATER, SAMPLE_POLYAREA_TYPE_MASK); - public static AreaModification SAMPLE_AREAMOD_ROAD = new AreaModification(SAMPLE_POLYAREA_TYPE_ROAD, SAMPLE_POLYAREA_TYPE_MASK); - public static AreaModification SAMPLE_AREAMOD_GRASS = new AreaModification(SAMPLE_POLYAREA_TYPE_GRASS, SAMPLE_POLYAREA_TYPE_MASK); - public static AreaModification SAMPLE_AREAMOD_DOOR = new AreaModification(SAMPLE_POLYAREA_TYPE_DOOR, SAMPLE_POLYAREA_TYPE_DOOR); - public static AreaModification SAMPLE_AREAMOD_JUMP = new AreaModification(SAMPLE_POLYAREA_TYPE_JUMP, SAMPLE_POLYAREA_TYPE_JUMP); + public static RcAreaModification SAMPLE_AREAMOD_GROUND = new RcAreaModification(SAMPLE_POLYAREA_TYPE_GROUND, SAMPLE_POLYAREA_TYPE_MASK); + public static RcAreaModification SAMPLE_AREAMOD_WATER = new RcAreaModification(SAMPLE_POLYAREA_TYPE_WATER, SAMPLE_POLYAREA_TYPE_MASK); + public static RcAreaModification SAMPLE_AREAMOD_ROAD = new RcAreaModification(SAMPLE_POLYAREA_TYPE_ROAD, SAMPLE_POLYAREA_TYPE_MASK); + public static RcAreaModification SAMPLE_AREAMOD_GRASS = new RcAreaModification(SAMPLE_POLYAREA_TYPE_GRASS, SAMPLE_POLYAREA_TYPE_MASK); + public static RcAreaModification SAMPLE_AREAMOD_DOOR = new RcAreaModification(SAMPLE_POLYAREA_TYPE_DOOR, SAMPLE_POLYAREA_TYPE_DOOR); + public static RcAreaModification SAMPLE_AREAMOD_JUMP = new RcAreaModification(SAMPLE_POLYAREA_TYPE_JUMP, SAMPLE_POLYAREA_TYPE_JUMP); public const int SAMPLE_POLYFLAGS_WALK = 0x01; // Ability to walk (ground, grass, road) public const int SAMPLE_POLYFLAGS_SWIM = 0x02; // Ability to swim (water). diff --git a/test/DotRecast.Detour.Dynamic.Test/SampleAreaModifications.cs b/test/DotRecast.Detour.Dynamic.Test/SampleAreaModifications.cs index d084024..42d9cb6 100644 --- a/test/DotRecast.Detour.Dynamic.Test/SampleAreaModifications.cs +++ b/test/DotRecast.Detour.Dynamic.Test/SampleAreaModifications.cs @@ -30,22 +30,22 @@ public class SampleAreaModifications public const int SAMPLE_POLYAREA_TYPE_GRASS = 0x5; public const int SAMPLE_POLYAREA_TYPE_JUMP = 0x6; - public static AreaModification SAMPLE_AREAMOD_GROUND = new AreaModification(SAMPLE_POLYAREA_TYPE_GROUND, + public static RcAreaModification SAMPLE_AREAMOD_GROUND = new RcAreaModification(SAMPLE_POLYAREA_TYPE_GROUND, SAMPLE_POLYAREA_TYPE_MASK); - public static AreaModification SAMPLE_AREAMOD_WATER = new AreaModification(SAMPLE_POLYAREA_TYPE_WATER, + public static RcAreaModification SAMPLE_AREAMOD_WATER = new RcAreaModification(SAMPLE_POLYAREA_TYPE_WATER, SAMPLE_POLYAREA_TYPE_MASK); - public static AreaModification SAMPLE_AREAMOD_ROAD = new AreaModification(SAMPLE_POLYAREA_TYPE_ROAD, + public static RcAreaModification SAMPLE_AREAMOD_ROAD = new RcAreaModification(SAMPLE_POLYAREA_TYPE_ROAD, SAMPLE_POLYAREA_TYPE_MASK); - public static AreaModification SAMPLE_AREAMOD_GRASS = new AreaModification(SAMPLE_POLYAREA_TYPE_GRASS, + public static RcAreaModification SAMPLE_AREAMOD_GRASS = new RcAreaModification(SAMPLE_POLYAREA_TYPE_GRASS, SAMPLE_POLYAREA_TYPE_MASK); - public static AreaModification SAMPLE_AREAMOD_DOOR = new AreaModification(SAMPLE_POLYAREA_TYPE_DOOR, + public static RcAreaModification SAMPLE_AREAMOD_DOOR = new RcAreaModification(SAMPLE_POLYAREA_TYPE_DOOR, SAMPLE_POLYAREA_TYPE_DOOR); - public static AreaModification SAMPLE_AREAMOD_JUMP = new AreaModification(SAMPLE_POLYAREA_TYPE_JUMP, + public static RcAreaModification SAMPLE_AREAMOD_JUMP = new RcAreaModification(SAMPLE_POLYAREA_TYPE_JUMP, SAMPLE_POLYAREA_TYPE_JUMP); public const int SAMPLE_POLYFLAGS_WALK = 0x01; // Ability to walk (ground, grass, road) diff --git a/test/DotRecast.Detour.Test/SampleAreaModifications.cs b/test/DotRecast.Detour.Test/SampleAreaModifications.cs index cd82d03..be6d2b2 100644 --- a/test/DotRecast.Detour.Test/SampleAreaModifications.cs +++ b/test/DotRecast.Detour.Test/SampleAreaModifications.cs @@ -30,22 +30,22 @@ public class SampleAreaModifications public const int SAMPLE_POLYAREA_TYPE_GRASS = 0x5; public const int SAMPLE_POLYAREA_TYPE_JUMP = 0x6; - public static AreaModification SAMPLE_AREAMOD_GROUND = new AreaModification(SAMPLE_POLYAREA_TYPE_GROUND, + public static RcAreaModification SAMPLE_AREAMOD_GROUND = new RcAreaModification(SAMPLE_POLYAREA_TYPE_GROUND, SAMPLE_POLYAREA_TYPE_MASK); - public static AreaModification SAMPLE_AREAMOD_WATER = new AreaModification(SAMPLE_POLYAREA_TYPE_WATER, + public static RcAreaModification SAMPLE_AREAMOD_WATER = new RcAreaModification(SAMPLE_POLYAREA_TYPE_WATER, SAMPLE_POLYAREA_TYPE_MASK); - public static AreaModification SAMPLE_AREAMOD_ROAD = new AreaModification(SAMPLE_POLYAREA_TYPE_ROAD, + public static RcAreaModification SAMPLE_AREAMOD_ROAD = new RcAreaModification(SAMPLE_POLYAREA_TYPE_ROAD, SAMPLE_POLYAREA_TYPE_MASK); - public static AreaModification SAMPLE_AREAMOD_GRASS = new AreaModification(SAMPLE_POLYAREA_TYPE_GRASS, + public static RcAreaModification SAMPLE_AREAMOD_GRASS = new RcAreaModification(SAMPLE_POLYAREA_TYPE_GRASS, SAMPLE_POLYAREA_TYPE_MASK); - public static AreaModification SAMPLE_AREAMOD_DOOR = new AreaModification(SAMPLE_POLYAREA_TYPE_DOOR, + public static RcAreaModification SAMPLE_AREAMOD_DOOR = new RcAreaModification(SAMPLE_POLYAREA_TYPE_DOOR, SAMPLE_POLYAREA_TYPE_DOOR); - public static AreaModification SAMPLE_AREAMOD_JUMP = new AreaModification(SAMPLE_POLYAREA_TYPE_JUMP, + public static RcAreaModification SAMPLE_AREAMOD_JUMP = new RcAreaModification(SAMPLE_POLYAREA_TYPE_JUMP, SAMPLE_POLYAREA_TYPE_JUMP); public const int SAMPLE_POLYFLAGS_WALK = 0x01; // Ability to walk (ground, grass, road) diff --git a/test/DotRecast.Detour.TileCache.Test/SampleAreaModifications.cs b/test/DotRecast.Detour.TileCache.Test/SampleAreaModifications.cs index dbe085f..b658035 100644 --- a/test/DotRecast.Detour.TileCache.Test/SampleAreaModifications.cs +++ b/test/DotRecast.Detour.TileCache.Test/SampleAreaModifications.cs @@ -44,21 +44,21 @@ public class SampleAreaModifications /// Flag for jump area. Can be combined with area types and door flag. public static int SAMPLE_POLYAREA_FLAG_JUMP = 0x10; - public static AreaModification SAMPLE_AREAMOD_GROUND = new AreaModification(SAMPLE_POLYAREA_TYPE_GROUND, + public static RcAreaModification SAMPLE_AREAMOD_GROUND = new RcAreaModification(SAMPLE_POLYAREA_TYPE_GROUND, SAMPLE_POLYAREA_TYPE_MASK); - public static AreaModification SAMPLE_AREAMOD_WATER = new AreaModification(SAMPLE_POLYAREA_TYPE_WATER, + public static RcAreaModification SAMPLE_AREAMOD_WATER = new RcAreaModification(SAMPLE_POLYAREA_TYPE_WATER, SAMPLE_POLYAREA_TYPE_MASK); - public static AreaModification SAMPLE_AREAMOD_ROAD = new AreaModification(SAMPLE_POLYAREA_TYPE_ROAD, + public static RcAreaModification SAMPLE_AREAMOD_ROAD = new RcAreaModification(SAMPLE_POLYAREA_TYPE_ROAD, SAMPLE_POLYAREA_TYPE_MASK); - public static AreaModification SAMPLE_AREAMOD_GRASS = new AreaModification(SAMPLE_POLYAREA_TYPE_GRASS, + public static RcAreaModification SAMPLE_AREAMOD_GRASS = new RcAreaModification(SAMPLE_POLYAREA_TYPE_GRASS, SAMPLE_POLYAREA_TYPE_MASK); - public static AreaModification SAMPLE_AREAMOD_DOOR = new AreaModification(SAMPLE_POLYAREA_FLAG_DOOR, + public static RcAreaModification SAMPLE_AREAMOD_DOOR = new RcAreaModification(SAMPLE_POLYAREA_FLAG_DOOR, SAMPLE_POLYAREA_FLAG_DOOR); - public static AreaModification SAMPLE_AREAMOD_JUMP = new AreaModification(SAMPLE_POLYAREA_FLAG_JUMP, + public static RcAreaModification SAMPLE_AREAMOD_JUMP = new RcAreaModification(SAMPLE_POLYAREA_FLAG_JUMP, SAMPLE_POLYAREA_FLAG_JUMP); } \ No newline at end of file diff --git a/test/DotRecast.Recast.Test/SampleAreaModifications.cs b/test/DotRecast.Recast.Test/SampleAreaModifications.cs index 5f20bb6..6794824 100644 --- a/test/DotRecast.Recast.Test/SampleAreaModifications.cs +++ b/test/DotRecast.Recast.Test/SampleAreaModifications.cs @@ -40,21 +40,21 @@ public class SampleAreaModifications /// Flag for jump area. Can be combined with area types and door flag. public const int SAMPLE_POLYAREA_FLAG_JUMP = 0x10; - public static readonly AreaModification SAMPLE_AREAMOD_GROUND = new AreaModification(SAMPLE_POLYAREA_TYPE_GROUND, + public static readonly RcAreaModification SAMPLE_AREAMOD_GROUND = new RcAreaModification(SAMPLE_POLYAREA_TYPE_GROUND, SAMPLE_POLYAREA_TYPE_MASK); - public static readonly AreaModification SAMPLE_AREAMOD_WATER = new AreaModification(SAMPLE_POLYAREA_TYPE_WATER, + public static readonly RcAreaModification SAMPLE_AREAMOD_WATER = new RcAreaModification(SAMPLE_POLYAREA_TYPE_WATER, SAMPLE_POLYAREA_TYPE_MASK); - public static readonly AreaModification SAMPLE_AREAMOD_ROAD = new AreaModification(SAMPLE_POLYAREA_TYPE_ROAD, + public static readonly RcAreaModification SAMPLE_AREAMOD_ROAD = new RcAreaModification(SAMPLE_POLYAREA_TYPE_ROAD, SAMPLE_POLYAREA_TYPE_MASK); - public static readonly AreaModification SAMPLE_AREAMOD_GRASS = new AreaModification(SAMPLE_POLYAREA_TYPE_GRASS, + public static readonly RcAreaModification SAMPLE_AREAMOD_GRASS = new RcAreaModification(SAMPLE_POLYAREA_TYPE_GRASS, SAMPLE_POLYAREA_TYPE_MASK); - public static readonly AreaModification SAMPLE_AREAMOD_DOOR = new AreaModification(SAMPLE_POLYAREA_FLAG_DOOR, + public static readonly RcAreaModification SAMPLE_AREAMOD_DOOR = new RcAreaModification(SAMPLE_POLYAREA_FLAG_DOOR, SAMPLE_POLYAREA_FLAG_DOOR); - public static readonly AreaModification SAMPLE_AREAMOD_JUMP = new AreaModification(SAMPLE_POLYAREA_FLAG_JUMP, + public static readonly RcAreaModification SAMPLE_AREAMOD_JUMP = new RcAreaModification(SAMPLE_POLYAREA_FLAG_JUMP, SAMPLE_POLYAREA_FLAG_JUMP); } \ No newline at end of file