a.samsonkin
/
DotRecastNetSim
forked from bit/DotRecastNetSim
1
0
Fork 0
Code Pull Requests Activity

refactor: rename

This commit is contained in:
ikpil 2023-09-20 23:44:02 +09:00
parent c1cc0fb286
commit bfa20b41e8
5 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/DotRecast.Detour.TileCache/ObstacleRequest.cs → src/DotRecast.Detour.TileCache/DtObstacleRequest.cs
View File

@ -20,12 +20,12 @@ freely, subject to the following restrictions:
namespace DotRecast.Detour.TileCache namespace DotRecast.Detour.TileCache
{ {
public readonly struct ObstacleRequest public readonly struct DtObstacleRequest
{ {
public readonly ObstacleRequestAction action; public readonly DtObstacleRequestAction action;
public readonly long refs; public readonly long refs;
public ObstacleRequest(ObstacleRequestAction action, long refs) public DtObstacleRequest(DtObstacleRequestAction action, long refs)
{ {
this.action = action; this.action = action;
this.refs = refs; this.refs = refs;

2
src/DotRecast.Detour.TileCache/ObstacleRequestAction.cs → src/DotRecast.Detour.TileCache/DtObstacleRequestAction.cs
View File

@ -20,7 +20,7 @@ freely, subject to the following restrictions:
namespace DotRecast.Detour.TileCache namespace DotRecast.Detour.TileCache
{ {
public enum ObstacleRequestAction public enum DtObstacleRequestAction
{ {
REQUEST_ADD, REQUEST_ADD,
REQUEST_REMOVE REQUEST_REMOVE

32
src/DotRecast.Detour.TileCache/DtTileCache.cs
View File

@ -47,7 +47,7 @@ namespace DotRecast.Detour.TileCache
private readonly List<DtTileCacheObstacle> m_obstacles = new List<DtTileCacheObstacle>(); private readonly List<DtTileCacheObstacle> m_obstacles = new List<DtTileCacheObstacle>();
private DtTileCacheObstacle m_nextFreeObstacle; private DtTileCacheObstacle m_nextFreeObstacle;
private readonly List<ObstacleRequest> m_reqs = new List<ObstacleRequest>(); private readonly List<DtObstacleRequest> m_reqs = new List<DtObstacleRequest>();
private readonly List<long> m_update = new List<long>(); private readonly List<long> m_update = new List<long>();
private readonly DtTileCacheBuilder builder = new DtTileCacheBuilder(); private readonly DtTileCacheBuilder builder = new DtTileCacheBuilder();
@ -348,7 +348,7 @@ namespace DotRecast.Detour.TileCache
public long AddObstacle(RcVec3f pos, float radius, float height) public long AddObstacle(RcVec3f pos, float radius, float height)
{ {
DtTileCacheObstacle ob = AllocObstacle(); DtTileCacheObstacle ob = AllocObstacle();
ob.type = TileCacheObstacleType.CYLINDER; ob.type = DtTileCacheObstacleType.CYLINDER;
ob.pos = pos; ob.pos = pos;
ob.radius = radius; ob.radius = radius;
@ -361,7 +361,7 @@ namespace DotRecast.Detour.TileCache
public long AddBoxObstacle(RcVec3f bmin, RcVec3f bmax) public long AddBoxObstacle(RcVec3f bmin, RcVec3f bmax)
{ {
DtTileCacheObstacle ob = AllocObstacle(); DtTileCacheObstacle ob = AllocObstacle();
ob.type = TileCacheObstacleType.BOX; ob.type = DtTileCacheObstacleType.BOX;
ob.bmin = bmin; ob.bmin = bmin;
ob.bmax = bmax; ob.bmax = bmax;
@ -373,7 +373,7 @@ namespace DotRecast.Detour.TileCache
public long AddBoxObstacle(RcVec3f center, RcVec3f extents, float yRadians) public long AddBoxObstacle(RcVec3f center, RcVec3f extents, float yRadians)
{ {
DtTileCacheObstacle ob = AllocObstacle(); DtTileCacheObstacle ob = AllocObstacle();
ob.type = TileCacheObstacleType.ORIENTED_BOX; ob.type = DtTileCacheObstacleType.ORIENTED_BOX;
ob.center = center; ob.center = center;
ob.extents = extents; ob.extents = extents;
float coshalf = (float)Math.Cos(0.5f * yRadians); float coshalf = (float)Math.Cos(0.5f * yRadians);
@ -383,9 +383,9 @@ namespace DotRecast.Detour.TileCache
return AddObstacleRequest(ob).refs; return AddObstacleRequest(ob).refs;
} }
private ObstacleRequest AddObstacleRequest(DtTileCacheObstacle ob) private DtObstacleRequest AddObstacleRequest(DtTileCacheObstacle ob)
{ {
ObstacleRequest req = new ObstacleRequest(ObstacleRequestAction.REQUEST_ADD, GetObstacleRef(ob)); DtObstacleRequest req = new DtObstacleRequest(DtObstacleRequestAction.REQUEST_ADD, GetObstacleRef(ob));
m_reqs.Add(req); m_reqs.Add(req);
return req; return req;
} }
@ -397,7 +397,7 @@ namespace DotRecast.Detour.TileCache
return; return;
} }
ObstacleRequest req = new ObstacleRequest(ObstacleRequestAction.REQUEST_REMOVE, refs); DtObstacleRequest req = new DtObstacleRequest(DtObstacleRequestAction.REQUEST_REMOVE, refs);
m_reqs.Add(req); m_reqs.Add(req);
} }
@ -479,7 +479,7 @@ namespace DotRecast.Detour.TileCache
if (0 == m_update.Count) if (0 == m_update.Count)
{ {
// Process requests. // Process requests.
foreach (ObstacleRequest req in m_reqs) foreach (DtObstacleRequest req in m_reqs)
{ {
int idx = DecodeObstacleIdObstacle(req.refs); int idx = DecodeObstacleIdObstacle(req.refs);
if (idx >= m_obstacles.Count) if (idx >= m_obstacles.Count)
@ -494,7 +494,7 @@ namespace DotRecast.Detour.TileCache
continue; continue;
} }
if (req.action == ObstacleRequestAction.REQUEST_ADD) if (req.action == DtObstacleRequestAction.REQUEST_ADD)
{ {
// Find touched tiles. // Find touched tiles.
RcVec3f bmin = new RcVec3f(); RcVec3f bmin = new RcVec3f();
@ -513,7 +513,7 @@ namespace DotRecast.Detour.TileCache
ob.pending.Add(j); ob.pending.Add(j);
} }
} }
else if (req.action == ObstacleRequestAction.REQUEST_REMOVE) else if (req.action == DtObstacleRequestAction.REQUEST_REMOVE)
{ {
// Prepare to remove obstacle. // Prepare to remove obstacle.
ob.state = DtObstacleState.DT_OBSTACLE_REMOVING; ob.state = DtObstacleState.DT_OBSTACLE_REMOVING;
@ -612,15 +612,15 @@ namespace DotRecast.Detour.TileCache
if (Contains(ob.touched, refs)) if (Contains(ob.touched, refs))
{ {
if (ob.type == TileCacheObstacleType.CYLINDER) if (ob.type == DtTileCacheObstacleType.CYLINDER)
{ {
builder.MarkCylinderArea(layer, tile.header.bmin, m_params.cs, m_params.ch, ob.pos, ob.radius, ob.height, 0); builder.MarkCylinderArea(layer, tile.header.bmin, m_params.cs, m_params.ch, ob.pos, ob.radius, ob.height, 0);
} }
else if (ob.type == TileCacheObstacleType.BOX) else if (ob.type == DtTileCacheObstacleType.BOX)
{ {
builder.MarkBoxArea(layer, tile.header.bmin, m_params.cs, m_params.ch, ob.bmin, ob.bmax, 0); builder.MarkBoxArea(layer, tile.header.bmin, m_params.cs, m_params.ch, ob.bmin, ob.bmax, 0);
} }
else if (ob.type == TileCacheObstacleType.ORIENTED_BOX) else if (ob.type == DtTileCacheObstacleType.ORIENTED_BOX)
{ {
builder.MarkBoxArea(layer, tile.header.bmin, m_params.cs, m_params.ch, ob.center, ob.extents, ob.rotAux, 0); builder.MarkBoxArea(layer, tile.header.bmin, m_params.cs, m_params.ch, ob.center, ob.extents, ob.rotAux, 0);
} }
@ -692,7 +692,7 @@ namespace DotRecast.Detour.TileCache
public void GetObstacleBounds(DtTileCacheObstacle ob, ref RcVec3f bmin, ref RcVec3f bmax) public void GetObstacleBounds(DtTileCacheObstacle ob, ref RcVec3f bmin, ref RcVec3f bmax)
{ {
if (ob.type == TileCacheObstacleType.CYLINDER) if (ob.type == DtTileCacheObstacleType.CYLINDER)
{ {
bmin.x = ob.pos.x - ob.radius; bmin.x = ob.pos.x - ob.radius;
bmin.y = ob.pos.y; bmin.y = ob.pos.y;
@ -701,12 +701,12 @@ namespace DotRecast.Detour.TileCache
bmax.y = ob.pos.y + ob.height; bmax.y = ob.pos.y + ob.height;
bmax.z = ob.pos.z + ob.radius; bmax.z = ob.pos.z + ob.radius;
} }
else if (ob.type == TileCacheObstacleType.BOX) else if (ob.type == DtTileCacheObstacleType.BOX)
{ {
bmin = ob.bmin; bmin = ob.bmin;
bmax = ob.bmax; bmax = ob.bmax;
} }
else if (ob.type == TileCacheObstacleType.ORIENTED_BOX) else if (ob.type == DtTileCacheObstacleType.ORIENTED_BOX)
{ {
float maxr = 1.41f * Math.Max(ob.extents.x, ob.extents.z); float maxr = 1.41f * Math.Max(ob.extents.x, ob.extents.z);
bmin.x = ob.center.x - maxr; bmin.x = ob.center.x - maxr;

2
src/DotRecast.Detour.TileCache/DtTileCacheObstacle.cs
View File

@ -26,7 +26,7 @@ namespace DotRecast.Detour.TileCache
public class DtTileCacheObstacle public class DtTileCacheObstacle
{ {
public readonly int index; public readonly int index;
public TileCacheObstacleType type; public DtTileCacheObstacleType type;
public RcVec3f pos = new RcVec3f(); public RcVec3f pos = new RcVec3f();
public RcVec3f bmin = new RcVec3f(); public RcVec3f bmin = new RcVec3f();
public RcVec3f bmax = new RcVec3f(); public RcVec3f bmax = new RcVec3f();

2
src/DotRecast.Detour.TileCache/TileCacheObstacleType.cs → src/DotRecast.Detour.TileCache/DtTileCacheObstacleType.cs
View File

@ -1,6 +1,6 @@
namespace DotRecast.Detour.TileCache namespace DotRecast.Detour.TileCache
{ {
public enum TileCacheObstacleType public enum DtTileCacheObstacleType
{ {
CYLINDER, CYLINDER,
BOX, BOX,