server_common/recastnavigation_v1.6.0
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crashes and odd behaviour in RecastDemo on geometry load failure

Browse Source 
Would crash if selecting a test with geometry then a test with missing geometry
Would use the previous sample type if selecting a sample that doesn't exist in the list
Two of the test cases had an incorrect sample name
This commit is contained in:
Ben Hymers 2016-02-22 22:24:48 +00:00
parent cc35cd8126
commit f44e151556
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RecastDemo/Bin/TestCases/movement_test.txt
View File

@ -1,4 +1,4 @@
s Solo Mesh Simple s Solo Mesh
f movement.obj f movement.obj
pf -100.539185 -1.000000 54.028996 62.582016 15.757828 52.842243 0x3 0x0 pf -100.539185 -1.000000 54.028996 62.582016 15.757828 52.842243 0x3 0x0
pf -100.539185 -1.000000 54.028996 -1.259964 -1.000000 50.116970 0x3 0x0 pf -100.539185 -1.000000 54.028996 -1.259964 -1.000000 50.116970 0x3 0x0

2
RecastDemo/Bin/TestCases/nav_mesh_test.txt
View File

@ -1,4 +1,4 @@
s Solo Mesh Simple s Solo Mesh
f nav_test.obj f nav_test.obj
pf 18.138550 -2.370003 -21.319118 -19.206181 -2.369133 24.802742 0x3 0x0 pf 18.138550 -2.370003 -21.319118 -19.206181 -2.369133 24.802742 0x3 0x0
pf 18.252758 -2.368240 -7.000238 -19.206181 -2.369133 24.802742 0x3 0x0 pf 18.252758 -2.368240 -7.000238 -19.206181 -2.369133 24.802742 0x3 0x0

23
RecastDemo/Source/main.cpp
View File

@ -66,7 +66,6 @@ static SampleItem g_samples[] =
{ createSolo, "Solo Mesh" }, { createSolo, "Solo Mesh" },
{ createTile, "Tile Mesh" }, { createTile, "Tile Mesh" },
{ createTempObstacle, "Temp Obstacles" }, { createTempObstacle, "Temp Obstacles" },
// { createDebug, "Debug" },
}; };
static const int g_nsamples = sizeof(g_samples) / sizeof(SampleItem); static const int g_nsamples = sizeof(g_samples) / sizeof(SampleItem);
@ -626,7 +625,7 @@ int main(int /*argc*/, char** /*argv*/)
delete sample; delete sample;
sample = newSample; sample = newSample;
sample->setContext(&ctx); sample->setContext(&ctx);
if (geom && sample) if (geom)
{ {
sample->handleMeshChanged(geom); sample->handleMeshChanged(geom);
} }
@ -695,6 +694,13 @@ int main(int /*argc*/, char** /*argv*/)
{ {
delete geom; delete geom;
geom = 0; geom = 0;
// Destroy the sample if it already had geometry loaded, as we've just deleted it!
if (sample && sample->getInputGeom())
{
delete sample;
sample = 0;
}
showLog = true; showLog = true;
logScroll = 0; logScroll = 0;
@ -778,10 +784,12 @@ int main(int /*argc*/, char** /*argv*/)
sampleName = g_samples[i].name; sampleName = g_samples[i].name;
} }
} }
if (newSample)
delete sample;
sample = newSample;
if (sample)
{ {
delete sample;
sample = newSample;
sample->setContext(&ctx); sample->setContext(&ctx);
showSample = false; showSample = false;
} }
@ -789,16 +797,17 @@ int main(int /*argc*/, char** /*argv*/)
// Load geom. // Load geom.
meshName = test->getGeomFileName(); meshName = test->getGeomFileName();
delete geom;
geom = 0;
path = meshesFolder + "/" + meshName; path = meshesFolder + "/" + meshName;
delete geom;
geom = new InputGeom; geom = new InputGeom;
if (!geom || !geom->load(&ctx, path)) if (!geom || !geom->load(&ctx, path))
{ {
delete geom; delete geom;
geom = 0; geom = 0;
delete sample;
sample = 0;
showLog = true; showLog = true;
logScroll = 0; logScroll = 0;
ctx.dumpLog("Geom load log %s:", meshName.c_str()); ctx.dumpLog("Geom load log %s:", meshName.c_str());