diff --git a/RecastDemo/Bin/Recast.app/Contents/MacOS/Recast b/RecastDemo/Bin/Recast.app/Contents/MacOS/Recast index 443dd0d..dc2a45a 100755 Binary files a/RecastDemo/Bin/Recast.app/Contents/MacOS/Recast and b/RecastDemo/Bin/Recast.app/Contents/MacOS/Recast differ diff --git a/RecastDemo/Build/Xcode/Recast.xcodeproj/memon.pbxuser b/RecastDemo/Build/Xcode/Recast.xcodeproj/memon.pbxuser index 501b5bd..acbe36d 100644 --- a/RecastDemo/Build/Xcode/Recast.xcodeproj/memon.pbxuser +++ b/RecastDemo/Build/Xcode/Recast.xcodeproj/memon.pbxuser @@ -320,6 +320,29 @@ 6B904C79115220CA00A12E63 /* PBXTextBookmark */ = 6B904C79115220CA00A12E63 /* PBXTextBookmark */; 6B904C7A115220CA00A12E63 /* PBXTextBookmark */ = 6B904C7A115220CA00A12E63 /* PBXTextBookmark */; 6B904C7B115220CA00A12E63 /* PBXTextBookmark */ = 6B904C7B115220CA00A12E63 /* PBXTextBookmark */; + 6B904C7C115221F100A12E63 /* PBXTextBookmark */ = 6B904C7C115221F100A12E63 /* PBXTextBookmark */; + 6B904C7D115221F100A12E63 /* PBXTextBookmark */ = 6B904C7D115221F100A12E63 /* PBXTextBookmark */; + 6B904C7E115221F100A12E63 /* PBXTextBookmark */ = 6B904C7E115221F100A12E63 /* PBXTextBookmark */; + 6B904C7F115221F100A12E63 /* PBXTextBookmark */ = 6B904C7F115221F100A12E63 /* PBXTextBookmark */; + 6B904C80115221F100A12E63 /* PBXTextBookmark */ = 6B904C80115221F100A12E63 /* PBXTextBookmark */; + 6B904C81115221F100A12E63 /* PBXTextBookmark */ = 6B904C81115221F100A12E63 /* PBXTextBookmark */; + 6B904C82115221F100A12E63 /* PBXTextBookmark */ = 6B904C82115221F100A12E63 /* PBXTextBookmark */; + 6B904C83115221F100A12E63 /* PBXTextBookmark */ = 6B904C83115221F100A12E63 /* PBXTextBookmark */; + 6B904C84115221F100A12E63 /* PBXTextBookmark */ = 6B904C84115221F100A12E63 /* PBXTextBookmark */; + 6B904C85115221F100A12E63 /* PBXTextBookmark */ = 6B904C85115221F100A12E63 /* PBXTextBookmark */; + 6B904C86115221F100A12E63 /* PBXTextBookmark */ = 6B904C86115221F100A12E63 /* PBXTextBookmark */; + 6B904C87115221F100A12E63 /* PBXTextBookmark */ = 6B904C87115221F100A12E63 /* PBXTextBookmark */; + 6B904C88115221F100A12E63 /* PBXTextBookmark */ = 6B904C88115221F100A12E63 /* PBXTextBookmark */; + 6B904C891152224400A12E63 /* PBXTextBookmark */ = 6B904C891152224400A12E63 /* PBXTextBookmark */; + 6B904C8A1152224400A12E63 /* PBXTextBookmark */ = 6B904C8A1152224400A12E63 /* PBXTextBookmark */; + 6B904C8B1152224400A12E63 /* PBXTextBookmark */ = 6B904C8B1152224400A12E63 /* PBXTextBookmark */; + 6B904C8C1152224400A12E63 /* PBXTextBookmark */ = 6B904C8C1152224400A12E63 /* PBXTextBookmark */; + 6B904C8D1152224400A12E63 /* PBXTextBookmark */ = 6B904C8D1152224400A12E63 /* PBXTextBookmark */; + 6B904C8E1152224400A12E63 /* PBXTextBookmark */ = 6B904C8E1152224400A12E63 /* PBXTextBookmark */; + 6B904C911152225D00A12E63 /* PBXTextBookmark */ = 6B904C911152225D00A12E63 /* PBXTextBookmark */; + 6B904C921152225D00A12E63 /* PBXTextBookmark */ = 6B904C921152225D00A12E63 /* PBXTextBookmark */; + 6B904C931152225D00A12E63 /* PBXTextBookmark */ = 6B904C931152225D00A12E63 /* PBXTextBookmark */; + 6B904C941152225D00A12E63 /* PBXTextBookmark */ = 6B904C941152225D00A12E63 /* PBXTextBookmark */; 6B92D9121140F58200E82EC3 = 6B92D9121140F58200E82EC3 /* PBXTextBookmark */; 6B92D91C1140F5F800E82EC3 = 6B92D91C1140F5F800E82EC3 /* PBXTextBookmark */; 6B92D9411140F84100E82EC3 = 6B92D9411140F84100E82EC3 /* PBXTextBookmark */; @@ -575,8 +598,8 @@ 6B25B6180FFA62BE004F1BC4 /* main.cpp */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {815, 14960}}"; - sepNavSelRange = "{13436, 0}"; - sepNavVisRange = "{13053, 614}"; + sepNavSelRange = "{1490, 0}"; + sepNavVisRange = "{1354, 526}"; }; }; 6B2AEC510FFB8946005BE9CC /* Sample_TileMesh.h */ = { @@ -589,9 +612,9 @@ }; 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {815, 14320}}"; - sepNavSelRange = "{1539, 0}"; - sepNavVisRange = "{1445, 426}"; + sepNavIntBoundsRect = "{{0, 0}, {815, 14560}}"; + sepNavSelRange = "{2086, 0}"; + sepNavVisRange = "{2379, 614}"; sepNavWindowFrame = "{{38, 30}, {1214, 722}}"; }; }; @@ -868,9 +891,9 @@ }; 6B555DB0100B212E00247EA3 /* imguiRenderGL.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {815, 6992}}"; - sepNavSelRange = "{944, 0}"; - sepNavVisRange = "{202, 1250}"; + sepNavIntBoundsRect = "{{0, 0}, {815, 6656}}"; + sepNavSelRange = "{6250, 0}"; + sepNavVisRange = "{5693, 686}"; }; }; 6B555DF6100B273500247EA3 /* stb_truetype.h */ = { @@ -882,9 +905,9 @@ }; 6B624169103434880002E346 /* RecastMeshDetail.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {866, 19472}}"; - sepNavSelRange = "{11516, 0}"; - sepNavVisRange = "{11122, 592}"; + sepNavIntBoundsRect = "{{0, 0}, {815, 19632}}"; + sepNavSelRange = "{1255, 0}"; + sepNavVisRange = "{516, 935}"; sepNavWindowFrame = "{{61, 36}, {1011, 695}}"; }; }; @@ -913,7 +936,7 @@ fRef = 6BB93CF510CFEC4500F74F2B /* RecastDump.cpp */; name = "RecastDump.cpp: 156"; rLen = 0; - rLoc = 4265; + rLoc = 4269; rType = 0; vrLen = 912; vrLoc = 3405; @@ -1057,7 +1080,7 @@ fRef = 6BA1E88910C7BFC9008007F6 /* Sample_SoloMeshTiled.cpp */; name = "Sample_SoloMeshTiled.cpp: 914"; rLen = 0; - rLoc = 27553; + rLoc = 27600; rType = 0; vrLen = 975; vrLoc = 26928; @@ -1067,7 +1090,7 @@ fRef = 6BA1E88910C7BFC9008007F6 /* Sample_SoloMeshTiled.cpp */; name = "Sample_SoloMeshTiled.cpp: 914"; rLen = 0; - rLoc = 27553; + rLoc = 27600; rType = 0; vrLen = 975; vrLoc = 26928; @@ -1077,7 +1100,7 @@ fRef = 6B624169103434880002E346 /* RecastMeshDetail.cpp */; name = "RecastMeshDetail.cpp: 925"; rLen = 27; - rLoc = 22121; + rLoc = 22102; rType = 0; vrLen = 868; vrLoc = 21829; @@ -1650,7 +1673,7 @@ fRef = 6B25B6180FFA62BE004F1BC4 /* main.cpp */; name = "main.cpp: 569"; rLen = 0; - rLoc = 13436; + rLoc = 13486; rType = 0; vrLen = 614; vrLoc = 13053; @@ -1690,7 +1713,7 @@ fRef = 6B25B6180FFA62BE004F1BC4 /* main.cpp */; name = "main.cpp: 569"; rLen = 0; - rLoc = 13436; + rLoc = 13486; rType = 0; vrLen = 614; vrLoc = 13053; @@ -2227,7 +2250,7 @@ fRef = 6BA1E88910C7BFC9008007F6 /* Sample_SoloMeshTiled.cpp */; name = "Sample_SoloMeshTiled.cpp: 715"; rLen = 0; - rLoc = 20865; + rLoc = 20912; rType = 0; vrLen = 1330; vrLoc = 19818; @@ -2257,7 +2280,7 @@ fRef = 6BA1E88910C7BFC9008007F6 /* Sample_SoloMeshTiled.cpp */; name = "Sample_SoloMeshTiled.cpp: 715"; rLen = 0; - rLoc = 20865; + rLoc = 20912; rType = 0; vrLen = 1330; vrLoc = 19818; @@ -2277,7 +2300,7 @@ fRef = 6BA1E88910C7BFC9008007F6 /* Sample_SoloMeshTiled.cpp */; name = "Sample_SoloMeshTiled.cpp: 859"; rLen = 0; - rLoc = 25792; + rLoc = 25839; rType = 0; vrLen = 1167; vrLoc = 25515; @@ -2317,7 +2340,7 @@ fRef = 6BA1E88910C7BFC9008007F6 /* Sample_SoloMeshTiled.cpp */; name = "Sample_SoloMeshTiled.cpp: 859"; rLen = 0; - rLoc = 25792; + rLoc = 25839; rType = 0; vrLen = 1167; vrLoc = 25515; @@ -2752,6 +2775,236 @@ vrLen = 1054; vrLoc = 14436; }; + 6B904C7C115221F100A12E63 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B8DE88810B69E3E00DF20FB /* DetourNavMeshBuilder.cpp */; + name = "DetourNavMeshBuilder.cpp: 352"; + rLen = 0; + rLoc = 9737; + rType = 0; + vrLen = 1054; + vrLoc = 14436; + }; + 6B904C7D115221F100A12E63 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6BB93CF510CFEC4500F74F2B /* RecastDump.cpp */; + name = "RecastDump.cpp: 140"; + rLen = 0; + rLoc = 3797; + rType = 0; + vrLen = 873; + vrLoc = 3701; + }; + 6B904C7E115221F100A12E63 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B555DB0100B212E00247EA3 /* imguiRenderGL.cpp */; + name = "imguiRenderGL.cpp: 262"; + rLen = 0; + rLoc = 6232; + rType = 0; + vrLen = 746; + vrLoc = 5661; + }; + 6B904C7F115221F100A12E63 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B25B6180FFA62BE004F1BC4 /* main.cpp */; + name = "main.cpp: 84"; + rLen = 0; + rLoc = 2039; + rType = 0; + vrLen = 520; + vrLoc = 1403; + }; + 6B904C80115221F100A12E63 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B624169103434880002E346 /* RecastMeshDetail.cpp */; + name = "RecastMeshDetail.cpp: 34"; + rLen = 0; + rLoc = 1255; + rType = 0; + vrLen = 935; + vrLoc = 516; + }; + 6B904C81115221F100A12E63 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6BA1E88910C7BFC9008007F6 /* Sample_SoloMeshTiled.cpp */; + name = "Sample_SoloMeshTiled.cpp: 859"; + rLen = 0; + rLoc = 25839; + rType = 0; + vrLen = 1167; + vrLoc = 25515; + }; + 6B904C82115221F100A12E63 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B8DE88810B69E3E00DF20FB /* DetourNavMeshBuilder.cpp */; + name = "DetourNavMeshBuilder.cpp: 352"; + rLen = 0; + rLoc = 9737; + rType = 0; + vrLen = 1054; + vrLoc = 14436; + }; + 6B904C83115221F100A12E63 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6BB93CF510CFEC4500F74F2B /* RecastDump.cpp */; + name = "RecastDump.cpp: 140"; + rLen = 0; + rLoc = 3797; + rType = 0; + vrLen = 873; + vrLoc = 3701; + }; + 6B904C84115221F100A12E63 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B555DB0100B212E00247EA3 /* imguiRenderGL.cpp */; + name = "imguiRenderGL.cpp: 262"; + rLen = 0; + rLoc = 6232; + rType = 0; + vrLen = 746; + vrLoc = 5661; + }; + 6B904C85115221F100A12E63 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B624169103434880002E346 /* RecastMeshDetail.cpp */; + name = "RecastMeshDetail.cpp: 773"; + rLen = 0; + rLoc = 18493; + rType = 0; + vrLen = 676; + vrLoc = 18382; + }; + 6B904C86115221F100A12E63 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B25B6180FFA62BE004F1BC4 /* main.cpp */; + name = "main.cpp: 84"; + rLen = 0; + rLoc = 2039; + rType = 0; + vrLen = 520; + vrLoc = 1403; + }; + 6B904C87115221F100A12E63 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B624169103434880002E346 /* RecastMeshDetail.cpp */; + name = "RecastMeshDetail.cpp: 34"; + rLen = 0; + rLoc = 1255; + rType = 0; + vrLen = 935; + vrLoc = 516; + }; + 6B904C88115221F100A12E63 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6BA1E88910C7BFC9008007F6 /* Sample_SoloMeshTiled.cpp */; + name = "Sample_SoloMeshTiled.cpp: 58"; + rLen = 0; + rLoc = 1730; + rType = 0; + vrLen = 665; + vrLoc = 1213; + }; + 6B904C891152224400A12E63 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6BA1E88910C7BFC9008007F6 /* Sample_SoloMeshTiled.cpp */; + name = "Sample_SoloMeshTiled.cpp: 58"; + rLen = 47; + rLoc = 1684; + rType = 0; + vrLen = 665; + vrLoc = 1213; + }; + 6B904C8A1152224400A12E63 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */; + name = "Sample_TileMesh.cpp: 79"; + rLen = 0; + rLoc = 2086; + rType = 0; + vrLen = 614; + vrLoc = 2379; + }; + 6B904C8B1152224400A12E63 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B25B6180FFA62BE004F1BC4 /* main.cpp */; + name = "main.cpp: 84"; + rLen = 0; + rLoc = 2039; + rType = 0; + vrLen = 520; + vrLoc = 1403; + }; + 6B904C8C1152224400A12E63 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6BA1E88910C7BFC9008007F6 /* Sample_SoloMeshTiled.cpp */; + name = "Sample_SoloMeshTiled.cpp: 58"; + rLen = 47; + rLoc = 1684; + rType = 0; + vrLen = 665; + vrLoc = 1213; + }; + 6B904C8D1152224400A12E63 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */; + name = "Sample_TileMesh.cpp: 79"; + rLen = 0; + rLoc = 2086; + rType = 0; + vrLen = 614; + vrLoc = 2379; + }; + 6B904C8E1152224400A12E63 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B25B6180FFA62BE004F1BC4 /* main.cpp */; + name = "main.cpp: 52"; + rLen = 0; + rLoc = 1490; + rType = 0; + vrLen = 526; + vrLoc = 1354; + }; + 6B904C911152225D00A12E63 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B25B6180FFA62BE004F1BC4 /* main.cpp */; + name = "main.cpp: 52"; + rLen = 0; + rLoc = 1490; + rType = 0; + vrLen = 526; + vrLoc = 1354; + }; + 6B904C921152225D00A12E63 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B555DB0100B212E00247EA3 /* imguiRenderGL.cpp */; + name = "imguiRenderGL.cpp: 262"; + rLen = 0; + rLoc = 6232; + rType = 0; + vrLen = 714; + vrLoc = 5693; + }; + 6B904C931152225D00A12E63 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B25B6180FFA62BE004F1BC4 /* main.cpp */; + name = "main.cpp: 52"; + rLen = 0; + rLoc = 1490; + rType = 0; + vrLen = 526; + vrLoc = 1354; + }; + 6B904C941152225D00A12E63 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B555DB0100B212E00247EA3 /* imguiRenderGL.cpp */; + name = "imguiRenderGL.cpp: 263"; + rLen = 0; + rLoc = 6250; + rType = 0; + vrLen = 686; + vrLoc = 5693; + }; 6B92D9121140F58200E82EC3 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 6B137C830F7FCC1100459200 /* RecastContour.cpp */; @@ -2857,7 +3110,7 @@ fRef = 6B624169103434880002E346 /* RecastMeshDetail.cpp */; name = "RecastMeshDetail.cpp: 482"; rLen = 0; - rLoc = 11516; + rLoc = 11555; rType = 0; vrLen = 592; vrLoc = 11122; @@ -2867,7 +3120,7 @@ fRef = 6B25B6180FFA62BE004F1BC4 /* main.cpp */; name = "main.cpp: 147"; rLen = 0; - rLoc = 3257; + rLoc = 3307; rType = 0; vrLen = 515; vrLoc = 2955; @@ -2897,7 +3150,7 @@ fRef = 6BB93CF510CFEC4500F74F2B /* RecastDump.cpp */; name = "RecastDump.cpp: 241"; rLen = 0; - rLoc = 6344; + rLoc = 6348; rType = 0; vrLen = 548; vrLoc = 6072; @@ -2938,9 +3191,9 @@ }; 6BA1E88910C7BFC9008007F6 /* Sample_SoloMeshTiled.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1006, 18528}}"; - sepNavSelRange = "{25792, 0}"; - sepNavVisRange = "{25515, 1167}"; + sepNavIntBoundsRect = "{{0, 0}, {815, 19248}}"; + sepNavSelRange = "{1684, 47}"; + sepNavVisRange = "{1213, 665}"; }; }; 6BA1E88E10C7BFD3008007F6 /* Sample_SoloMeshSimple.h */ = { @@ -3102,8 +3355,8 @@ 6BB93CF510CFEC4500F74F2B /* RecastDump.cpp */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {815, 4016}}"; - sepNavSelRange = "{6344, 0}"; - sepNavVisRange = "{6072, 548}"; + sepNavSelRange = "{3797, 0}"; + sepNavVisRange = "{3701, 873}"; }; }; 6BBB87E510EA97CC008FEA1F /* PBXTextBookmark */ = { @@ -3205,7 +3458,7 @@ fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */; name = "Sample_TileMesh.cpp: 808"; rLen = 0; - rLoc = 22308; + rLoc = 22355; rType = 0; vrLen = 677; vrLoc = 21177; diff --git a/RecastDemo/Build/Xcode/Recast.xcodeproj/memon.perspectivev3 b/RecastDemo/Build/Xcode/Recast.xcodeproj/memon.perspectivev3 index 18a0931..db2ea1a 100644 --- a/RecastDemo/Build/Xcode/Recast.xcodeproj/memon.perspectivev3 +++ b/RecastDemo/Build/Xcode/Recast.xcodeproj/memon.perspectivev3 @@ -281,14 +281,13 @@ PBXSmartGroupTreeModuleOutlineStateSelectionKey - 16 - 12 + 57 1 0 PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 178}, {358, 643}} + {{0, 537}, {358, 643}} PBXTopSmartGroupGIDs @@ -323,7 +322,7 @@ PBXProjectModuleGUID 6B8632A30F78115100E2684A PBXProjectModuleLabel - DetourNavMeshBuilder.cpp + imguiRenderGL.cpp PBXSplitModuleInNavigatorKey Split0 @@ -331,11 +330,11 @@ PBXProjectModuleGUID 6B8632A40F78115100E2684A PBXProjectModuleLabel - DetourNavMeshBuilder.cpp + imguiRenderGL.cpp _historyCapacity 0 bookmark - 6B904C7B115220CA00A12E63 + 6B904C941152225D00A12E63 history 6B8DE70D10B01BBF00DF20FB @@ -351,7 +350,6 @@ 6BF7C67D1117163B002B3F46 6BF7C69B11172159002B3F46 6B324AE6111C07AB00EBD2FD - 6B324AEA111C0D9700EBD2FD 6B324B4F111C1AC800EBD2FD 6B324C45111C5C5A00EBD2FD 6B324CC3111C6F6300EBD2FD @@ -375,24 +373,19 @@ 6B92D96A1140FBDA00E82EC3 6B92D97A1140FE6000E82EC3 6B92D97D1140FE6000E82EC3 - 6B92D9881140FE9700E82EC3 - 6B92D9AF114100A300E82EC3 6B92D9B91141017500E82EC3 6B92D9BA1141017500E82EC3 - 6B92D9BB1141017500E82EC3 6B92D9C5114101C100E82EC3 6B904B231144E89000A12E63 6B904B601144F03800A12E63 6B904B6D1144F11000A12E63 6B904B7E1144F2C000A12E63 6B904B7F1144F2C000A12E63 - 6B904B9D1144F39D00A12E63 6B904BA61144F3FA00A12E63 6B904BAC1144F43300A12E63 6B904BB61144F49D00A12E63 6B904BBE1144F50500A12E63 6B904BD01144FCF000A12E63 - 6B904C091145340E00A12E63 6B904C40115211FB00A12E63 6B904C41115211FB00A12E63 6B904C521152132800A12E63 @@ -401,7 +394,13 @@ 6B904C641152164400A12E63 6B904C6F115218D800A12E63 6B904C78115220CA00A12E63 - 6B904C79115220CA00A12E63 + 6B904C7C115221F100A12E63 + 6B904C7D115221F100A12E63 + 6B904C80115221F100A12E63 + 6B904C891152224400A12E63 + 6B904C8A1152224400A12E63 + 6B904C911152225D00A12E63 + 6B904C921152225D00A12E63 prevStack @@ -489,6 +488,15 @@ 6B904C6C1152164400A12E63 6B904C71115218D800A12E63 6B904C7A115220CA00A12E63 + 6B904C82115221F100A12E63 + 6B904C83115221F100A12E63 + 6B904C84115221F100A12E63 + 6B904C85115221F100A12E63 + 6B904C86115221F100A12E63 + 6B904C87115221F100A12E63 + 6B904C8C1152224400A12E63 + 6B904C8D1152224400A12E63 + 6B904C931152225D00A12E63 SplitCount diff --git a/RecastDemo/Source/Sample_SoloMeshTiled.cpp b/RecastDemo/Source/Sample_SoloMeshTiled.cpp index 881d561..cdc615d 100644 --- a/RecastDemo/Source/Sample_SoloMeshTiled.cpp +++ b/RecastDemo/Source/Sample_SoloMeshTiled.cpp @@ -55,6 +55,7 @@ public: m_hitPosSet(false), m_agentRadius(0) { + m_hitPos[0] = m_hitPos[1] = m_hitPos[2] = 0; } virtual ~TileHighlightTool() diff --git a/RecastDemo/Source/Sample_TileMesh.cpp b/RecastDemo/Source/Sample_TileMesh.cpp index 5375dc1..1174c16 100644 --- a/RecastDemo/Source/Sample_TileMesh.cpp +++ b/RecastDemo/Source/Sample_TileMesh.cpp @@ -79,6 +79,7 @@ public: m_hitPosSet(false), m_agentRadius(0) { + m_hitPos[0] = m_hitPos[1] = m_hitPos[2] = 0; } virtual ~NavMeshTileTool() diff --git a/RecastDemo/Source/imguiRenderGL.cpp b/RecastDemo/Source/imguiRenderGL.cpp index 2cf4f81..b499daf 100644 --- a/RecastDemo/Source/imguiRenderGL.cpp +++ b/RecastDemo/Source/imguiRenderGL.cpp @@ -259,10 +259,8 @@ bool imguiRenderGLInit(const char* fontpath) glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - if (ttfBuffer) - free(ttfBuffer); - if (bmap) - free(bmap); + free(ttfBuffer); + free(bmap); return true; } diff --git a/RecastDemo/Source/main.cpp b/RecastDemo/Source/main.cpp index e32b4ca..09169b5 100644 --- a/RecastDemo/Source/main.cpp +++ b/RecastDemo/Source/main.cpp @@ -47,7 +47,11 @@ struct FileList { static const int MAX_FILES = 256; - inline FileList() : size(0) {} + inline FileList() : size(0) + { + memset(files, 0, sizeof(char*)*MAX_FILES); + } + inline ~FileList() { clear();