diff --git a/Detour/Include/DetourCommon.h b/Detour/Include/DetourCommon.h index ccae126..3cee3f6 100644 --- a/Detour/Include/DetourCommon.h +++ b/Detour/Include/DetourCommon.h @@ -182,17 +182,6 @@ inline unsigned int dtIlog2(unsigned int v) inline int dtAlign4(int x) { return (x+3) & ~3; } -inline unsigned int dtHashInt(unsigned int a) -{ - a += ~(a<<15); - a ^= (a>>10); - a += (a<<3); - a ^= (a>>6); - a += ~(a<<11); - a ^= (a>>16); - return a; -} - inline int dtOppositeTile(int side) { return (side+4) & 0x7; } inline float dtVdot2D(const float* u, const float* v) diff --git a/Detour/Include/DetourNavMesh.h b/Detour/Include/DetourNavMesh.h index 0934f22..6b96e55 100644 --- a/Detour/Include/DetourNavMesh.h +++ b/Detour/Include/DetourNavMesh.h @@ -21,6 +21,9 @@ #include "DetourAlloc.h" +// Note: If you want to use 64-bit refs, change the types of both dtPolyRef & dtTileRef. +// It is also recommended to change dtHashRef() to proper 64-bit hash too. + // Reference to navigation polygon. typedef unsigned int dtPolyRef; diff --git a/Detour/Include/DetourNode.h b/Detour/Include/DetourNode.h index 30d1e76..beb5272 100644 --- a/Detour/Include/DetourNode.h +++ b/Detour/Include/DetourNode.h @@ -19,6 +19,8 @@ #ifndef DETOURNODE_H #define DETOURNODE_H +#include "DetourNavMesh.h" + enum dtNodeFlags { DT_NODE_OPEN = 0x01, @@ -29,12 +31,12 @@ static const unsigned short DT_NULL_IDX = 0xffff; struct dtNode { - float pos[3]; - float cost; - float total; - unsigned int id; - unsigned int pidx : 30; - unsigned int flags : 2; + float pos[3]; // Position of the node. + float cost; // Cost from previous node to current node. + float total; // Cost up to the node. + unsigned int pidx : 30; // Index to parent node. + unsigned int flags : 2; // Node flags 0/open/closed. + dtPolyRef id; // Polygon ref the node corresponds to. }; class dtNodePool @@ -44,8 +46,8 @@ public: ~dtNodePool(); inline void operator=(const dtNodePool&) {} void clear(); - dtNode* getNode(unsigned int id); - const dtNode* findNode(unsigned int id) const; + dtNode* getNode(dtPolyRef id); + const dtNode* findNode(dtPolyRef id) const; inline unsigned int getNodeIdx(const dtNode* node) const { diff --git a/Detour/Source/DetourNavMesh.cpp b/Detour/Source/DetourNavMesh.cpp index f685071..8b332b2 100644 --- a/Detour/Source/DetourNavMesh.cpp +++ b/Detour/Source/DetourNavMesh.cpp @@ -276,7 +276,7 @@ int dtNavMesh::findConnectingPolys(const float* va, const float* vb, { conarea[n*2+0] = dtMax(amin[0], bmin[0]); conarea[n*2+1] = dtMin(amax[0], bmax[0]); - con[n] = base | (unsigned int)i; + con[n] = base | (dtPolyRef)i; n++; } break; @@ -431,7 +431,7 @@ void dtNavMesh::connectExtOffMeshLinks(dtMeshTile* tile, dtMeshTile* target, int const unsigned short landPolyIdx = (unsigned short)decodePolyIdPoly(ref); dtPoly* landPoly = &tile->polys[landPolyIdx]; dtLink* link = &tile->links[idx]; - link->ref = getPolyRefBase(target) | (unsigned int)(targetCon->poly); + link->ref = getPolyRefBase(target) | (dtPolyRef)(targetCon->poly); link->edge = 0xff; link->side = (unsigned char)side; link->bmin = link->bmax = 0; @@ -469,7 +469,7 @@ void dtNavMesh::connectIntLinks(dtMeshTile* tile) if (idx != DT_NULL_LINK) { dtLink* link = &tile->links[idx]; - link->ref = base | (unsigned int)(poly->neis[j]-1); + link->ref = base | (dtPolyRef)(poly->neis[j]-1); link->edge = (unsigned char)j; link->side = 0xff; link->bmin = link->bmax = 0; @@ -538,7 +538,7 @@ void dtNavMesh::connectIntOffMeshLinks(dtMeshTile* tile) const unsigned short landPolyIdx = (unsigned short)decodePolyIdPoly(ref); dtPoly* landPoly = &tile->polys[landPolyIdx]; dtLink* link = &tile->links[idx]; - link->ref = base | (unsigned int)(con->poly); + link->ref = base | (dtPolyRef)(con->poly); link->edge = 0xff; link->side = 0xff; link->bmin = link->bmax = 0; diff --git a/Detour/Source/DetourNode.cpp b/Detour/Source/DetourNode.cpp index 3cd1c50..176bdca 100644 --- a/Detour/Source/DetourNode.cpp +++ b/Detour/Source/DetourNode.cpp @@ -22,6 +22,17 @@ #include "DetourCommon.h" #include +inline unsigned int dtHashRef(dtPolyRef a) +{ + a += ~(a<<15); + a ^= (a>>10); + a += (a<<3); + a ^= (a>>6); + a += ~(a<<11); + a ^= (a>>16); + return (unsigned int)a; +} + ////////////////////////////////////////////////////////////////////////////////////////// dtNodePool::dtNodePool(int maxNodes, int hashSize) : m_nodes(0), @@ -59,9 +70,9 @@ void dtNodePool::clear() m_nodeCount = 0; } -const dtNode* dtNodePool::findNode(unsigned int id) const +const dtNode* dtNodePool::findNode(dtPolyRef id) const { - unsigned int bucket = dtHashInt(id) & (m_hashSize-1); + unsigned int bucket = dtHashRef(id) & (m_hashSize-1); unsigned short i = m_first[bucket]; while (i != DT_NULL_IDX) { @@ -72,9 +83,9 @@ const dtNode* dtNodePool::findNode(unsigned int id) const return 0; } -dtNode* dtNodePool::getNode(unsigned int id) +dtNode* dtNodePool::getNode(dtPolyRef id) { - unsigned int bucket = dtHashInt(id) & (m_hashSize-1); + unsigned int bucket = dtHashRef(id) & (m_hashSize-1); unsigned short i = m_first[bucket]; dtNode* node = 0; while (i != DT_NULL_IDX) diff --git a/RecastDemo/Bin/Recast.app/Contents/MacOS/Recast b/RecastDemo/Bin/Recast.app/Contents/MacOS/Recast index f1f90f0..46e3c14 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 f0de2aa..8354ebb 100644 --- a/RecastDemo/Build/Xcode/Recast.xcodeproj/memon.pbxuser +++ b/RecastDemo/Build/Xcode/Recast.xcodeproj/memon.pbxuser @@ -127,101 +127,118 @@ PBXFindDataSource_LocationID, ); }; - PBXPerProjectTemplateStateSaveDate = 308397458; - PBXWorkspaceStateSaveDate = 308397458; + PBXPerProjectTemplateStateSaveDate = 308817923; + PBXWorkspaceStateSaveDate = 308817923; }; perUserProjectItems = { - 6B1C8E08121EB4FF0048697F /* PBXTextBookmark */ = 6B1C8E08121EB4FF0048697F /* PBXTextBookmark */; - 6B4214D911803923006C347B /* PBXTextBookmark */ = 6B4214D911803923006C347B /* PBXTextBookmark */; - 6B847515122B9F4900ADF63D /* PBXTextBookmark */ = 6B847515122B9F4900ADF63D /* PBXTextBookmark */; - 6B8476F9122D000800ADF63D /* PBXTextBookmark */ = 6B8476F9122D000800ADF63D /* PBXTextBookmark */; - 6B847779122D223D00ADF63D /* PBXTextBookmark */ = 6B847779122D223D00ADF63D /* PBXTextBookmark */; - 6B84778B122D279700ADF63D /* PBXTextBookmark */ = 6B84778B122D279700ADF63D /* PBXTextBookmark */; - 6B8477BB122D297200ADF63D /* PBXTextBookmark */ = 6B8477BB122D297200ADF63D /* PBXTextBookmark */; - 6B8477E1122D2B9100ADF63D /* PBXTextBookmark */ = 6B8477E1122D2B9100ADF63D /* PBXTextBookmark */; - 6B8477EE122D2CC900ADF63D /* PBXTextBookmark */ = 6B8477EE122D2CC900ADF63D /* PBXTextBookmark */; - 6B8477FC122D2E2A00ADF63D /* PBXTextBookmark */ = 6B8477FC122D2E2A00ADF63D /* PBXTextBookmark */; - 6B8477FE122D2E2A00ADF63D /* PBXTextBookmark */ = 6B8477FE122D2E2A00ADF63D /* PBXTextBookmark */; - 6B8477FF122D2E2A00ADF63D /* PBXTextBookmark */ = 6B8477FF122D2E2A00ADF63D /* PBXTextBookmark */; - 6B920A521225C0AC00D5B5AD /* PBXTextBookmark */ = 6B920A521225C0AC00D5B5AD /* PBXTextBookmark */; - 6B920A6D1225C5DD00D5B5AD /* PBXTextBookmark */ = 6B920A6D1225C5DD00D5B5AD /* PBXTextBookmark */; - 6B98462E11E6141900FA177B /* PBXTextBookmark */ = 6B98462E11E6141900FA177B /* PBXTextBookmark */; - 6B98473011E737D800FA177B /* PBXTextBookmark */ = 6B98473011E737D800FA177B /* PBXTextBookmark */; - 6BA6876E1222F02E00730711 /* PBXTextBookmark */ = 6BA6876E1222F02E00730711 /* PBXTextBookmark */; - 6BA687881222F4DB00730711 /* PBXTextBookmark */ = 6BA687881222F4DB00730711 /* PBXTextBookmark */; - 6BA687CA1222FA9300730711 /* PBXTextBookmark */ = 6BA687CA1222FA9300730711 /* PBXTextBookmark */; - 6BA7F8EC1227002300C8C47A /* PBXTextBookmark */ = 6BA7F8EC1227002300C8C47A /* PBXTextBookmark */; - 6BA7F8ED1227002300C8C47A /* PBXTextBookmark */ = 6BA7F8ED1227002300C8C47A /* PBXTextBookmark */; - 6BA7F8EE1227002300C8C47A /* PBXTextBookmark */ = 6BA7F8EE1227002300C8C47A /* PBXTextBookmark */; - 6BA8CEC01255BCE600272A3B /* PBXTextBookmark */ = 6BA8CEC01255BCE600272A3B /* PBXTextBookmark */; - 6BA8CECB1255C1A400272A3B /* PBXTextBookmark */ = 6BA8CECB1255C1A400272A3B /* PBXTextBookmark */; - 6BA8CECD1255C1A400272A3B /* PBXTextBookmark */ = 6BA8CECD1255C1A400272A3B /* PBXTextBookmark */; - 6BA8CEEF1255C4B700272A3B /* PBXTextBookmark */ = 6BA8CEEF1255C4B700272A3B /* PBXTextBookmark */; - 6BA8CF4A1255D44700272A3B /* PBXTextBookmark */ = 6BA8CF4A1255D44700272A3B /* PBXTextBookmark */; - 6BA8CF4D1255D44700272A3B /* PBXTextBookmark */ = 6BA8CF4D1255D44700272A3B /* PBXTextBookmark */; - 6BA8CF511255D44700272A3B /* PBXTextBookmark */ = 6BA8CF511255D44700272A3B /* PBXTextBookmark */; - 6BA8CF5B1255D49B00272A3B /* PBXTextBookmark */ = 6BA8CF5B1255D49B00272A3B /* PBXTextBookmark */; - 6BA8CF951255D97400272A3B /* PBXTextBookmark */ = 6BA8CF951255D97400272A3B /* PBXTextBookmark */; - 6BA8CFA81255DC6500272A3B /* PBXTextBookmark */ = 6BA8CFA81255DC6500272A3B /* PBXTextBookmark */; - 6BA8CFBE1255DE0500272A3B /* PBXTextBookmark */ = 6BA8CFBE1255DE0500272A3B /* PBXTextBookmark */; - 6BA8D10B125B0E8E00272A3B /* PBXTextBookmark */ = 6BA8D10B125B0E8E00272A3B /* PBXTextBookmark */; - 6BA8D10C125B0E8E00272A3B /* PBXTextBookmark */ = 6BA8D10C125B0E8E00272A3B /* PBXTextBookmark */; - 6BA8D10D125B0E8E00272A3B /* PBXTextBookmark */ = 6BA8D10D125B0E8E00272A3B /* PBXTextBookmark */; - 6BAF4321121AF998008CFCDF /* PBXTextBookmark */ = 6BAF4321121AF998008CFCDF /* PBXTextBookmark */; - 6BAF4421121C25E3008CFCDF /* PBXTextBookmark */ = 6BAF4421121C25E3008CFCDF /* PBXTextBookmark */; - 6BAF4525121D1723008CFCDF /* PBXTextBookmark */ = 6BAF4525121D1723008CFCDF /* PBXTextBookmark */; - 6BAF46D3121D8FF1008CFCDF /* PBXTextBookmark */ = 6BAF46D3121D8FF1008CFCDF /* PBXTextBookmark */; - 6BB2EDF91261C75400E350F8 /* PBXTextBookmark */ = 6BB2EDF91261C75400E350F8 /* PBXTextBookmark */; - 6BB2EE241261C92300E350F8 /* PBXTextBookmark */ = 6BB2EE241261C92300E350F8 /* PBXTextBookmark */; - 6BB2EE251261C92300E350F8 /* PBXTextBookmark */ = 6BB2EE251261C92300E350F8 /* PBXTextBookmark */; - 6BB2EE261261C92300E350F8 /* PBXTextBookmark */ = 6BB2EE261261C92300E350F8 /* PBXTextBookmark */; - 6BB2EE271261C92300E350F8 /* PBXTextBookmark */ = 6BB2EE271261C92300E350F8 /* PBXTextBookmark */; - 6BB2EE281261C92300E350F8 /* PBXTextBookmark */ = 6BB2EE281261C92300E350F8 /* PBXTextBookmark */; - 6BB2EE351261CEB800E350F8 /* PBXTextBookmark */ = 6BB2EE351261CEB800E350F8 /* PBXTextBookmark */; - 6BB2EE361261CEB800E350F8 /* PBXTextBookmark */ = 6BB2EE361261CEB800E350F8 /* PBXTextBookmark */; - 6BB2EE3F1261D02000E350F8 /* PBXTextBookmark */ = 6BB2EE3F1261D02000E350F8 /* PBXTextBookmark */; - 6BB2EE641261D48100E350F8 /* PBXTextBookmark */ = 6BB2EE641261D48100E350F8 /* PBXTextBookmark */; - 6BB2EE651261D48100E350F8 /* PBXTextBookmark */ = 6BB2EE651261D48100E350F8 /* PBXTextBookmark */; - 6BB2EE661261D48100E350F8 /* PBXTextBookmark */ = 6BB2EE661261D48100E350F8 /* PBXTextBookmark */; - 6BB2EE671261D48100E350F8 /* PBXTextBookmark */ = 6BB2EE671261D48100E350F8 /* PBXTextBookmark */; - 6BB2EE681261D48100E350F8 /* PBXTextBookmark */ = 6BB2EE681261D48100E350F8 /* PBXTextBookmark */; - 6BB2EE691261D48100E350F8 /* PBXTextBookmark */ = 6BB2EE691261D48100E350F8 /* PBXTextBookmark */; - 6BB2EE711261DA0400E350F8 /* PBXTextBookmark */ = 6BB2EE711261DA0400E350F8 /* PBXTextBookmark */; - 6BB2EE721261DA0400E350F8 /* PBXTextBookmark */ = 6BB2EE721261DA0400E350F8 /* PBXTextBookmark */; - 6BB2EE731261DA0400E350F8 /* PBXTextBookmark */ = 6BB2EE731261DA0400E350F8 /* PBXTextBookmark */; - 6BB2EE7A1264CD7900E350F8 /* PBXTextBookmark */ = 6BB2EE7A1264CD7900E350F8 /* PBXTextBookmark */; - 6BB2EE7B1264CD7900E350F8 /* PBXTextBookmark */ = 6BB2EE7B1264CD7900E350F8 /* PBXTextBookmark */; - 6BB2EE7C1264CD7900E350F8 /* PBXTextBookmark */ = 6BB2EE7C1264CD7900E350F8 /* PBXTextBookmark */; - 6BB2EE7D1264CD7900E350F8 /* PBXTextBookmark */ = 6BB2EE7D1264CD7900E350F8 /* PBXTextBookmark */; - 6BBB0361124E242E00533229 /* PBXTextBookmark */ = 6BBB0361124E242E00533229 /* PBXTextBookmark */; - 6BBB0363124E242E00533229 /* PBXTextBookmark */ = 6BBB0363124E242E00533229 /* PBXTextBookmark */; - 6BBB0366124E242E00533229 /* PBXTextBookmark */ = 6BBB0366124E242E00533229 /* PBXTextBookmark */; - 6BBB4AA5115B4F3400CF791D /* PBXTextBookmark */ = 6BBB4AA5115B4F3400CF791D /* PBXTextBookmark */; - 6BBB4C34115B7A3D00CF791D /* PBXTextBookmark */ = 6BBB4C34115B7A3D00CF791D /* PBXTextBookmark */; - 6BD402111224336600995864 /* PBXTextBookmark */ = 6BD402111224336600995864 /* PBXTextBookmark */; - 6BD402121224336600995864 /* PBXTextBookmark */ = 6BD402121224336600995864 /* PBXTextBookmark */; - 6BD402611224387200995864 /* PBXTextBookmark */ = 6BD402611224387200995864 /* PBXTextBookmark */; - 6BD402621224387200995864 /* PBXTextBookmark */ = 6BD402621224387200995864 /* PBXTextBookmark */; - 6BD402811224393000995864 /* PBXTextBookmark */ = 6BD402811224393000995864 /* PBXTextBookmark */; - 6BD4028C1224399300995864 /* PBXTextBookmark */ = 6BD4028C1224399300995864 /* PBXTextBookmark */; - 6BD4029B12243A8000995864 /* PBXTextBookmark */ = 6BD4029B12243A8000995864 /* PBXTextBookmark */; - 6BD402B4122441CB00995864 /* PBXTextBookmark */ = 6BD402B4122441CB00995864 /* PBXTextBookmark */; - 6BD667FF123D2D230021A7A4 /* PBXTextBookmark */ = 6BD667FF123D2D230021A7A4 /* PBXTextBookmark */; - 6BD6681812434B790021A7A4 /* PBXTextBookmark */ = 6BD6681812434B790021A7A4 /* PBXTextBookmark */; - 6BD66855124350F80021A7A4 /* PBXTextBookmark */ = 6BD66855124350F80021A7A4 /* PBXTextBookmark */; - 6BD668A3124361EB0021A7A4 /* PBXTextBookmark */ = 6BD668A3124361EB0021A7A4 /* PBXTextBookmark */; - 6BD6691112436CEC0021A7A4 /* PBXTextBookmark */ = 6BD6691112436CEC0021A7A4 /* PBXTextBookmark */; - 6BD66930124374D60021A7A4 /* PBXTextBookmark */ = 6BD66930124374D60021A7A4 /* PBXTextBookmark */; - 6BD66937124376780021A7A4 /* PBXTextBookmark */ = 6BD66937124376780021A7A4 /* PBXTextBookmark */; - 6BD66938124376780021A7A4 /* PBXTextBookmark */ = 6BD66938124376780021A7A4 /* PBXTextBookmark */; - 6BD669501243778E0021A7A4 /* PBXTextBookmark */ = 6BD669501243778E0021A7A4 /* PBXTextBookmark */; - 6BD669511243778E0021A7A4 /* PBXTextBookmark */ = 6BD669511243778E0021A7A4 /* PBXTextBookmark */; - 6BD6695C124377D40021A7A4 /* PBXTextBookmark */ = 6BD6695C124377D40021A7A4 /* PBXTextBookmark */; - 6BF5F27311747CFA000502A6 /* PBXTextBookmark */ = 6BF5F27311747CFA000502A6 /* PBXTextBookmark */; - 6BF5F2E411748884000502A6 /* PBXTextBookmark */ = 6BF5F2E411748884000502A6 /* PBXTextBookmark */; - 6BF5F2E511748884000502A6 /* PBXTextBookmark */ = 6BF5F2E511748884000502A6 /* PBXTextBookmark */; - 6BF5F2E611748884000502A6 /* PBXTextBookmark */ = 6BF5F2E611748884000502A6 /* PBXTextBookmark */; - 6BF5F2E711748884000502A6 /* PBXTextBookmark */ = 6BF5F2E711748884000502A6 /* PBXTextBookmark */; + 6B1632F2126830210083FC15 /* PBXTextBookmark */ = 6B1632F2126830210083FC15 /* PBXTextBookmark */; + 6B1632F3126830210083FC15 /* PBXTextBookmark */ = 6B1632F3126830210083FC15 /* PBXTextBookmark */; + 6B1632F4126830210083FC15 /* PBXTextBookmark */ = 6B1632F4126830210083FC15 /* PBXTextBookmark */; + 6B163303126830280083FC15 /* PBXTextBookmark */ = 6B163303126830280083FC15 /* PBXTextBookmark */; + 6B163305126830290083FC15 /* PBXTextBookmark */ = 6B163305126830290083FC15 /* PBXTextBookmark */; + 6B1633061268302C0083FC15 /* PBXTextBookmark */ = 6B1633061268302C0083FC15 /* PBXTextBookmark */; + 6B16330F1268326F0083FC15 /* PBXTextBookmark */ = 6B16330F1268326F0083FC15 /* PBXTextBookmark */; + 6B1633101268326F0083FC15 /* PBXTextBookmark */ = 6B1633101268326F0083FC15 /* PBXTextBookmark */; + 6B1633111268326F0083FC15 /* PBXTextBookmark */ = 6B1633111268326F0083FC15 /* PBXTextBookmark */; + 6B1633121268326F0083FC15 /* PBXTextBookmark */ = 6B1633121268326F0083FC15 /* PBXTextBookmark */; + 6B1633131268326F0083FC15 /* PBXTextBookmark */ = 6B1633131268326F0083FC15 /* PBXTextBookmark */; + 6B1633141268326F0083FC15 /* PBXTextBookmark */ = 6B1633141268326F0083FC15 /* PBXTextBookmark */; + 6B1633151268326F0083FC15 /* PBXTextBookmark */ = 6B1633151268326F0083FC15 /* PBXTextBookmark */; + 6B1633161268326F0083FC15 /* PBXTextBookmark */ = 6B1633161268326F0083FC15 /* PBXTextBookmark */; + 6B163317126832D20083FC15 /* PBXTextBookmark */ = 6B163317126832D20083FC15 /* PBXTextBookmark */; + 6B163318126832D20083FC15 /* PBXTextBookmark */ = 6B163318126832D20083FC15 /* PBXTextBookmark */; + 6B163319126832D20083FC15 /* PBXTextBookmark */ = 6B163319126832D20083FC15 /* PBXTextBookmark */; + 6B1C8E08121EB4FF0048697F = 6B1C8E08121EB4FF0048697F /* PBXTextBookmark */; + 6B4214D911803923006C347B = 6B4214D911803923006C347B /* PBXTextBookmark */; + 6B847515122B9F4900ADF63D = 6B847515122B9F4900ADF63D /* PBXTextBookmark */; + 6B8476F9122D000800ADF63D = 6B8476F9122D000800ADF63D /* PBXTextBookmark */; + 6B847779122D223D00ADF63D = 6B847779122D223D00ADF63D /* PBXTextBookmark */; + 6B84778B122D279700ADF63D = 6B84778B122D279700ADF63D /* PBXTextBookmark */; + 6B8477BB122D297200ADF63D = 6B8477BB122D297200ADF63D /* PBXTextBookmark */; + 6B8477E1122D2B9100ADF63D = 6B8477E1122D2B9100ADF63D /* PBXTextBookmark */; + 6B8477EE122D2CC900ADF63D = 6B8477EE122D2CC900ADF63D /* PBXTextBookmark */; + 6B8477FC122D2E2A00ADF63D = 6B8477FC122D2E2A00ADF63D /* PBXTextBookmark */; + 6B8477FE122D2E2A00ADF63D = 6B8477FE122D2E2A00ADF63D /* PBXTextBookmark */; + 6B8477FF122D2E2A00ADF63D = 6B8477FF122D2E2A00ADF63D /* PBXTextBookmark */; + 6B920A521225C0AC00D5B5AD = 6B920A521225C0AC00D5B5AD /* PBXTextBookmark */; + 6B920A6D1225C5DD00D5B5AD = 6B920A6D1225C5DD00D5B5AD /* PBXTextBookmark */; + 6B98462E11E6141900FA177B = 6B98462E11E6141900FA177B /* PBXTextBookmark */; + 6B98473011E737D800FA177B = 6B98473011E737D800FA177B /* PBXTextBookmark */; + 6BA6876E1222F02E00730711 = 6BA6876E1222F02E00730711 /* PBXTextBookmark */; + 6BA687881222F4DB00730711 = 6BA687881222F4DB00730711 /* PBXTextBookmark */; + 6BA687CA1222FA9300730711 = 6BA687CA1222FA9300730711 /* PBXTextBookmark */; + 6BA7F8EC1227002300C8C47A = 6BA7F8EC1227002300C8C47A /* PBXTextBookmark */; + 6BA7F8ED1227002300C8C47A = 6BA7F8ED1227002300C8C47A /* PBXTextBookmark */; + 6BA7F8EE1227002300C8C47A = 6BA7F8EE1227002300C8C47A /* PBXTextBookmark */; + 6BA8CEC01255BCE600272A3B = 6BA8CEC01255BCE600272A3B /* PBXTextBookmark */; + 6BA8CECB1255C1A400272A3B = 6BA8CECB1255C1A400272A3B /* PBXTextBookmark */; + 6BA8CECD1255C1A400272A3B = 6BA8CECD1255C1A400272A3B /* PBXTextBookmark */; + 6BA8CEEF1255C4B700272A3B = 6BA8CEEF1255C4B700272A3B /* PBXTextBookmark */; + 6BA8CF4A1255D44700272A3B = 6BA8CF4A1255D44700272A3B /* PBXTextBookmark */; + 6BA8CF4D1255D44700272A3B = 6BA8CF4D1255D44700272A3B /* PBXTextBookmark */; + 6BA8CF511255D44700272A3B = 6BA8CF511255D44700272A3B /* PBXTextBookmark */; + 6BA8CF5B1255D49B00272A3B = 6BA8CF5B1255D49B00272A3B /* PBXTextBookmark */; + 6BA8CF951255D97400272A3B = 6BA8CF951255D97400272A3B /* PBXTextBookmark */; + 6BA8CFA81255DC6500272A3B = 6BA8CFA81255DC6500272A3B /* PBXTextBookmark */; + 6BA8CFBE1255DE0500272A3B = 6BA8CFBE1255DE0500272A3B /* PBXTextBookmark */; + 6BA8D10B125B0E8E00272A3B = 6BA8D10B125B0E8E00272A3B /* PBXTextBookmark */; + 6BA8D10C125B0E8E00272A3B = 6BA8D10C125B0E8E00272A3B /* PBXTextBookmark */; + 6BA8D10D125B0E8E00272A3B = 6BA8D10D125B0E8E00272A3B /* PBXTextBookmark */; + 6BAF4321121AF998008CFCDF = 6BAF4321121AF998008CFCDF /* PBXTextBookmark */; + 6BAF4421121C25E3008CFCDF = 6BAF4421121C25E3008CFCDF /* PBXTextBookmark */; + 6BAF4525121D1723008CFCDF = 6BAF4525121D1723008CFCDF /* PBXTextBookmark */; + 6BAF46D3121D8FF1008CFCDF = 6BAF46D3121D8FF1008CFCDF /* PBXTextBookmark */; + 6BB2EDF91261C75400E350F8 = 6BB2EDF91261C75400E350F8 /* PBXTextBookmark */; + 6BB2EE241261C92300E350F8 = 6BB2EE241261C92300E350F8 /* PBXTextBookmark */; + 6BB2EE251261C92300E350F8 = 6BB2EE251261C92300E350F8 /* PBXTextBookmark */; + 6BB2EE261261C92300E350F8 = 6BB2EE261261C92300E350F8 /* PBXTextBookmark */; + 6BB2EE271261C92300E350F8 = 6BB2EE271261C92300E350F8 /* PBXTextBookmark */; + 6BB2EE281261C92300E350F8 = 6BB2EE281261C92300E350F8 /* PBXTextBookmark */; + 6BB2EE351261CEB800E350F8 = 6BB2EE351261CEB800E350F8 /* PBXTextBookmark */; + 6BB2EE361261CEB800E350F8 = 6BB2EE361261CEB800E350F8 /* PBXTextBookmark */; + 6BB2EE3F1261D02000E350F8 = 6BB2EE3F1261D02000E350F8 /* PBXTextBookmark */; + 6BB2EE641261D48100E350F8 = 6BB2EE641261D48100E350F8 /* PBXTextBookmark */; + 6BB2EE651261D48100E350F8 = 6BB2EE651261D48100E350F8 /* PBXTextBookmark */; + 6BB2EE661261D48100E350F8 = 6BB2EE661261D48100E350F8 /* PBXTextBookmark */; + 6BB2EE671261D48100E350F8 = 6BB2EE671261D48100E350F8 /* PBXTextBookmark */; + 6BB2EE681261D48100E350F8 = 6BB2EE681261D48100E350F8 /* PBXTextBookmark */; + 6BB2EE691261D48100E350F8 = 6BB2EE691261D48100E350F8 /* PBXTextBookmark */; + 6BB2EE711261DA0400E350F8 = 6BB2EE711261DA0400E350F8 /* PBXTextBookmark */; + 6BB2EE721261DA0400E350F8 = 6BB2EE721261DA0400E350F8 /* PBXTextBookmark */; + 6BB2EE731261DA0400E350F8 = 6BB2EE731261DA0400E350F8 /* PBXTextBookmark */; + 6BB2EE7A1264CD7900E350F8 = 6BB2EE7A1264CD7900E350F8 /* PBXTextBookmark */; + 6BB2EE7B1264CD7900E350F8 = 6BB2EE7B1264CD7900E350F8 /* PBXTextBookmark */; + 6BB2EE7C1264CD7900E350F8 = 6BB2EE7C1264CD7900E350F8 /* PBXTextBookmark */; + 6BB2EE7D1264CD7900E350F8 = 6BB2EE7D1264CD7900E350F8 /* PBXTextBookmark */; + 6BBB0361124E242E00533229 = 6BBB0361124E242E00533229 /* PBXTextBookmark */; + 6BBB0363124E242E00533229 = 6BBB0363124E242E00533229 /* PBXTextBookmark */; + 6BBB0366124E242E00533229 = 6BBB0366124E242E00533229 /* PBXTextBookmark */; + 6BBB4AA5115B4F3400CF791D = 6BBB4AA5115B4F3400CF791D /* PBXTextBookmark */; + 6BBB4C34115B7A3D00CF791D = 6BBB4C34115B7A3D00CF791D /* PBXTextBookmark */; + 6BD402111224336600995864 = 6BD402111224336600995864 /* PBXTextBookmark */; + 6BD402121224336600995864 = 6BD402121224336600995864 /* PBXTextBookmark */; + 6BD402611224387200995864 = 6BD402611224387200995864 /* PBXTextBookmark */; + 6BD402621224387200995864 = 6BD402621224387200995864 /* PBXTextBookmark */; + 6BD402811224393000995864 = 6BD402811224393000995864 /* PBXTextBookmark */; + 6BD4028C1224399300995864 = 6BD4028C1224399300995864 /* PBXTextBookmark */; + 6BD4029B12243A8000995864 = 6BD4029B12243A8000995864 /* PBXTextBookmark */; + 6BD402B4122441CB00995864 = 6BD402B4122441CB00995864 /* PBXTextBookmark */; + 6BD667FF123D2D230021A7A4 = 6BD667FF123D2D230021A7A4 /* PBXTextBookmark */; + 6BD6681812434B790021A7A4 = 6BD6681812434B790021A7A4 /* PBXTextBookmark */; + 6BD66855124350F80021A7A4 = 6BD66855124350F80021A7A4 /* PBXTextBookmark */; + 6BD668A3124361EB0021A7A4 = 6BD668A3124361EB0021A7A4 /* PBXTextBookmark */; + 6BD6691112436CEC0021A7A4 = 6BD6691112436CEC0021A7A4 /* PBXTextBookmark */; + 6BD66930124374D60021A7A4 = 6BD66930124374D60021A7A4 /* PBXTextBookmark */; + 6BD66937124376780021A7A4 = 6BD66937124376780021A7A4 /* PBXTextBookmark */; + 6BD66938124376780021A7A4 = 6BD66938124376780021A7A4 /* PBXTextBookmark */; + 6BD669501243778E0021A7A4 = 6BD669501243778E0021A7A4 /* PBXTextBookmark */; + 6BD669511243778E0021A7A4 = 6BD669511243778E0021A7A4 /* PBXTextBookmark */; + 6BD6695C124377D40021A7A4 = 6BD6695C124377D40021A7A4 /* PBXTextBookmark */; + 6BF5F27311747CFA000502A6 = 6BF5F27311747CFA000502A6 /* PBXTextBookmark */; + 6BF5F2E411748884000502A6 = 6BF5F2E411748884000502A6 /* PBXTextBookmark */; + 6BF5F2E511748884000502A6 = 6BF5F2E511748884000502A6 /* PBXTextBookmark */; + 6BF5F2E611748884000502A6 = 6BF5F2E611748884000502A6 /* PBXTextBookmark */; + 6BF5F2E711748884000502A6 = 6BF5F2E711748884000502A6 /* PBXTextBookmark */; }; sourceControlManager = 6B8632A90F78115100E2684A /* Source Control */; userBookmarkGroup = 6B8DE6F010A88F0500DF20FB /* PBXBookmarkGroup */; @@ -256,23 +273,23 @@ }; 6B1185F41006895B0018F96F /* DetourNode.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {933, 2464}}"; - sepNavSelRange = "{1486, 0}"; - sepNavVisRange = "{3135, 582}"; + sepNavIntBoundsRect = "{{0, 0}, {931, 1885}}"; + sepNavSelRange = "{1066, 9}"; + sepNavVisRange = "{249, 1208}"; }; }; 6B1185F61006896B0018F96F /* DetourNode.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {933, 1963}}"; - sepNavSelRange = "{2499, 0}"; - sepNavVisRange = "{1793, 801}"; + sepNavIntBoundsRect = "{{0, 0}, {931, 1807}}"; + sepNavSelRange = "{1470, 0}"; + sepNavVisRange = "{1012, 886}"; }; }; 6B1185FC10068B040018F96F /* DetourCommon.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {931, 3094}}"; - sepNavSelRange = "{706, 0}"; - sepNavVisRange = "{0, 1802}"; + sepNavIntBoundsRect = "{{0, 0}, {931, 3588}}"; + sepNavSelRange = "{4673, 0}"; + sepNavVisRange = "{4324, 765}"; }; }; 6B1185FD10068B150018F96F /* DetourCommon.cpp */ = { @@ -377,6 +394,176 @@ sepNavVisRange = "{21330, 766}"; }; }; + 6B1632F2126830210083FC15 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */; + name = "Sample_TileMesh.cpp: 315"; + rLen = 0; + rLoc = 7100; + rType = 0; + vrLen = 830; + vrLoc = 6402; + }; + 6B1632F3126830210083FC15 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B25B6180FFA62BE004F1BC4 /* main.cpp */; + name = "main.cpp: 897"; + rLen = 0; + rLoc = 20913; + rType = 0; + vrLen = 894; + vrLoc = 20326; + }; + 6B1632F4126830210083FC15 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B25B6180FFA62BE004F1BC4 /* main.cpp */; + name = "main.cpp: 66"; + rLen = 0; + rLoc = 1985; + rType = 0; + vrLen = 1002; + vrLoc = 1449; + }; + 6B163303126830280083FC15 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B25B6180FFA62BE004F1BC4 /* main.cpp */; + name = "main.cpp: 66"; + rLen = 0; + rLoc = 1985; + rType = 0; + vrLen = 1052; + vrLoc = 1452; + }; + 6B163305126830290083FC15 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B25B6180FFA62BE004F1BC4 /* main.cpp */; + name = "main.cpp: 66"; + rLen = 0; + rLoc = 1985; + rType = 0; + vrLen = 1085; + vrLoc = 1452; + }; + 6B1633061268302C0083FC15 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B25B6180FFA62BE004F1BC4 /* main.cpp */; + name = "main.cpp: 66"; + rLen = 0; + rLoc = 1985; + rType = 0; + vrLen = 444; + vrLoc = 1728; + }; + 6B16330F1268326F0083FC15 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B25B6180FFA62BE004F1BC4 /* main.cpp */; + name = "main.cpp: 65"; + rLen = 0; + rLoc = 1985; + rType = 0; + vrLen = 1059; + vrLoc = 1452; + }; + 6B1633101268326F0083FC15 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B8DE88710B69E3E00DF20FB /* DetourNavMesh.cpp */; + name = "DetourNavMesh.cpp: 668"; + rLen = 0; + rLoc = 18415; + rType = 0; + vrLen = 1034; + vrLoc = 17469; + }; + 6B1633111268326F0083FC15 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6BAF40DA12196A3D008CFCDF /* DetourNavMeshQuery.cpp */; + name = "DetourNavMeshQuery.cpp: 214"; + rLen = 0; + rLoc = 6120; + rType = 0; + vrLen = 690; + vrLoc = 18991; + }; + 6B1633121268326F0083FC15 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B1185FC10068B040018F96F /* DetourCommon.h */; + name = "DetourCommon.h: 185"; + rLen = 0; + rLoc = 4673; + rType = 0; + vrLen = 765; + vrLoc = 4324; + }; + 6B1633131268326F0083FC15 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B1185F41006895B0018F96F /* DetourNode.cpp */; + name = "DetourNode.cpp: 28"; + rLen = 0; + rLoc = 1122; + rType = 0; + vrLen = 949; + vrLoc = 446; + }; + 6B1633141268326F0083FC15 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B1185F61006896B0018F96F /* DetourNode.h */; + name = "DetourNode.h: 44"; + rLen = 0; + rLoc = 1470; + rType = 0; + vrLen = 886; + vrLoc = 1012; + }; + 6B1633151268326F0083FC15 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B8DE88B10B69E4C00DF20FB /* DetourNavMesh.h */; + name = "DetourNavMesh.h: 25"; + rLen = 0; + rLoc = 1231; + rType = 0; + vrLen = 1111; + vrLoc = 789; + }; + 6B1633161268326F0083FC15 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B8DE88B10B69E4C00DF20FB /* DetourNavMesh.h */; + name = "DetourNavMesh.h: 25"; + rLen = 0; + rLoc = 1220; + rType = 0; + vrLen = 1065; + vrLoc = 789; + }; + 6B163317126832D20083FC15 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B1185F41006895B0018F96F /* DetourNode.cpp */; + name = "DetourNode.cpp: 25"; + rLen = 9; + rLoc = 1066; + rType = 0; + vrLen = 1208; + vrLoc = 249; + }; + 6B163318126832D20083FC15 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B8DE88B10B69E4C00DF20FB /* DetourNavMesh.h */; + name = "DetourNavMesh.h: 25"; + rLen = 0; + rLoc = 1117; + rType = 0; + vrLen = 1159; + vrLoc = 672; + }; + 6B163319126832D20083FC15 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B8DE88B10B69E4C00DF20FB /* DetourNavMesh.h */; + name = "DetourNavMesh.h: 25"; + rLen = 0; + rLoc = 1161; + rType = 0; + vrLen = 1217; + vrLoc = 672; + }; 6B1C8E08121EB4FF0048697F /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 6B2AEC510FFB8946005BE9CC /* Sample_TileMesh.h */; @@ -403,9 +590,9 @@ }; 6B25B6180FFA62BE004F1BC4 /* main.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1217, 12025}}"; + sepNavIntBoundsRect = "{{0, 0}, {1217, 11739}}"; sepNavSelRange = "{1985, 0}"; - sepNavVisRange = "{1794, 437}"; + sepNavVisRange = "{1265, 437}"; sepNavWindowFrame = "{{15, 51}, {1214, 722}}"; }; }; @@ -419,9 +606,9 @@ }; 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {931, 15834}}"; + sepNavIntBoundsRect = "{{0, 0}, {931, 16068}}"; sepNavSelRange = "{7100, 0}"; - sepNavVisRange = "{6452, 779}"; + sepNavVisRange = "{6402, 830}"; sepNavWindowFrame = "{{38, 30}, {1214, 722}}"; }; }; @@ -515,7 +702,7 @@ fRef = 6B1185F41006895B0018F96F /* DetourNode.cpp */; name = "DetourNode.cpp: 38"; rLen = 0; - rLoc = 1486; + rLoc = 1653; rType = 0; vrLen = 582; vrLoc = 3135; @@ -679,9 +866,9 @@ }; 6B8DE88710B69E3E00DF20FB /* DetourNavMesh.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {933, 16107}}"; - sepNavSelRange = "{23637, 0}"; - sepNavVisRange = "{23535, 781}"; + sepNavIntBoundsRect = "{{0, 0}, {931, 15743}}"; + sepNavSelRange = "{18415, 0}"; + sepNavVisRange = "{17469, 1034}"; sepNavWindowFrame = "{{15, 51}, {1214, 722}}"; }; }; @@ -694,9 +881,9 @@ }; 6B8DE88B10B69E4C00DF20FB /* DetourNavMesh.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {933, 5122}}"; - sepNavSelRange = "{11508, 16}"; - sepNavVisRange = "{10743, 1252}"; + sepNavIntBoundsRect = "{{0, 0}, {931, 5135}}"; + sepNavSelRange = "{1161, 0}"; + sepNavVisRange = "{672, 1217}"; }; }; 6B8DE88C10B69E4C00DF20FB /* DetourNavMeshBuilder.h */ = { @@ -711,7 +898,7 @@ fRef = 6B8DE88B10B69E4C00DF20FB /* DetourNavMesh.h */; name = detail; rLen = 0; - rLoc = 12602; + rLoc = 12767; rType = 0; vrLen = 1182; vrLoc = 9676; @@ -952,7 +1139,7 @@ fRef = 6B8DE88710B69E3E00DF20FB /* DetourNavMesh.cpp */; name = "DetourNavMesh.cpp: 873"; rLen = 0; - rLoc = 23637; + rLoc = 23625; rType = 0; vrLen = 781; vrLoc = 23535; @@ -1143,9 +1330,9 @@ }; 6BAF40DA12196A3D008CFCDF /* DetourNavMeshQuery.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {931, 31863}}"; - sepNavSelRange = "{60149, 0}"; - sepNavVisRange = "{59549, 901}"; + sepNavIntBoundsRect = "{{0, 0}, {931, 31642}}"; + sepNavSelRange = "{6120, 0}"; + sepNavVisRange = "{18991, 690}"; }; }; 6BAF427A121ADCC2008CFCDF /* DetourAssert.h */ = { @@ -1235,6 +1422,7 @@ }; 6BB2EDFA1261C75400E350F8 /* math.h */ = { isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; name = math.h; path = /Developer/SDKs/MacOSX10.5.sdk/usr/include/architecture/i386/math.h; sourceTree = ""; @@ -1589,7 +1777,7 @@ fRef = 6B8DE88B10B69E4C00DF20FB /* DetourNavMesh.h */; name = "DetourNavMesh.h: 289"; rLen = 16; - rLoc = 11508; + rLoc = 11673; rType = 0; vrLen = 1252; vrLoc = 10743; @@ -1850,7 +2038,7 @@ fRef = 6B1185F61006896B0018F96F /* DetourNode.h */; name = "DetourNode.h: 100"; rLen = 0; - rLoc = 2499; + rLoc = 2720; rType = 0; vrLen = 801; vrLoc = 1793; diff --git a/RecastDemo/Build/Xcode/Recast.xcodeproj/memon.perspectivev3 b/RecastDemo/Build/Xcode/Recast.xcodeproj/memon.perspectivev3 index b38bb3d..d52d236 100644 --- a/RecastDemo/Build/Xcode/Recast.xcodeproj/memon.perspectivev3 +++ b/RecastDemo/Build/Xcode/Recast.xcodeproj/memon.perspectivev3 @@ -284,14 +284,14 @@ PBXSmartGroupTreeModuleOutlineStateSelectionKey - 48 - 40 + 15 + 11 1 0 PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 568}, {264, 660}} + {{0, 0}, {264, 660}} PBXTopSmartGroupGIDs @@ -326,7 +326,7 @@ PBXProjectModuleGUID 6B8632A30F78115100E2684A PBXProjectModuleLabel - Sample_TileMesh.cpp + DetourNavMesh.h PBXSplitModuleInNavigatorKey Split0 @@ -334,11 +334,11 @@ PBXProjectModuleGUID 6B8632A40F78115100E2684A PBXProjectModuleLabel - Sample_TileMesh.cpp + DetourNavMesh.h _historyCapacity 0 bookmark - 6BB2EE7D1264CD7900E350F8 + 6B163319126832D20083FC15 history 6BBB4AA5115B4F3400CF791D @@ -372,7 +372,6 @@ 6BA7F8EC1227002300C8C47A 6BA7F8ED1227002300C8C47A 6BA7F8EE1227002300C8C47A - 6B847515122B9F4900ADF63D 6B8476F9122D000800ADF63D 6B847779122D223D00ADF63D 6B84778B122D279700ADF63D @@ -386,7 +385,6 @@ 6BD6681812434B790021A7A4 6BD66855124350F80021A7A4 6BD668A3124361EB0021A7A4 - 6BD6691112436CEC0021A7A4 6BD66930124374D60021A7A4 6BD66937124376780021A7A4 6BD66938124376780021A7A4 @@ -395,8 +393,6 @@ 6BD6695C124377D40021A7A4 6BBB0361124E242E00533229 6BBB0363124E242E00533229 - 6BBB0366124E242E00533229 - 6BA8CEC01255BCE600272A3B 6BA8CECB1255C1A400272A3B 6BA8CECD1255C1A400272A3B 6BA8CEEF1255C4B700272A3B @@ -415,7 +411,6 @@ 6BB2EE251261C92300E350F8 6BB2EE261261C92300E350F8 6BB2EE271261C92300E350F8 - 6BB2EE281261C92300E350F8 6BB2EE351261CEB800E350F8 6BB2EE361261CEB800E350F8 6BB2EE3F1261D02000E350F8 @@ -425,12 +420,17 @@ 6BB2EE671261D48100E350F8 6BB2EE681261D48100E350F8 6BB2EE691261D48100E350F8 - 6BB2EE711261DA0400E350F8 - 6BB2EE721261DA0400E350F8 6BB2EE731261DA0400E350F8 6BB2EE7A1264CD7900E350F8 6BB2EE7B1264CD7900E350F8 - 6BB2EE7C1264CD7900E350F8 + 6B1632F2126830210083FC15 + 6B16330F1268326F0083FC15 + 6B1633101268326F0083FC15 + 6B1633111268326F0083FC15 + 6B1633121268326F0083FC15 + 6B1633141268326F0083FC15 + 6B163317126832D20083FC15 + 6B163318126832D20083FC15 SplitCount @@ -444,18 +444,18 @@ GeometryConfiguration Frame - {{0, 0}, {992, 558}} + {{0, 0}, {992, 533}} RubberWindowFrame 0 59 1278 719 0 0 1280 778 Module PBXNavigatorGroup Proportion - 558pt + 533pt Proportion - 115pt + 140pt Tabs @@ -469,7 +469,7 @@ GeometryConfiguration Frame - {{10, 27}, {992, 107}} + {{10, 27}, {992, 92}} Module XCDetailModule @@ -485,7 +485,9 @@ GeometryConfiguration Frame - {{10, 27}, {992, 175}} + {{10, 27}, {992, 113}} + RubberWindowFrame + 0 59 1278 719 0 0 1280 778 Module PBXProjectFindModule @@ -524,8 +526,6 @@ Frame {{10, 27}, {992, 88}} - RubberWindowFrame - 0 59 1278 719 0 0 1280 778 Module PBXBuildResultsModule @@ -553,11 +553,11 @@ TableOfContents - 6BB2EDED1261C59300E350F8 + 6B1632F5126830210083FC15 1CA23ED40692098700951B8B - 6BB2EDEE1261C59300E350F8 + 6B1632F6126830210083FC15 6B8632A30F78115100E2684A - 6BB2EDEF1261C59300E350F8 + 6B1632F7126830210083FC15 1CA23EDF0692099D00951B8B 1CA23EE00692099D00951B8B 1CA23EE10692099D00951B8B @@ -705,14 +705,14 @@ TableOfContents - 6BB2EDFF1261C75A00E350F8 + 6B1632F8126830210083FC15 1CCC7628064C1048000F2A68 1CCC7629064C1048000F2A68 - 6BB2EE001261C75A00E350F8 - 6BB2EE011261C75A00E350F8 - 6BB2EE021261C75A00E350F8 - 6BB2EE031261C75A00E350F8 - 6B8632A30F78115100E2684A + 6B1632F9126830210083FC15 + 6B1632FA126830210083FC15 + 6B1632FB126830210083FC15 + 6B1632FC126830210083FC15 + 6B1632FD126830210083FC15 ToolbarConfigUserDefaultsMinorVersion 2 @@ -744,8 +744,8 @@ 5 WindowOrderList - 6BB2EE041261C75A00E350F8 - 6BB2EE051261C75A00E350F8 + 6B1632FF126830210083FC15 + 6B163300126830210083FC15 /Users/memon/Code/recastnavigation/RecastDemo/Build/Xcode/Recast.xcodeproj WindowString