From fdeffe3f30e8d6dcef808e70ee14bb70cf804c3a Mon Sep 17 00:00:00 2001 From: austin Date: Fri, 2 May 2025 16:54:57 -0400 Subject: [PATCH] refactor Pathfinder class --- .../server/datacell/gridded/GriddedDataCellManager.java | 8 ++++---- .../recast/{Pathfinder.java => RecastPathfinder.java} | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) rename src/main/java/electrosphere/server/pathfinding/recast/{Pathfinder.java => RecastPathfinder.java} (97%) diff --git a/src/main/java/electrosphere/server/datacell/gridded/GriddedDataCellManager.java b/src/main/java/electrosphere/server/datacell/gridded/GriddedDataCellManager.java index a2b4dbcd..f326f6fd 100644 --- a/src/main/java/electrosphere/server/datacell/gridded/GriddedDataCellManager.java +++ b/src/main/java/electrosphere/server/datacell/gridded/GriddedDataCellManager.java @@ -40,7 +40,7 @@ import electrosphere.server.datacell.physics.PhysicsDataCell; import electrosphere.server.entity.ServerContentManager; import electrosphere.server.entity.serialization.ContentSerialization; import electrosphere.server.pathfinding.recast.NavMeshConstructor; -import electrosphere.server.pathfinding.recast.Pathfinder; +import electrosphere.server.pathfinding.recast.RecastPathfinder; import electrosphere.server.physics.block.manager.ServerBlockManager; import electrosphere.server.physics.fluid.manager.ServerFluidChunk; import electrosphere.server.physics.fluid.manager.ServerFluidManager; @@ -163,7 +163,7 @@ public class GriddedDataCellManager implements DataCellManager, VoxelCellManager /** * The pathfinder for the manager */ - Pathfinder pathfinder; + RecastPathfinder pathfinder; /** * Constructor @@ -194,7 +194,7 @@ public class GriddedDataCellManager implements DataCellManager, VoxelCellManager this.serverContentManager + " " ); } - this.pathfinder = new Pathfinder(); + this.pathfinder = new RecastPathfinder(); } /** @@ -771,7 +771,7 @@ public class GriddedDataCellManager implements DataCellManager, VoxelCellManager Map groundDataCells, Map cellTrackingMap, Realm realm, - Pathfinder pathfinder + RecastPathfinder pathfinder ){ //get data to generate with Vector3d realPos = new Vector3d( diff --git a/src/main/java/electrosphere/server/pathfinding/recast/Pathfinder.java b/src/main/java/electrosphere/server/pathfinding/recast/RecastPathfinder.java similarity index 97% rename from src/main/java/electrosphere/server/pathfinding/recast/Pathfinder.java rename to src/main/java/electrosphere/server/pathfinding/recast/RecastPathfinder.java index 7d582c2f..a56b3c6f 100644 --- a/src/main/java/electrosphere/server/pathfinding/recast/Pathfinder.java +++ b/src/main/java/electrosphere/server/pathfinding/recast/RecastPathfinder.java @@ -25,7 +25,7 @@ import electrosphere.server.physics.terrain.manager.ServerTerrainChunk; /** * Performs pathfinding */ -public class Pathfinder { +public class RecastPathfinder { /** * Maximum points in a straight path @@ -50,7 +50,7 @@ public class Pathfinder { /** * Creates the pathfinder */ - public Pathfinder(){ + public RecastPathfinder(){ NavMeshParams params = new NavMeshParams(); params.tileHeight = ServerTerrainChunk.CHUNK_PLACEMENT_OFFSET; params.tileWidth = ServerTerrainChunk.CHUNK_PLACEMENT_OFFSET; @@ -146,7 +146,7 @@ public class Pathfinder { message = "Failed to solve for path -- invalid param!\n" + "Message: " + pathResult.message + "\n" + "Status: " + pathResult.status + "\n" + - Pathfinder.checkInvalidParam(this.navMesh,startRef,endRef,startArr,endArr) + "\n" + + RecastPathfinder.checkInvalidParam(this.navMesh,startRef,endRef,startArr,endArr) + "\n" + "" ; }