From 43bfc9a5a06f29aee97017ba249d23730dec22ec Mon Sep 17 00:00:00 2001 From: ikpil Date: Sat, 1 Jul 2023 13:05:38 +0900 Subject: [PATCH] move DotRecast.Core.RcTelemetry --- src/{DotRecast.Recast => DotRecast.Core}/RcTelemetry.cs | 4 +--- src/{DotRecast.Recast => DotRecast.Core}/RcTelemetryTick.cs | 2 +- src/DotRecast.Detour.Crowd/DtCrowdTelemetry.cs | 2 +- src/DotRecast.Detour.Dynamic/Colliders/AbstractCollider.cs | 1 + src/DotRecast.Detour.Dynamic/Colliders/CompositeCollider.cs | 1 + .../Colliders/ConvexTrimeshCollider.cs | 1 + src/DotRecast.Detour.Dynamic/Colliders/ICollider.cs | 1 + src/DotRecast.Detour.Dynamic/Colliders/TrimeshCollider.cs | 1 + src/DotRecast.Detour.Dynamic/DynamicTile.cs | 1 + src/DotRecast.Recast.Demo/Tools/CrowdProfilingTool.cs | 2 +- src/DotRecast.Recast/RecastBuilderResult.cs | 4 +++- src/DotRecast.Recast/RecastCompact.cs | 1 + src/DotRecast.Recast/RecastContour.cs | 1 + src/DotRecast.Recast/RecastFilter.cs | 1 + src/DotRecast.Recast/RecastRegion.cs | 1 + src/DotRecast.Recast/RecastVoxelization.cs | 1 + test/DotRecast.Recast.Test/RecastTest.cs | 1 + 17 files changed, 19 insertions(+), 7 deletions(-) rename src/{DotRecast.Recast => DotRecast.Core}/RcTelemetry.cs (96%) rename src/{DotRecast.Recast => DotRecast.Core}/RcTelemetryTick.cs (92%) diff --git a/src/DotRecast.Recast/RcTelemetry.cs b/src/DotRecast.Core/RcTelemetry.cs similarity index 96% rename from src/DotRecast.Recast/RcTelemetry.cs rename to src/DotRecast.Core/RcTelemetry.cs index b23bf8a..6deec47 100644 --- a/src/DotRecast.Recast/RcTelemetry.cs +++ b/src/DotRecast.Core/RcTelemetry.cs @@ -19,12 +19,10 @@ freely, subject to the following restrictions: using System; using System.Collections.Concurrent; using System.Collections.Generic; -using System.Diagnostics; using System.Linq; using System.Threading; -using DotRecast.Core; -namespace DotRecast.Recast +namespace DotRecast.Core { public class RcTelemetry { diff --git a/src/DotRecast.Recast/RcTelemetryTick.cs b/src/DotRecast.Core/RcTelemetryTick.cs similarity index 92% rename from src/DotRecast.Recast/RcTelemetryTick.cs rename to src/DotRecast.Core/RcTelemetryTick.cs index 5f096a2..a2c84df 100644 --- a/src/DotRecast.Recast/RcTelemetryTick.cs +++ b/src/DotRecast.Core/RcTelemetryTick.cs @@ -1,6 +1,6 @@ using System; -namespace DotRecast.Recast +namespace DotRecast.Core { public readonly struct RcTelemetryTick { diff --git a/src/DotRecast.Detour.Crowd/DtCrowdTelemetry.cs b/src/DotRecast.Detour.Crowd/DtCrowdTelemetry.cs index 8017b37..bed09e7 100644 --- a/src/DotRecast.Detour.Crowd/DtCrowdTelemetry.cs +++ b/src/DotRecast.Detour.Crowd/DtCrowdTelemetry.cs @@ -43,7 +43,7 @@ namespace DotRecast.Detour.Crowd return _maxTimeToFindPath; } - public Dictionary ExecutionTimings() + public Dictionary ToExecutionTimings() { return _executionTimings; } diff --git a/src/DotRecast.Detour.Dynamic/Colliders/AbstractCollider.cs b/src/DotRecast.Detour.Dynamic/Colliders/AbstractCollider.cs index e5ad8d1..6ea247d 100644 --- a/src/DotRecast.Detour.Dynamic/Colliders/AbstractCollider.cs +++ b/src/DotRecast.Detour.Dynamic/Colliders/AbstractCollider.cs @@ -16,6 +16,7 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ +using DotRecast.Core; using DotRecast.Recast; namespace DotRecast.Detour.Dynamic.Colliders diff --git a/src/DotRecast.Detour.Dynamic/Colliders/CompositeCollider.cs b/src/DotRecast.Detour.Dynamic/Colliders/CompositeCollider.cs index 571ff72..e206b30 100644 --- a/src/DotRecast.Detour.Dynamic/Colliders/CompositeCollider.cs +++ b/src/DotRecast.Detour.Dynamic/Colliders/CompositeCollider.cs @@ -19,6 +19,7 @@ freely, subject to the following restrictions: using System; using System.Collections.Generic; using System.Linq; +using DotRecast.Core; using DotRecast.Recast; namespace DotRecast.Detour.Dynamic.Colliders diff --git a/src/DotRecast.Detour.Dynamic/Colliders/ConvexTrimeshCollider.cs b/src/DotRecast.Detour.Dynamic/Colliders/ConvexTrimeshCollider.cs index 54bb289..48eed17 100644 --- a/src/DotRecast.Detour.Dynamic/Colliders/ConvexTrimeshCollider.cs +++ b/src/DotRecast.Detour.Dynamic/Colliders/ConvexTrimeshCollider.cs @@ -17,6 +17,7 @@ freely, subject to the following restrictions: */ using System; +using DotRecast.Core; using DotRecast.Recast; namespace DotRecast.Detour.Dynamic.Colliders diff --git a/src/DotRecast.Detour.Dynamic/Colliders/ICollider.cs b/src/DotRecast.Detour.Dynamic/Colliders/ICollider.cs index c2f6aa5..ec7dcd6 100644 --- a/src/DotRecast.Detour.Dynamic/Colliders/ICollider.cs +++ b/src/DotRecast.Detour.Dynamic/Colliders/ICollider.cs @@ -16,6 +16,7 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ +using DotRecast.Core; using DotRecast.Recast; namespace DotRecast.Detour.Dynamic.Colliders diff --git a/src/DotRecast.Detour.Dynamic/Colliders/TrimeshCollider.cs b/src/DotRecast.Detour.Dynamic/Colliders/TrimeshCollider.cs index ad1ec62..bd830f0 100644 --- a/src/DotRecast.Detour.Dynamic/Colliders/TrimeshCollider.cs +++ b/src/DotRecast.Detour.Dynamic/Colliders/TrimeshCollider.cs @@ -17,6 +17,7 @@ freely, subject to the following restrictions: */ using System; +using DotRecast.Core; using DotRecast.Recast; namespace DotRecast.Detour.Dynamic.Colliders diff --git a/src/DotRecast.Detour.Dynamic/DynamicTile.cs b/src/DotRecast.Detour.Dynamic/DynamicTile.cs index 83dda02..d8e4f71 100644 --- a/src/DotRecast.Detour.Dynamic/DynamicTile.cs +++ b/src/DotRecast.Detour.Dynamic/DynamicTile.cs @@ -21,6 +21,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; +using DotRecast.Core; using DotRecast.Detour.Dynamic.Colliders; using DotRecast.Detour.Dynamic.Io; using DotRecast.Recast; diff --git a/src/DotRecast.Recast.Demo/Tools/CrowdProfilingTool.cs b/src/DotRecast.Recast.Demo/Tools/CrowdProfilingTool.cs index 0876db9..7b41e52 100644 --- a/src/DotRecast.Recast.Demo/Tools/CrowdProfilingTool.cs +++ b/src/DotRecast.Recast.Demo/Tools/CrowdProfilingTool.cs @@ -132,7 +132,7 @@ public class CrowdProfilingTool ImGui.Text($"Max time to enqueue request: {crowd.Telemetry().MaxTimeToEnqueueRequest()} s"); ImGui.Text($"Max time to find path: {crowd.Telemetry().MaxTimeToFindPath()} s"); List> timings = crowd.Telemetry() - .ExecutionTimings() + .ToExecutionTimings() .Select(e => Tuple.Create(e.Key, e.Value)) .OrderBy(x => x.Item2) .ToList(); diff --git a/src/DotRecast.Recast/RecastBuilderResult.cs b/src/DotRecast.Recast/RecastBuilderResult.cs index 2e792c9..c20e3c8 100644 --- a/src/DotRecast.Recast/RecastBuilderResult.cs +++ b/src/DotRecast.Recast/RecastBuilderResult.cs @@ -1,4 +1,6 @@ -namespace DotRecast.Recast +using DotRecast.Core; + +namespace DotRecast.Recast { public class RecastBuilderResult { diff --git a/src/DotRecast.Recast/RecastCompact.cs b/src/DotRecast.Recast/RecastCompact.cs index 68c70c2..0834e0d 100644 --- a/src/DotRecast.Recast/RecastCompact.cs +++ b/src/DotRecast.Recast/RecastCompact.cs @@ -17,6 +17,7 @@ freely, subject to the following restrictions: */ using System; +using DotRecast.Core; using static DotRecast.Core.RcMath; using static DotRecast.Recast.RcConstants; diff --git a/src/DotRecast.Recast/RecastContour.cs b/src/DotRecast.Recast/RecastContour.cs index 666de2f..e688a37 100644 --- a/src/DotRecast.Recast/RecastContour.cs +++ b/src/DotRecast.Recast/RecastContour.cs @@ -20,6 +20,7 @@ freely, subject to the following restrictions: using System; using System.Collections.Generic; +using DotRecast.Core; namespace DotRecast.Recast { diff --git a/src/DotRecast.Recast/RecastFilter.cs b/src/DotRecast.Recast/RecastFilter.cs index 089233c..cfd4102 100644 --- a/src/DotRecast.Recast/RecastFilter.cs +++ b/src/DotRecast.Recast/RecastFilter.cs @@ -19,6 +19,7 @@ freely, subject to the following restrictions: */ using System; +using DotRecast.Core; namespace DotRecast.Recast { diff --git a/src/DotRecast.Recast/RecastRegion.cs b/src/DotRecast.Recast/RecastRegion.cs index 109ae3e..a3b1641 100644 --- a/src/DotRecast.Recast/RecastRegion.cs +++ b/src/DotRecast.Recast/RecastRegion.cs @@ -21,6 +21,7 @@ freely, subject to the following restrictions: using System; using System.Collections.Generic; using System.Linq; +using DotRecast.Core; namespace DotRecast.Recast { diff --git a/src/DotRecast.Recast/RecastVoxelization.cs b/src/DotRecast.Recast/RecastVoxelization.cs index 8a5b3f6..556289b 100644 --- a/src/DotRecast.Recast/RecastVoxelization.cs +++ b/src/DotRecast.Recast/RecastVoxelization.cs @@ -17,6 +17,7 @@ freely, subject to the following restrictions: */ using System.Collections.Generic; +using DotRecast.Core; using DotRecast.Recast.Geom; namespace DotRecast.Recast diff --git a/test/DotRecast.Recast.Test/RecastTest.cs b/test/DotRecast.Recast.Test/RecastTest.cs index 432ca90..b43e0f8 100644 --- a/test/DotRecast.Recast.Test/RecastTest.cs +++ b/test/DotRecast.Recast.Test/RecastTest.cs @@ -16,6 +16,7 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ +using DotRecast.Core; using NUnit.Framework; namespace DotRecast.Recast.Test;