From 6e8867ec9487b8a520079313e7961c53e58dec3f Mon Sep 17 00:00:00 2001 From: ikpil Date: Mon, 11 Sep 2023 23:22:11 +0900 Subject: [PATCH] refactor: vcelfile save and load --- .../Tools/DynamicUpdateSampleTool.cs | 22 +++++++---------- .../Tools/RcDynamicUpdateTool.cs | 24 ++++++++++++++++++- 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/src/DotRecast.Recast.Demo/Tools/DynamicUpdateSampleTool.cs b/src/DotRecast.Recast.Demo/Tools/DynamicUpdateSampleTool.cs index 2a5213b..865ebc8 100644 --- a/src/DotRecast.Recast.Demo/Tools/DynamicUpdateSampleTool.cs +++ b/src/DotRecast.Recast.Demo/Tools/DynamicUpdateSampleTool.cs @@ -56,23 +56,23 @@ public class DynamicUpdateSampleTool : ISampleTool private float walkableHeight = 2f; private float walkableRadius = 0.6f; private float walkableClimb = 0.9f; - + private float minRegionArea = 6f; private float regionMergeSize = 36f; - + private float maxEdgeLen = 12f; private float maxSimplificationError = 1.3f; private int vertsPerPoly = 6; - + private float detailSampleDist = 6f; private float detailSampleMaxError = 1f; - + private bool filterLowHangingObstacles = true; private bool filterLedgeSpans = true; private bool filterWalkableLowHeightSpans = true; - + private bool buildDetailMesh = true; - + private bool compression = true; private bool showColliders = false; private long buildTime; @@ -692,10 +692,7 @@ public class DynamicUpdateSampleTool : ISampleTool { try { - using var fs = new FileStream(filename, FileMode.Open, FileAccess.Read); - using var br = new BinaryReader(fs); - VoxelFileReader reader = new VoxelFileReader(DtVoxelTileLZ4DemoCompressor.Shared); - VoxelFile voxelFile = reader.Read(br); + var voxelFile = _tool.Load(filename, DtVoxelTileLZ4DemoCompressor.Shared); dynaMesh = new DynamicNavMesh(voxelFile); dynaMesh.config.keepIntermediateResults = true; @@ -714,11 +711,8 @@ public class DynamicUpdateSampleTool : ISampleTool private void Save(string filename) { - using var fs = new FileStream(filename, FileMode.CreateNew, FileAccess.Write); - using var bw = new BinaryWriter(fs); VoxelFile voxelFile = VoxelFile.From(dynaMesh); - VoxelFileWriter writer = new VoxelFileWriter(DtVoxelTileLZ4DemoCompressor.Shared); - writer.Write(bw, voxelFile, compression); + _tool.Save(filename, voxelFile, compression, DtVoxelTileLZ4DemoCompressor.Shared); } private void BuildDynaMesh() diff --git a/src/DotRecast.Recast.Toolset/Tools/RcDynamicUpdateTool.cs b/src/DotRecast.Recast.Toolset/Tools/RcDynamicUpdateTool.cs index 82aca10..a3abf8e 100644 --- a/src/DotRecast.Recast.Toolset/Tools/RcDynamicUpdateTool.cs +++ b/src/DotRecast.Recast.Toolset/Tools/RcDynamicUpdateTool.cs @@ -1,4 +1,8 @@ -namespace DotRecast.Recast.Toolset.Tools +using System.IO; +using DotRecast.Core; +using DotRecast.Detour.Dynamic.Io; + +namespace DotRecast.Recast.Toolset.Tools { public class RcDynamicUpdateTool : IRcToolable { @@ -6,5 +10,23 @@ { return "Dynamic Updates"; } + + public VoxelFile Load(string filename, IRcCompressor compressor) + { + using var fs = new FileStream(filename, FileMode.Open, FileAccess.Read); + using var br = new BinaryReader(fs); + VoxelFileReader reader = new VoxelFileReader(compressor); + VoxelFile voxelFile = reader.Read(br); + + return voxelFile; + } + + public void Save(string filename, VoxelFile voxelFile, bool compression, IRcCompressor compressor) + { + using var fs = new FileStream(filename, FileMode.CreateNew, FileAccess.Write); + using var bw = new BinaryWriter(fs); + VoxelFileWriter writer = new VoxelFileWriter(compressor); + writer.Write(bw, voxelFile, compression); + } } } \ No newline at end of file