refactor Pathfinder class
All checks were successful
studiorailgun/Renderer/pipeline/head This commit looks good
All checks were successful
studiorailgun/Renderer/pipeline/head This commit looks good
This commit is contained in:
parent
73d07b8941
commit
fdeffe3f30
@ -40,7 +40,7 @@ import electrosphere.server.datacell.physics.PhysicsDataCell;
|
|||||||
import electrosphere.server.entity.ServerContentManager;
|
import electrosphere.server.entity.ServerContentManager;
|
||||||
import electrosphere.server.entity.serialization.ContentSerialization;
|
import electrosphere.server.entity.serialization.ContentSerialization;
|
||||||
import electrosphere.server.pathfinding.recast.NavMeshConstructor;
|
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.block.manager.ServerBlockManager;
|
||||||
import electrosphere.server.physics.fluid.manager.ServerFluidChunk;
|
import electrosphere.server.physics.fluid.manager.ServerFluidChunk;
|
||||||
import electrosphere.server.physics.fluid.manager.ServerFluidManager;
|
import electrosphere.server.physics.fluid.manager.ServerFluidManager;
|
||||||
@ -163,7 +163,7 @@ public class GriddedDataCellManager implements DataCellManager, VoxelCellManager
|
|||||||
/**
|
/**
|
||||||
* The pathfinder for the manager
|
* The pathfinder for the manager
|
||||||
*/
|
*/
|
||||||
Pathfinder pathfinder;
|
RecastPathfinder pathfinder;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor
|
* Constructor
|
||||||
@ -194,7 +194,7 @@ public class GriddedDataCellManager implements DataCellManager, VoxelCellManager
|
|||||||
this.serverContentManager + " "
|
this.serverContentManager + " "
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
this.pathfinder = new Pathfinder();
|
this.pathfinder = new RecastPathfinder();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -771,7 +771,7 @@ public class GriddedDataCellManager implements DataCellManager, VoxelCellManager
|
|||||||
Map<Long, ServerDataCell> groundDataCells,
|
Map<Long, ServerDataCell> groundDataCells,
|
||||||
Map<ServerDataCell,GriddedDataCellTrackingData> cellTrackingMap,
|
Map<ServerDataCell,GriddedDataCellTrackingData> cellTrackingMap,
|
||||||
Realm realm,
|
Realm realm,
|
||||||
Pathfinder pathfinder
|
RecastPathfinder pathfinder
|
||||||
){
|
){
|
||||||
//get data to generate with
|
//get data to generate with
|
||||||
Vector3d realPos = new Vector3d(
|
Vector3d realPos = new Vector3d(
|
||||||
|
|||||||
@ -25,7 +25,7 @@ import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
|
|||||||
/**
|
/**
|
||||||
* Performs pathfinding
|
* Performs pathfinding
|
||||||
*/
|
*/
|
||||||
public class Pathfinder {
|
public class RecastPathfinder {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Maximum points in a straight path
|
* Maximum points in a straight path
|
||||||
@ -50,7 +50,7 @@ public class Pathfinder {
|
|||||||
/**
|
/**
|
||||||
* Creates the pathfinder
|
* Creates the pathfinder
|
||||||
*/
|
*/
|
||||||
public Pathfinder(){
|
public RecastPathfinder(){
|
||||||
NavMeshParams params = new NavMeshParams();
|
NavMeshParams params = new NavMeshParams();
|
||||||
params.tileHeight = ServerTerrainChunk.CHUNK_PLACEMENT_OFFSET;
|
params.tileHeight = ServerTerrainChunk.CHUNK_PLACEMENT_OFFSET;
|
||||||
params.tileWidth = 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 = "Failed to solve for path -- invalid param!\n" +
|
||||||
"Message: " + pathResult.message + "\n" +
|
"Message: " + pathResult.message + "\n" +
|
||||||
"Status: " + pathResult.status + "\n" +
|
"Status: " + pathResult.status + "\n" +
|
||||||
Pathfinder.checkInvalidParam(this.navMesh,startRef,endRef,startArr,endArr) + "\n" +
|
RecastPathfinder.checkInvalidParam(this.navMesh,startRef,endRef,startArr,endArr) + "\n" +
|
||||||
""
|
""
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue
Block a user