forked from bit/DotRecastNetSim
typo
This commit is contained in:
parent
078bf53c15
commit
a57b8f26d6
|
@ -653,8 +653,7 @@ namespace DotRecast.Detour.Crowd
|
||||||
while (!queue.IsEmpty())
|
while (!queue.IsEmpty())
|
||||||
{
|
{
|
||||||
DtCrowdAgent ag = queue.Dequeue();
|
DtCrowdAgent ag = queue.Dequeue();
|
||||||
ag.targetPathQueryResult = _pathQ.Request(ag.corridor.GetLastPoly(), ag.targetRef, ag.corridor.GetTarget(),
|
ag.targetPathQueryResult = _pathQ.Request(ag.corridor.GetLastPoly(), ag.targetRef, ag.corridor.GetTarget(), ag.targetPos, _filters[ag.option.queryFilterType]);
|
||||||
ag.targetPos, _filters[ag.option.queryFilterType]);
|
|
||||||
if (ag.targetPathQueryResult != null)
|
if (ag.targetPathQueryResult != null)
|
||||||
{
|
{
|
||||||
ag.targetState = MoveRequestState.DT_CROWDAGENT_TARGET_WAITING_FOR_PATH;
|
ag.targetState = MoveRequestState.DT_CROWDAGENT_TARGET_WAITING_FOR_PATH;
|
||||||
|
@ -1298,7 +1297,6 @@ namespace DotRecast.Detour.Crowd
|
||||||
ag.partial = false;
|
ag.partial = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void UpdateOffMeshConnections(IList<DtCrowdAgent> agents, float dt)
|
private void UpdateOffMeshConnections(IList<DtCrowdAgent> agents, float dt)
|
||||||
|
|
|
@ -24,41 +24,30 @@ namespace DotRecast.Detour.TileCache.Test;
|
||||||
|
|
||||||
public class SampleAreaModifications
|
public class SampleAreaModifications
|
||||||
{
|
{
|
||||||
public static int SAMPLE_POLYAREA_TYPE_MASK = 0x07;
|
public const int SAMPLE_POLYAREA_TYPE_MASK = 0x07;
|
||||||
|
|
||||||
/// Value for the kind of ceil "ground"
|
/// Value for the kind of ceil "ground"
|
||||||
public static int SAMPLE_POLYAREA_TYPE_GROUND = 0x1;
|
public const int SAMPLE_POLYAREA_TYPE_GROUND = 0x1;
|
||||||
|
|
||||||
/// Value for the kind of ceil "water"
|
/// Value for the kind of ceil "water"
|
||||||
public static int SAMPLE_POLYAREA_TYPE_WATER = 0x2;
|
public const int SAMPLE_POLYAREA_TYPE_WATER = 0x2;
|
||||||
|
|
||||||
/// Value for the kind of ceil "road"
|
/// Value for the kind of ceil "road"
|
||||||
public static int SAMPLE_POLYAREA_TYPE_ROAD = 0x3;
|
public const int SAMPLE_POLYAREA_TYPE_ROAD = 0x3;
|
||||||
|
|
||||||
/// Value for the kind of ceil "grass"
|
/// Value for the kind of ceil "grass"
|
||||||
public static int SAMPLE_POLYAREA_TYPE_GRASS = 0x4;
|
public const int SAMPLE_POLYAREA_TYPE_GRASS = 0x4;
|
||||||
|
|
||||||
/// Flag for door area. Can be combined with area types and jump flag.
|
/// Flag for door area. Can be combined with area types and jump flag.
|
||||||
public static int SAMPLE_POLYAREA_FLAG_DOOR = 0x08;
|
public const int SAMPLE_POLYAREA_FLAG_DOOR = 0x08;
|
||||||
|
|
||||||
/// Flag for jump area. Can be combined with area types and door flag.
|
/// Flag for jump area. Can be combined with area types and door flag.
|
||||||
public static int SAMPLE_POLYAREA_FLAG_JUMP = 0x10;
|
public const int SAMPLE_POLYAREA_FLAG_JUMP = 0x10;
|
||||||
|
|
||||||
public static RcAreaModification SAMPLE_AREAMOD_GROUND = new RcAreaModification(SAMPLE_POLYAREA_TYPE_GROUND,
|
public static readonly RcAreaModification SAMPLE_AREAMOD_GROUND = new RcAreaModification(SAMPLE_POLYAREA_TYPE_GROUND, SAMPLE_POLYAREA_TYPE_MASK);
|
||||||
SAMPLE_POLYAREA_TYPE_MASK);
|
public static readonly RcAreaModification SAMPLE_AREAMOD_WATER = new RcAreaModification(SAMPLE_POLYAREA_TYPE_WATER, SAMPLE_POLYAREA_TYPE_MASK);
|
||||||
|
public static readonly RcAreaModification SAMPLE_AREAMOD_ROAD = new RcAreaModification(SAMPLE_POLYAREA_TYPE_ROAD, SAMPLE_POLYAREA_TYPE_MASK);
|
||||||
public static RcAreaModification SAMPLE_AREAMOD_WATER = new RcAreaModification(SAMPLE_POLYAREA_TYPE_WATER,
|
public static readonly RcAreaModification SAMPLE_AREAMOD_GRASS = new RcAreaModification(SAMPLE_POLYAREA_TYPE_GRASS, SAMPLE_POLYAREA_TYPE_MASK);
|
||||||
SAMPLE_POLYAREA_TYPE_MASK);
|
public static readonly RcAreaModification SAMPLE_AREAMOD_DOOR = new RcAreaModification(SAMPLE_POLYAREA_FLAG_DOOR, SAMPLE_POLYAREA_FLAG_DOOR);
|
||||||
|
public static readonly RcAreaModification SAMPLE_AREAMOD_JUMP = new RcAreaModification(SAMPLE_POLYAREA_FLAG_JUMP, SAMPLE_POLYAREA_FLAG_JUMP);
|
||||||
public static RcAreaModification SAMPLE_AREAMOD_ROAD = new RcAreaModification(SAMPLE_POLYAREA_TYPE_ROAD,
|
|
||||||
SAMPLE_POLYAREA_TYPE_MASK);
|
|
||||||
|
|
||||||
public static RcAreaModification SAMPLE_AREAMOD_GRASS = new RcAreaModification(SAMPLE_POLYAREA_TYPE_GRASS,
|
|
||||||
SAMPLE_POLYAREA_TYPE_MASK);
|
|
||||||
|
|
||||||
public static RcAreaModification SAMPLE_AREAMOD_DOOR = new RcAreaModification(SAMPLE_POLYAREA_FLAG_DOOR,
|
|
||||||
SAMPLE_POLYAREA_FLAG_DOOR);
|
|
||||||
|
|
||||||
public static RcAreaModification SAMPLE_AREAMOD_JUMP = new RcAreaModification(SAMPLE_POLYAREA_FLAG_JUMP,
|
|
||||||
SAMPLE_POLYAREA_FLAG_JUMP);
|
|
||||||
}
|
}
|
|
@ -99,4 +99,4 @@ public class TempObstaclesTest : AbstractTileCacheTest
|
||||||
Assert.That(tile.data.header.vertCount, Is.EqualTo(16));
|
Assert.That(tile.data.header.vertCount, Is.EqualTo(16));
|
||||||
Assert.That(tile.data.header.polyCount, Is.EqualTo(6));
|
Assert.That(tile.data.header.polyCount, Is.EqualTo(6));
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -21,7 +21,6 @@ freely, subject to the following restrictions:
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using DotRecast.Core;
|
using DotRecast.Core;
|
||||||
|
|
||||||
using DotRecast.Detour.TileCache.Io;
|
using DotRecast.Detour.TileCache.Io;
|
||||||
using NUnit.Framework;
|
using NUnit.Framework;
|
||||||
|
|
||||||
|
@ -58,7 +57,7 @@ public class TileCacheFindPathTest : AbstractTileCacheTest
|
||||||
int options = 0;
|
int options = 0;
|
||||||
|
|
||||||
var pathStr = new List<StraightPathItem>();
|
var pathStr = new List<StraightPathItem>();
|
||||||
query.FindStraightPath(startPos, endPos, path, ref pathStr, maxStraightPath, options);
|
query.FindStraightPath(startPos, endPos, path, ref pathStr, maxStraightPath, options);
|
||||||
Assert.That(pathStr.Count, Is.EqualTo(8));
|
Assert.That(pathStr.Count, Is.EqualTo(8));
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -20,7 +20,6 @@ freely, subject to the following restrictions:
|
||||||
|
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using DotRecast.Core;
|
using DotRecast.Core;
|
||||||
|
|
||||||
using DotRecast.Recast;
|
using DotRecast.Recast;
|
||||||
using DotRecast.Recast.Geom;
|
using DotRecast.Recast.Geom;
|
||||||
using NUnit.Framework;
|
using NUnit.Framework;
|
||||||
|
|
|
@ -286,4 +286,4 @@ public class TileCacheTest : AbstractTileCacheTest
|
||||||
Assert.That(data.detailVerts.Length, Is.EqualTo(0));
|
Assert.That(data.detailVerts.Length, Is.EqualTo(0));
|
||||||
Assert.That(data.detailTris.Length, Is.EqualTo(4 * 3));
|
Assert.That(data.detailTris.Length, Is.EqualTo(4 * 3));
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -40,21 +40,10 @@ public class SampleAreaModifications
|
||||||
/// Flag for jump area. Can be combined with area types and door flag.
|
/// Flag for jump area. Can be combined with area types and door flag.
|
||||||
public const int SAMPLE_POLYAREA_FLAG_JUMP = 0x10;
|
public const int SAMPLE_POLYAREA_FLAG_JUMP = 0x10;
|
||||||
|
|
||||||
public static readonly RcAreaModification SAMPLE_AREAMOD_GROUND = new RcAreaModification(SAMPLE_POLYAREA_TYPE_GROUND,
|
public static readonly RcAreaModification SAMPLE_AREAMOD_GROUND = new RcAreaModification(SAMPLE_POLYAREA_TYPE_GROUND, SAMPLE_POLYAREA_TYPE_MASK);
|
||||||
SAMPLE_POLYAREA_TYPE_MASK);
|
public static readonly RcAreaModification SAMPLE_AREAMOD_WATER = new RcAreaModification(SAMPLE_POLYAREA_TYPE_WATER, SAMPLE_POLYAREA_TYPE_MASK);
|
||||||
|
public static readonly RcAreaModification SAMPLE_AREAMOD_ROAD = new RcAreaModification(SAMPLE_POLYAREA_TYPE_ROAD, SAMPLE_POLYAREA_TYPE_MASK);
|
||||||
public static readonly RcAreaModification SAMPLE_AREAMOD_WATER = new RcAreaModification(SAMPLE_POLYAREA_TYPE_WATER,
|
public static readonly RcAreaModification SAMPLE_AREAMOD_GRASS = new RcAreaModification(SAMPLE_POLYAREA_TYPE_GRASS, SAMPLE_POLYAREA_TYPE_MASK);
|
||||||
SAMPLE_POLYAREA_TYPE_MASK);
|
public static readonly RcAreaModification SAMPLE_AREAMOD_DOOR = new RcAreaModification(SAMPLE_POLYAREA_FLAG_DOOR, SAMPLE_POLYAREA_FLAG_DOOR);
|
||||||
|
public static readonly RcAreaModification SAMPLE_AREAMOD_JUMP = new RcAreaModification(SAMPLE_POLYAREA_FLAG_JUMP, SAMPLE_POLYAREA_FLAG_JUMP);
|
||||||
public static readonly RcAreaModification SAMPLE_AREAMOD_ROAD = new RcAreaModification(SAMPLE_POLYAREA_TYPE_ROAD,
|
|
||||||
SAMPLE_POLYAREA_TYPE_MASK);
|
|
||||||
|
|
||||||
public static readonly RcAreaModification SAMPLE_AREAMOD_GRASS = new RcAreaModification(SAMPLE_POLYAREA_TYPE_GRASS,
|
|
||||||
SAMPLE_POLYAREA_TYPE_MASK);
|
|
||||||
|
|
||||||
public static readonly RcAreaModification SAMPLE_AREAMOD_DOOR = new RcAreaModification(SAMPLE_POLYAREA_FLAG_DOOR,
|
|
||||||
SAMPLE_POLYAREA_FLAG_DOOR);
|
|
||||||
|
|
||||||
public static readonly RcAreaModification SAMPLE_AREAMOD_JUMP = new RcAreaModification(SAMPLE_POLYAREA_FLAG_JUMP,
|
|
||||||
SAMPLE_POLYAREA_FLAG_JUMP);
|
|
||||||
}
|
}
|
Loading…
Reference in New Issue