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

Issue 32: Fixed crash in Sample_TileMesh.

Browse Source
This commit is contained in:
Mikko Mononen 2010-01-06 10:40:05 +00:00
parent eb6b215d23
commit c897eaedb8
4 changed files with 68 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
RecastDemo/Bin/Recast.app/Contents/MacOS/Recast
View File

Binary file not shown.

73
RecastDemo/Build/Xcode/Recast.xcodeproj/memon.pbxuser
View File

@ -363,6 +363,10 @@
6BB7FE8510F3830D006DA0A6 /* PBXTextBookmark */ = 6BB7FE8510F3830D006DA0A6 /* PBXTextBookmark */; 6BB7FE8510F3830D006DA0A6 /* PBXTextBookmark */ = 6BB7FE8510F3830D006DA0A6 /* PBXTextBookmark */;
6BB7FE8610F3830D006DA0A6 /* PBXTextBookmark */ = 6BB7FE8610F3830D006DA0A6 /* PBXTextBookmark */; 6BB7FE8610F3830D006DA0A6 /* PBXTextBookmark */ = 6BB7FE8610F3830D006DA0A6 /* PBXTextBookmark */;
6BB7FE8710F3830D006DA0A6 /* PBXTextBookmark */ = 6BB7FE8710F3830D006DA0A6 /* PBXTextBookmark */; 6BB7FE8710F3830D006DA0A6 /* PBXTextBookmark */ = 6BB7FE8710F3830D006DA0A6 /* PBXTextBookmark */;
6BB7FE8A10F49F82006DA0A6 /* PBXTextBookmark */ = 6BB7FE8A10F49F82006DA0A6 /* PBXTextBookmark */;
6BB7FE8B10F49F82006DA0A6 /* PBXTextBookmark */ = 6BB7FE8B10F49F82006DA0A6 /* PBXTextBookmark */;
6BB7FE8C10F49F82006DA0A6 /* PBXTextBookmark */ = 6BB7FE8C10F49F82006DA0A6 /* PBXTextBookmark */;
6BB7FE8D10F49F82006DA0A6 /* PBXTextBookmark */ = 6BB7FE8D10F49F82006DA0A6 /* PBXTextBookmark */;
6BB93CE710CFEB5D00F74F2B = 6BB93CE710CFEB5D00F74F2B /* PBXTextBookmark */; 6BB93CE710CFEB5D00F74F2B = 6BB93CE710CFEB5D00F74F2B /* PBXTextBookmark */;
6BB93CEB10CFEB5D00F74F2B = 6BB93CEB10CFEB5D00F74F2B /* PBXTextBookmark */; 6BB93CEB10CFEB5D00F74F2B = 6BB93CEB10CFEB5D00F74F2B /* PBXTextBookmark */;
6BB93D0510CFFC1300F74F2B = 6BB93D0510CFFC1300F74F2B /* PBXTextBookmark */; 6BB93D0510CFFC1300F74F2B = 6BB93D0510CFFC1300F74F2B /* PBXTextBookmark */;
@ -766,9 +770,9 @@
}; };
6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */ = { 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */ = {
uiCtxt = { uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {915, 14464}}"; sepNavIntBoundsRect = "{{0, 0}, {1223, 15056}}";
sepNavSelRange = "{3515, 0}"; sepNavSelRange = "{3944, 0}";
sepNavVisRange = "{3475, 484}"; sepNavVisRange = "{3758, 462}";
}; };
}; };
6B555DAE100B211D00247EA3 /* imguiRenderGL.h */ = { 6B555DAE100B211D00247EA3 /* imguiRenderGL.h */ = {
@ -1180,8 +1184,8 @@
6BB7FD4910F3559D006DA0A6 /* ExtraLinkTool.cpp */ = { 6BB7FD4910F3559D006DA0A6 /* ExtraLinkTool.cpp */ = {
uiCtxt = { uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {915, 2944}}"; sepNavIntBoundsRect = "{{0, 0}, {915, 2944}}";
sepNavSelRange = "{2550, 0}"; sepNavSelRange = "{2483, 0}";
sepNavVisRange = "{2205, 562}"; sepNavVisRange = "{2205, 566}";
}; };
}; };
6BB7FD4B10F3564B006DA0A6 /* PBXTextBookmark */ = { 6BB7FD4B10F3564B006DA0A6 /* PBXTextBookmark */ = {
@ -1239,7 +1243,7 @@
fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */; fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */;
name = "Sample_TileMesh.cpp: 539"; name = "Sample_TileMesh.cpp: 539";
rLen = 0; rLen = 0;
rLoc = 12792; rLoc = 12827;
rType = 0; rType = 0;
vrLen = 707; vrLen = 707;
vrLoc = 5758; vrLoc = 5758;
@ -1269,7 +1273,7 @@
fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */; fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */;
name = "Sample_TileMesh.cpp: 429"; name = "Sample_TileMesh.cpp: 429";
rLen = 10; rLen = 10;
rLoc = 9975; rLoc = 10010;
rType = 0; rType = 0;
vrLen = 678; vrLen = 678;
vrLoc = 9366; vrLoc = 9366;
@ -1389,7 +1393,7 @@
fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */; fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */;
name = "Sample_TileMesh.cpp: 528"; name = "Sample_TileMesh.cpp: 528";
rLen = 0; rLen = 0;
rLoc = 12552; rLoc = 12587;
rType = 0; rType = 0;
vrLen = 800; vrLen = 800;
vrLoc = 12168; vrLoc = 12168;
@ -1399,7 +1403,7 @@
fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */; fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */;
name = "Sample_TileMesh.cpp: 528"; name = "Sample_TileMesh.cpp: 528";
rLen = 0; rLen = 0;
rLoc = 12552; rLoc = 12587;
rType = 0; rType = 0;
vrLen = 800; vrLen = 800;
vrLoc = 12168; vrLoc = 12168;
@ -1479,7 +1483,7 @@
fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */; fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */;
name = "Sample_TileMesh.cpp: 539"; name = "Sample_TileMesh.cpp: 539";
rLen = 0; rLen = 0;
rLoc = 12792; rLoc = 12827;
rType = 0; rType = 0;
vrLen = 707; vrLen = 707;
vrLoc = 5758; vrLoc = 5758;
@ -2010,7 +2014,7 @@
fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */; fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */;
name = "Sample_TileMesh.cpp: 422"; name = "Sample_TileMesh.cpp: 422";
rLen = 0; rLen = 0;
rLoc = 9969; rLoc = 10004;
rType = 0; rType = 0;
vrLen = 1212; vrLen = 1212;
vrLoc = 0; vrLoc = 0;
@ -2260,7 +2264,7 @@
fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */; fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */;
name = "Sample_TileMesh.cpp: 422"; name = "Sample_TileMesh.cpp: 422";
rLen = 0; rLen = 0;
rLoc = 9969; rLoc = 10004;
rType = 0; rType = 0;
vrLen = 1212; vrLen = 1212;
vrLoc = 0; vrLoc = 0;
@ -3404,6 +3408,43 @@
vrLen = 562; vrLen = 562;
vrLoc = 2205; vrLoc = 2205;
}; };
6BB7FE8A10F49F82006DA0A6 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 6BB7FD4910F3559D006DA0A6 /* ExtraLinkTool.cpp */;
name = "ExtraLinkTool.cpp: 104";
rLen = 0;
rLoc = 2483;
rType = 0;
vrLen = 566;
vrLoc = 2205;
};
6BB7FE8B10F49F82006DA0A6 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */;
rLen = 1;
rLoc = 182;
rType = 1;
};
6BB7FE8C10F49F82006DA0A6 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 6BB7FD4910F3559D006DA0A6 /* ExtraLinkTool.cpp */;
name = "ExtraLinkTool.cpp: 104";
rLen = 0;
rLoc = 2483;
rType = 0;
vrLen = 566;
vrLoc = 2205;
};
6BB7FE8D10F49F82006DA0A6 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */;
name = "Sample_TileMesh.cpp: 178";
rLen = 0;
rLoc = 3944;
rType = 0;
vrLen = 462;
vrLoc = 3758;
};
6BB93C7710CFE1D500F74F2B /* DebugDraw.h */ = { 6BB93C7710CFE1D500F74F2B /* DebugDraw.h */ = {
uiCtxt = { uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {915, 1168}}"; sepNavIntBoundsRect = "{{0, 0}, {915, 1168}}";
@ -4809,7 +4850,7 @@
fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */; fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */;
name = "Sample_TileMesh.cpp: 573"; name = "Sample_TileMesh.cpp: 573";
rLen = 0; rLen = 0;
rLoc = 9094; rLoc = 9129;
rType = 0; rType = 0;
vrLen = 407; vrLen = 407;
vrLoc = 14553; vrLoc = 14553;
@ -4839,7 +4880,7 @@
fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */; fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */;
name = "Sample_TileMesh.cpp: 632"; name = "Sample_TileMesh.cpp: 632";
rLen = 0; rLen = 0;
rLoc = 10366; rLoc = 10401;
rType = 0; rType = 0;
vrLen = 565; vrLen = 565;
vrLoc = 15643; vrLoc = 15643;
@ -4859,7 +4900,7 @@
fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */; fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */;
name = "Sample_TileMesh.cpp: 622"; name = "Sample_TileMesh.cpp: 622";
rLen = 0; rLen = 0;
rLoc = 10057; rLoc = 10092;
rType = 0; rType = 0;
vrLen = 723; vrLen = 723;
vrLoc = 2508; vrLoc = 2508;
@ -5109,7 +5150,7 @@
fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */; fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */;
name = "Sample_TileMesh.cpp: 377"; name = "Sample_TileMesh.cpp: 377";
rLen = 60; rLen = 60;
rLoc = 9060; rLoc = 9095;
rType = 0; rType = 0;
vrLen = 516; vrLen = 516;
vrLoc = 8290; vrLoc = 8290;

13
RecastDemo/Build/Xcode/Recast.xcodeproj/memon.perspectivev3
View File

@ -280,7 +280,7 @@
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key> <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array> <array>
<array> <array>
<integer>37</integer> <integer>46</integer>
<integer>34</integer> <integer>34</integer>
<integer>1</integer> <integer>1</integer>
<integer>0</integer> <integer>0</integer>
@ -322,7 +322,7 @@
<key>PBXProjectModuleGUID</key> <key>PBXProjectModuleGUID</key>
<string>6B8632A30F78115100E2684A</string> <string>6B8632A30F78115100E2684A</string>
<key>PBXProjectModuleLabel</key> <key>PBXProjectModuleLabel</key>
<string>ExtraLinkTool.cpp</string> <string>Sample_TileMesh.cpp</string>
<key>PBXSplitModuleInNavigatorKey</key> <key>PBXSplitModuleInNavigatorKey</key>
<dict> <dict>
<key>Split0</key> <key>Split0</key>
@ -330,11 +330,11 @@
<key>PBXProjectModuleGUID</key> <key>PBXProjectModuleGUID</key>
<string>6B8632A40F78115100E2684A</string> <string>6B8632A40F78115100E2684A</string>
<key>PBXProjectModuleLabel</key> <key>PBXProjectModuleLabel</key>
<string>ExtraLinkTool.cpp</string> <string>Sample_TileMesh.cpp</string>
<key>_historyCapacity</key> <key>_historyCapacity</key>
<integer>0</integer> <integer>0</integer>
<key>bookmark</key> <key>bookmark</key>
<string>6BB7FE8710F3830D006DA0A6</string> <string>6BB7FE8D10F49F82006DA0A6</string>
<key>history</key> <key>history</key>
<array> <array>
<string>6B57D358108C66B200DDD053</string> <string>6B57D358108C66B200DDD053</string>
@ -380,12 +380,12 @@
<string>6BB7FE3C10F3817A006DA0A6</string> <string>6BB7FE3C10F3817A006DA0A6</string>
<string>6BB7FE3E10F3817A006DA0A6</string> <string>6BB7FE3E10F3817A006DA0A6</string>
<string>6BB7FE6010F381DC006DA0A6</string> <string>6BB7FE6010F381DC006DA0A6</string>
<string>6BB7FE7410F38224006DA0A6</string>
<string>6BB7FE7510F38224006DA0A6</string> <string>6BB7FE7510F38224006DA0A6</string>
<string>6BB7FE7610F38224006DA0A6</string> <string>6BB7FE7610F38224006DA0A6</string>
<string>6BB7FE8210F3830D006DA0A6</string> <string>6BB7FE8210F3830D006DA0A6</string>
<string>6BB7FE8310F3830D006DA0A6</string> <string>6BB7FE8310F3830D006DA0A6</string>
<string>6BB7FE8410F3830D006DA0A6</string> <string>6BB7FE8A10F49F82006DA0A6</string>
<string>6BB7FE8B10F49F82006DA0A6</string>
</array> </array>
<key>prevStack</key> <key>prevStack</key>
<array> <array>
@ -485,6 +485,7 @@
<string>6BB7FE7A10F38224006DA0A6</string> <string>6BB7FE7A10F38224006DA0A6</string>
<string>6BB7FE8510F3830D006DA0A6</string> <string>6BB7FE8510F3830D006DA0A6</string>
<string>6BB7FE8610F3830D006DA0A6</string> <string>6BB7FE8610F3830D006DA0A6</string>
<string>6BB7FE8C10F49F82006DA0A6</string>
</array> </array>
</dict> </dict>
<key>SplitCount</key> <key>SplitCount</key>

6
RecastDemo/Source/Sample_TileMesh.cpp
View File

@ -176,6 +176,8 @@ Sample_TileMesh::Sample_TileMesh() :
Sample_TileMesh::~Sample_TileMesh() Sample_TileMesh::~Sample_TileMesh()
{ {
cleanup(); cleanup();
delete m_navMesh;
m_navMesh = 0;
} }
void Sample_TileMesh::cleanup() void Sample_TileMesh::cleanup()
@ -192,8 +194,6 @@ void Sample_TileMesh::cleanup()
m_pmesh = 0; m_pmesh = 0;
delete m_dmesh; delete m_dmesh;
m_dmesh = 0; m_dmesh = 0;
delete m_navMesh;
m_navMesh = 0;
} }
void Sample_TileMesh::handleSettings() void Sample_TileMesh::handleSettings()
@ -391,6 +391,8 @@ void Sample_TileMesh::handleMeshChanged(class InputGeom* geom)
Sample::handleMeshChanged(geom); Sample::handleMeshChanged(geom);
cleanup(); cleanup();
delete m_navMesh;
m_navMesh = 0;
if (m_tool) if (m_tool)
{ {