forked from mirror/DotRecast
Compare commits
No commits in common. "97777511a7e82f679942b22745c22916cc37a376" and "f49f9eb558d341ac581831c0dd576b643f5b8e26" have entirely different histories.
97777511a7
...
f49f9eb558
|
@ -49,7 +49,7 @@ jobs:
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Set up .NET 8.0
|
- name: Set up .NET 8.0
|
||||||
uses: actions/setup-dotnet@v4
|
uses: actions/setup-dotnet@v3
|
||||||
with:
|
with:
|
||||||
dotnet-version: 8.x
|
dotnet-version: 8.x
|
||||||
|
|
||||||
|
|
|
@ -37,7 +37,7 @@ jobs:
|
||||||
fetch-depth: 0 # Get all history to allow automatic versioning using MinVer
|
fetch-depth: 0 # Get all history to allow automatic versioning using MinVer
|
||||||
|
|
||||||
- name: Setup .NET
|
- name: Setup .NET
|
||||||
uses: actions/setup-dotnet@v4
|
uses: actions/setup-dotnet@v3
|
||||||
with:
|
with:
|
||||||
dotnet-version: ${{ matrix.dotnet-version }}.x
|
dotnet-version: ${{ matrix.dotnet-version }}.x
|
||||||
|
|
||||||
|
|
|
@ -33,7 +33,7 @@ jobs:
|
||||||
fetch-depth: 0 # Get all history to allow automatic versioning using MinVer
|
fetch-depth: 0 # Get all history to allow automatic versioning using MinVer
|
||||||
|
|
||||||
- name: Setup Dotnet
|
- name: Setup Dotnet
|
||||||
uses: actions/setup-dotnet@v4
|
uses: actions/setup-dotnet@v3
|
||||||
with:
|
with:
|
||||||
dotnet-version: '8.x'
|
dotnet-version: '8.x'
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@ jobs:
|
||||||
fetch-depth: 0 # Get all history to allow automatic versioning using MinVer
|
fetch-depth: 0 # Get all history to allow automatic versioning using MinVer
|
||||||
|
|
||||||
- name: Setup Dotnet
|
- name: Setup Dotnet
|
||||||
uses: actions/setup-dotnet@v4
|
uses: actions/setup-dotnet@v3
|
||||||
with:
|
with:
|
||||||
dotnet-version: '8.x'
|
dotnet-version: '8.x'
|
||||||
|
|
||||||
|
|
|
@ -100,7 +100,7 @@ namespace DotRecast.Detour.Dynamic
|
||||||
Math.Min(DtDynamicNavMesh.MAX_VERTS_PER_POLY, config.vertsPerPoly),
|
Math.Min(DtDynamicNavMesh.MAX_VERTS_PER_POLY, config.vertsPerPoly),
|
||||||
config.detailSampleDistance, config.detailSampleMaxError,
|
config.detailSampleDistance, config.detailSampleMaxError,
|
||||||
true, true, true, default, true);
|
true, true, true, default, true);
|
||||||
RcBuilderResult r = builder.Build(context, vt.tileX, vt.tileZ, null, rcConfig, heightfield, false);
|
RcBuilderResult r = builder.Build(context, vt.tileX, vt.tileZ, null, rcConfig, heightfield);
|
||||||
if (config.keepIntermediateResults)
|
if (config.keepIntermediateResults)
|
||||||
{
|
{
|
||||||
recastResult = r;
|
recastResult = r;
|
||||||
|
|
|
@ -27,8 +27,8 @@
|
||||||
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
|
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
|
||||||
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0"/>
|
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0"/>
|
||||||
<PackageReference Include="K4os.Compression.LZ4" Version="1.3.8" />
|
<PackageReference Include="K4os.Compression.LZ4" Version="1.3.8" />
|
||||||
<PackageReference Include="Silk.NET" Version="2.21.0" />
|
<PackageReference Include="Silk.NET" Version="2.20.0" />
|
||||||
<PackageReference Include="Silk.NET.OpenGL.Extensions.ImGui" Version="2.21.0" />
|
<PackageReference Include="Silk.NET.OpenGL.Extensions.ImGui" Version="2.20.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
@ -32,18 +32,15 @@ public class GLCheckerTexture
|
||||||
_gl = gl;
|
_gl = gl;
|
||||||
}
|
}
|
||||||
|
|
||||||
public unsafe void Release()
|
public void Release()
|
||||||
{
|
{
|
||||||
if (m_texId != 0)
|
if (m_texId != 0)
|
||||||
{
|
{
|
||||||
fixed (uint* p = &m_texId)
|
_gl.DeleteTextures(1, m_texId);
|
||||||
{
|
|
||||||
_gl.DeleteTextures(1, p);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public unsafe void Bind()
|
public void Bind()
|
||||||
{
|
{
|
||||||
if (m_texId == 0)
|
if (m_texId == 0)
|
||||||
{
|
{
|
||||||
|
@ -53,11 +50,7 @@ public class GLCheckerTexture
|
||||||
uint TSIZE = 64;
|
uint TSIZE = 64;
|
||||||
int[] data = new int[TSIZE * TSIZE];
|
int[] data = new int[TSIZE * TSIZE];
|
||||||
|
|
||||||
fixed (uint* p = &m_texId)
|
_gl.GenTextures(1, out m_texId);
|
||||||
{
|
|
||||||
_gl.GenTextures(1, p);
|
|
||||||
}
|
|
||||||
|
|
||||||
_gl.BindTexture(GLEnum.Texture2D, m_texId);
|
_gl.BindTexture(GLEnum.Texture2D, m_texId);
|
||||||
|
|
||||||
int level = 0;
|
int level = 0;
|
||||||
|
@ -77,10 +70,8 @@ public class GLCheckerTexture
|
||||||
level++;
|
level++;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint linearMipmapNearest = (uint)GLEnum.LinearMipmapNearest;
|
_gl.TexParameterI(GLEnum.Texture2D, GLEnum.TextureMinFilter, (uint)GLEnum.LinearMipmapNearest);
|
||||||
uint linear = (uint)GLEnum.Linear;
|
_gl.TexParameterI(GLEnum.Texture2D, GLEnum.TextureMagFilter, (uint)GLEnum.Linear);
|
||||||
_gl.TexParameterI(GLEnum.Texture2D, GLEnum.TextureMinFilter, &linearMipmapNearest);
|
|
||||||
_gl.TexParameterI(GLEnum.Texture2D, GLEnum.TextureMagFilter, &linear);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -80,7 +80,22 @@ namespace DotRecast.Recast.Toolset.Builder
|
||||||
{
|
{
|
||||||
RcBuilderConfig bcfg = new RcBuilderConfig(cfg, geom.GetMeshBoundsMin(), geom.GetMeshBoundsMax());
|
RcBuilderConfig bcfg = new RcBuilderConfig(cfg, geom.GetMeshBoundsMin(), geom.GetMeshBoundsMax());
|
||||||
RcBuilder rcBuilder = new RcBuilder();
|
RcBuilder rcBuilder = new RcBuilder();
|
||||||
return rcBuilder.Build(geom, bcfg, keepInterResults);
|
var result = rcBuilder.Build(geom, bcfg);
|
||||||
|
if (!keepInterResults)
|
||||||
|
{
|
||||||
|
return new RcBuilderResult(
|
||||||
|
result.TileX,
|
||||||
|
result.TileZ,
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
result.Mesh,
|
||||||
|
result.MeshDetail,
|
||||||
|
result.Context
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
public DtMeshData BuildMeshData(DemoInputGeomProvider geom,
|
public DtMeshData BuildMeshData(DemoInputGeomProvider geom,
|
||||||
|
|
|
@ -132,17 +132,30 @@ namespace DotRecast.Recast
|
||||||
public RcBuilderResult BuildTile(IInputGeomProvider geom, RcConfig cfg, RcVec3f bmin, RcVec3f bmax, int tx, int ty, RcAtomicInteger progress, int total, bool keepInterResults)
|
public RcBuilderResult BuildTile(IInputGeomProvider geom, RcConfig cfg, RcVec3f bmin, RcVec3f bmax, int tx, int ty, RcAtomicInteger progress, int total, bool keepInterResults)
|
||||||
{
|
{
|
||||||
var bcfg = new RcBuilderConfig(cfg, bmin, bmax, tx, ty);
|
var bcfg = new RcBuilderConfig(cfg, bmin, bmax, tx, ty);
|
||||||
RcBuilderResult result = Build(geom, bcfg, keepInterResults);
|
RcBuilderResult result = Build(geom, bcfg);
|
||||||
if (_progressListener != null)
|
if (_progressListener != null)
|
||||||
{
|
{
|
||||||
_progressListener.OnProgress(progress.IncrementAndGet(), total);
|
_progressListener.OnProgress(progress.IncrementAndGet(), total);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!keepInterResults)
|
||||||
|
{
|
||||||
|
return new RcBuilderResult(
|
||||||
|
result.TileX,
|
||||||
|
result.TileZ,
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
null,
|
||||||
|
result.Mesh,
|
||||||
|
result.MeshDetail,
|
||||||
|
result.Context
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
public RcBuilderResult Build(IInputGeomProvider geom, RcBuilderConfig bcfg, bool keepInterResults)
|
public RcBuilderResult Build(IInputGeomProvider geom, RcBuilderConfig bcfg)
|
||||||
{
|
{
|
||||||
RcConfig cfg = bcfg.cfg;
|
RcConfig cfg = bcfg.cfg;
|
||||||
RcContext ctx = new RcContext();
|
RcContext ctx = new RcContext();
|
||||||
|
@ -150,10 +163,10 @@ namespace DotRecast.Recast
|
||||||
// Step 1. Rasterize input polygon soup.
|
// Step 1. Rasterize input polygon soup.
|
||||||
//
|
//
|
||||||
RcHeightfield solid = RcVoxelizations.BuildSolidHeightfield(ctx, geom, bcfg);
|
RcHeightfield solid = RcVoxelizations.BuildSolidHeightfield(ctx, geom, bcfg);
|
||||||
return Build(ctx, bcfg.tileX, bcfg.tileZ, geom, cfg, solid, keepInterResults);
|
return Build(ctx, bcfg.tileX, bcfg.tileZ, geom, cfg, solid);
|
||||||
}
|
}
|
||||||
|
|
||||||
public RcBuilderResult Build(RcContext ctx, int tileX, int tileZ, IInputGeomProvider geom, RcConfig cfg, RcHeightfield solid, bool keepInterResults)
|
public RcBuilderResult Build(RcContext ctx, int tileX, int tileZ, IInputGeomProvider geom, RcConfig cfg, RcHeightfield solid)
|
||||||
{
|
{
|
||||||
FilterHeightfield(ctx, solid, cfg);
|
FilterHeightfield(ctx, solid, cfg);
|
||||||
RcCompactHeightfield chf = BuildCompactHeightfield(ctx, geom, cfg, solid);
|
RcCompactHeightfield chf = BuildCompactHeightfield(ctx, geom, cfg, solid);
|
||||||
|
@ -224,17 +237,7 @@ namespace DotRecast.Recast
|
||||||
RcPolyMeshDetail dmesh = cfg.BuildMeshDetail
|
RcPolyMeshDetail dmesh = cfg.BuildMeshDetail
|
||||||
? RcMeshDetails.BuildPolyMeshDetail(ctx, pmesh, chf, cfg.DetailSampleDist, cfg.DetailSampleMaxError)
|
? RcMeshDetails.BuildPolyMeshDetail(ctx, pmesh, chf, cfg.DetailSampleDist, cfg.DetailSampleMaxError)
|
||||||
: null;
|
: null;
|
||||||
|
return new RcBuilderResult(tileX, tileZ, solid, chf, cset, pmesh, dmesh, ctx);
|
||||||
return new RcBuilderResult(
|
|
||||||
tileX,
|
|
||||||
tileZ,
|
|
||||||
keepInterResults ? solid : null,
|
|
||||||
keepInterResults ? chf : null,
|
|
||||||
keepInterResults ? cset : null,
|
|
||||||
pmesh,
|
|
||||||
dmesh,
|
|
||||||
ctx
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -72,7 +72,7 @@ public class RecastTestMeshBuilder
|
||||||
SampleAreaModifications.SAMPLE_AREAMOD_GROUND, true);
|
SampleAreaModifications.SAMPLE_AREAMOD_GROUND, true);
|
||||||
RcBuilderConfig bcfg = new RcBuilderConfig(cfg, geom.GetMeshBoundsMin(), geom.GetMeshBoundsMax());
|
RcBuilderConfig bcfg = new RcBuilderConfig(cfg, geom.GetMeshBoundsMin(), geom.GetMeshBoundsMax());
|
||||||
RcBuilder rcBuilder = new RcBuilder();
|
RcBuilder rcBuilder = new RcBuilder();
|
||||||
RcBuilderResult rcResult = rcBuilder.Build(geom, bcfg, false);
|
RcBuilderResult rcResult = rcBuilder.Build(geom, bcfg);
|
||||||
RcPolyMesh m_pmesh = rcResult.Mesh;
|
RcPolyMesh m_pmesh = rcResult.Mesh;
|
||||||
for (int i = 0; i < m_pmesh.npolys; ++i)
|
for (int i = 0; i < m_pmesh.npolys; ++i)
|
||||||
{
|
{
|
||||||
|
|
|
@ -72,7 +72,7 @@ public class RecastTestMeshBuilder
|
||||||
SampleAreaModifications.SAMPLE_AREAMOD_GROUND, true);
|
SampleAreaModifications.SAMPLE_AREAMOD_GROUND, true);
|
||||||
RcBuilderConfig bcfg = new RcBuilderConfig(cfg, geom.GetMeshBoundsMin(), geom.GetMeshBoundsMax());
|
RcBuilderConfig bcfg = new RcBuilderConfig(cfg, geom.GetMeshBoundsMin(), geom.GetMeshBoundsMax());
|
||||||
RcBuilder rcBuilder = new RcBuilder();
|
RcBuilder rcBuilder = new RcBuilder();
|
||||||
RcBuilderResult rcResult = rcBuilder.Build(geom, bcfg, false);
|
RcBuilderResult rcResult = rcBuilder.Build(geom, bcfg);
|
||||||
RcPolyMesh m_pmesh = rcResult.Mesh;
|
RcPolyMesh m_pmesh = rcResult.Mesh;
|
||||||
for (int i = 0; i < m_pmesh.npolys; ++i)
|
for (int i = 0; i < m_pmesh.npolys; ++i)
|
||||||
{
|
{
|
||||||
|
|
|
@ -27,7 +27,7 @@ public class TestDetourBuilder : DetourBuilder
|
||||||
float agentMaxClimb, int x, int y, bool applyRecastDemoFlags)
|
float agentMaxClimb, int x, int y, bool applyRecastDemoFlags)
|
||||||
{
|
{
|
||||||
RcBuilder rcBuilder = new RcBuilder();
|
RcBuilder rcBuilder = new RcBuilder();
|
||||||
RcBuilderResult rcResult = rcBuilder.Build(geom, rcConfig, false);
|
RcBuilderResult rcResult = rcBuilder.Build(geom, rcConfig);
|
||||||
RcPolyMesh pmesh = rcResult.Mesh;
|
RcPolyMesh pmesh = rcResult.Mesh;
|
||||||
|
|
||||||
if (applyRecastDemoFlags)
|
if (applyRecastDemoFlags)
|
||||||
|
|
|
@ -69,27 +69,27 @@ public class RecastTileMeshTest
|
||||||
true, true, true,
|
true, true, true,
|
||||||
SampleAreaModifications.SAMPLE_AREAMOD_GROUND, true);
|
SampleAreaModifications.SAMPLE_AREAMOD_GROUND, true);
|
||||||
RcBuilderConfig bcfg = new RcBuilderConfig(cfg, geom.GetMeshBoundsMin(), geom.GetMeshBoundsMax(), 7, 8);
|
RcBuilderConfig bcfg = new RcBuilderConfig(cfg, geom.GetMeshBoundsMin(), geom.GetMeshBoundsMax(), 7, 8);
|
||||||
RcBuilderResult rcResult = builder.Build(geom, bcfg, false);
|
RcBuilderResult rcResult = builder.Build(geom, bcfg);
|
||||||
Assert.That(rcResult.Mesh.npolys, Is.EqualTo(1));
|
Assert.That(rcResult.Mesh.npolys, Is.EqualTo(1));
|
||||||
Assert.That(rcResult.Mesh.nverts, Is.EqualTo(5));
|
Assert.That(rcResult.Mesh.nverts, Is.EqualTo(5));
|
||||||
bcfg = new RcBuilderConfig(cfg, geom.GetMeshBoundsMin(), geom.GetMeshBoundsMax(), 6, 9);
|
bcfg = new RcBuilderConfig(cfg, geom.GetMeshBoundsMin(), geom.GetMeshBoundsMax(), 6, 9);
|
||||||
rcResult = builder.Build(geom, bcfg, false);
|
rcResult = builder.Build(geom, bcfg);
|
||||||
Assert.That(rcResult.Mesh.npolys, Is.EqualTo(2));
|
Assert.That(rcResult.Mesh.npolys, Is.EqualTo(2));
|
||||||
Assert.That(rcResult.Mesh.nverts, Is.EqualTo(7));
|
Assert.That(rcResult.Mesh.nverts, Is.EqualTo(7));
|
||||||
bcfg = new RcBuilderConfig(cfg, geom.GetMeshBoundsMin(), geom.GetMeshBoundsMax(), 2, 9);
|
bcfg = new RcBuilderConfig(cfg, geom.GetMeshBoundsMin(), geom.GetMeshBoundsMax(), 2, 9);
|
||||||
rcResult = builder.Build(geom, bcfg, false);
|
rcResult = builder.Build(geom, bcfg);
|
||||||
Assert.That(rcResult.Mesh.npolys, Is.EqualTo(2));
|
Assert.That(rcResult.Mesh.npolys, Is.EqualTo(2));
|
||||||
Assert.That(rcResult.Mesh.nverts, Is.EqualTo(9));
|
Assert.That(rcResult.Mesh.nverts, Is.EqualTo(9));
|
||||||
bcfg = new RcBuilderConfig(cfg, geom.GetMeshBoundsMin(), geom.GetMeshBoundsMax(), 4, 3);
|
bcfg = new RcBuilderConfig(cfg, geom.GetMeshBoundsMin(), geom.GetMeshBoundsMax(), 4, 3);
|
||||||
rcResult = builder.Build(geom, bcfg, false);
|
rcResult = builder.Build(geom, bcfg);
|
||||||
Assert.That(rcResult.Mesh.npolys, Is.EqualTo(3));
|
Assert.That(rcResult.Mesh.npolys, Is.EqualTo(3));
|
||||||
Assert.That(rcResult.Mesh.nverts, Is.EqualTo(6));
|
Assert.That(rcResult.Mesh.nverts, Is.EqualTo(6));
|
||||||
bcfg = new RcBuilderConfig(cfg, geom.GetMeshBoundsMin(), geom.GetMeshBoundsMax(), 2, 8);
|
bcfg = new RcBuilderConfig(cfg, geom.GetMeshBoundsMin(), geom.GetMeshBoundsMax(), 2, 8);
|
||||||
rcResult = builder.Build(geom, bcfg, false);
|
rcResult = builder.Build(geom, bcfg);
|
||||||
Assert.That(rcResult.Mesh.npolys, Is.EqualTo(5));
|
Assert.That(rcResult.Mesh.npolys, Is.EqualTo(5));
|
||||||
Assert.That(rcResult.Mesh.nverts, Is.EqualTo(17));
|
Assert.That(rcResult.Mesh.nverts, Is.EqualTo(17));
|
||||||
bcfg = new RcBuilderConfig(cfg, geom.GetMeshBoundsMin(), geom.GetMeshBoundsMax(), 0, 8);
|
bcfg = new RcBuilderConfig(cfg, geom.GetMeshBoundsMin(), geom.GetMeshBoundsMax(), 0, 8);
|
||||||
rcResult = builder.Build(geom, bcfg, false);
|
rcResult = builder.Build(geom, bcfg);
|
||||||
Assert.That(rcResult.Mesh.npolys, Is.EqualTo(6));
|
Assert.That(rcResult.Mesh.npolys, Is.EqualTo(6));
|
||||||
Assert.That(rcResult.Mesh.nverts, Is.EqualTo(15));
|
Assert.That(rcResult.Mesh.nverts, Is.EqualTo(15));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue