diff --git a/DebugUtils/Source/RecastDump.cpp b/DebugUtils/Source/RecastDump.cpp index 6d20dd4..5dc6ca4 100644 --- a/DebugUtils/Source/RecastDump.cpp +++ b/DebugUtils/Source/RecastDump.cpp @@ -412,7 +412,7 @@ void duLogBuildTimes(rcContext& ctx, const int totalTimeUsec) ctx.log(RC_LOG_PROGRESS, "Build Times"); logLine(ctx, RC_TIMER_RASTERIZE_TRIANGLES, "- Rasterize", pc); - logLine(ctx, RC_TIMER_BUILD_COMPACTHEIGHFIELD, "- Build Compact", pc); + logLine(ctx, RC_TIMER_BUILD_COMPACTHEIGHTFIELD, "- Build Compact", pc); logLine(ctx, RC_TIMER_FILTER_BORDER, "- Filter Border", pc); logLine(ctx, RC_TIMER_FILTER_WALKABLE, "- Filter Walkable", pc); logLine(ctx, RC_TIMER_ERODE_AREA, "- Erode Area", pc); diff --git a/Detour/Source/DetourNavMeshQuery.cpp b/Detour/Source/DetourNavMeshQuery.cpp index 61600cf..55f4d00 100644 --- a/Detour/Source/DetourNavMeshQuery.cpp +++ b/Detour/Source/DetourNavMeshQuery.cpp @@ -41,7 +41,7 @@ bool dtQueryFilter::passFilter(const dtPolyRef /*ref*/, const dtMeshTile* /*tile*/, const dtPoly* poly) const { - return (poly->flags & includeFlags) != 0 && (poly->flags & excludeFlags) == 0; + return (poly->flags & m_includeFlags) != 0 && (poly->flags & m_excludeFlags) == 0; } float dtQueryFilter::getCost(const float* pa, const float* pb, @@ -49,7 +49,7 @@ float dtQueryFilter::getCost(const float* pa, const float* pb, const dtPolyRef /*curRef*/, const dtMeshTile* /*curTile*/, const dtPoly* curPoly, const dtPolyRef /*nextRef*/, const dtMeshTile* /*nextTile*/, const dtPoly* /*nextPoly*/) const { - return dtVdist(pa, pb) * areaCost[curPoly->area]; + return dtVdist(pa, pb) * m_areaCost[curPoly->area]; } #else inline bool dtQueryFilter::passFilter(const dtPolyRef /*ref*/, @@ -1088,7 +1088,7 @@ int dtNavMeshQuery::findStraightPath(const float* startPos, const float* endPos, unsigned char flags = 0; if (!leftPolyRef) flags = DT_STRAIGHTPATH_END; - else if (rightPolyType == DT_POLYTYPE_OFFMESH_CONNECTION) + else if (leftPolyType == DT_POLYTYPE_OFFMESH_CONNECTION) flags = DT_STRAIGHTPATH_OFFMESH_CONNECTION; dtPolyRef ref = leftPolyRef; diff --git a/Recast/Include/Recast.h b/Recast/Include/Recast.h index 4399c25..59ffe2f 100644 --- a/Recast/Include/Recast.h +++ b/Recast/Include/Recast.h @@ -31,7 +31,7 @@ enum rcTimerLabel RC_TIMER_TOTAL, RC_TIMER_TEMP, RC_TIMER_RASTERIZE_TRIANGLES, - RC_TIMER_BUILD_COMPACTHEIGHFIELD, + RC_TIMER_BUILD_COMPACTHEIGHTFIELD, RC_TIMER_BUILD_CONTOURS, RC_TIMER_BUILD_CONTOURS_TRACE, RC_TIMER_BUILD_CONTOURS_SIMPLIFY, @@ -101,12 +101,12 @@ protected: // (vx) voxels, (wu) world units struct rcConfig { - int width, height; // Dimensions of the rasterized heighfield (vx) + int width, height; // Dimensions of the rasterized heightfield (vx) int tileSize; // Width and Height of a tile (vx) int borderSize; // Non-navigable Border around the heightfield (vx) float cs, ch; // Grid cell size and height (wu) float bmin[3], bmax[3]; // Grid bounds (wu) - float walkableSlopeAngle; // Maximum walkble slope angle in degrees. + float walkableSlopeAngle; // Maximum walkable slope angle in degrees. int walkableHeight; // Minimum height where the agent can still walk (vx) int walkableClimb; // Maximum height between grid cells the agent can climb (vx) int walkableRadius; // Radius of the agent in cells (vx) @@ -175,7 +175,7 @@ struct rcCompactSpan // Compact static heightfield. struct rcCompactHeightfield { - int width, height; // Width and height of the heighfield. + int width, height; // Width and height of the heightfield. int spanCount; // Number of spans in the heightfield. int walkableHeight, walkableClimb; // Agent properties. unsigned short maxDistance; // Maximum distance value stored in heightfield. @@ -218,7 +218,7 @@ void rcFreeContourSet(rcContourSet* cset); // The polygons are store in an array where each polygons takes // 'nvp*2' elements. The first 'nvp' elements are indices to vertices // and the second 'nvp' elements are indices to neighbour polygons. -// If a polygona has less than 'bvp' vertices, the remaining indices +// If a polygon has less than 'bvp' vertices, the remaining indices // are set to RC_MESH_NULL_IDX. If an polygon edge does not have a neighbour // the neighbour index is set to RC_MESH_NULL_IDX. // Vertices can be transformed into world space as follows: @@ -246,7 +246,7 @@ void rcFreePolyMesh(rcPolyMesh* pmesh); // Detail mesh generated from a rcPolyMesh. // Each submesh represents a polygon in the polymesh and they are stored in -// excatly same order. Each submesh is described as 4 values: +// exactly same order. Each submesh is described as 4 values: // base vertex, vertex count, base triangle, triangle count. That is, // const unsigned char* t = &dtl.tris[(tbase+i)*3]; and // const float* v = &dtl.verts[(vbase+t[j])*3]; @@ -280,8 +280,8 @@ static const int RC_AREA_BORDER = 0x20000; enum rcBuildContoursFlags { - RC_CONTOUR_TESS_WALL_EDGES = 0x01, // Tesselate wall edges - RC_CONTOUR_TESS_AREA_EDGES = 0x02, // Tesselate edges between areas. + RC_CONTOUR_TESS_WALL_EDGES = 0x01, // Tessellate wall edges + RC_CONTOUR_TESS_AREA_EDGES = 0x02, // Tessellate edges between areas. }; // Mask used with contours to extract region id. @@ -448,9 +448,9 @@ bool rcCreateHeightfield(rcContext* ctx, rcHeightfield& hf, int width, int heigh float cs, float ch); // Sets the RC_WALKABLE_AREA for every triangle whose slope is below -// the maximun walkable slope angle. +// the maximum walkable slope angle. // Params: -// walkableSlopeAngle - (in) maximun slope angle in degrees. +// walkableSlopeAngle - (in) maximum slope angle in degrees. // verts - (in) array of vertices // nv - (in) vertex count // tris - (in) array of triangle vertex indices @@ -460,9 +460,9 @@ void rcMarkWalkableTriangles(rcContext* ctx, const float walkableSlopeAngle, con const int* tris, int nt, unsigned char* areas); // Sets the RC_NULL_AREA for every triangle whose slope is steeper than -// the maximun walkable slope angle. +// the maximum walkable slope angle. // Params: -// walkableSlopeAngle - (in) maximun slope angle in degrees. +// walkableSlopeAngle - (in) maximum slope angle in degrees. // verts - (in) array of vertices // nv - (in) vertex count // tris - (in) array of triangle vertex indices @@ -471,13 +471,13 @@ void rcMarkWalkableTriangles(rcContext* ctx, const float walkableSlopeAngle, con void rcClearUnwalkableTriangles(rcContext* ctx, const float walkableSlopeAngle, const float* verts, int nv, const int* tris, int nt, unsigned char* areas); -// Adds span to heighfield. +// Adds span to heightfield. // The span addition can set to favor flags. If the span is merged to // another span and the new smax is within 'flagMergeThr' units away // from the existing span the span flags are merged and stored. // Params: -// solid - (in) heighfield where the spans is added to -// x,y - (in) location on the heighfield where the span is added +// solid - (in) heightfield where the spans is added to +// x,y - (in) location on the heightfield where the span is added // smin,smax - (in) spans min/max height // flags - (in) span flags (zero or WALKABLE) // flagMergeThr - (in) merge threshold. @@ -489,7 +489,7 @@ void rcAddSpan(rcContext* ctx, rcHeightfield& solid, const int x, const int y, // Params: // v0,v1,v2 - (in) the vertices of the triangle. // area - (in) area type of the triangle. -// solid - (in) heighfield where the triangle is rasterized +// solid - (in) heightfield where the triangle is rasterized // flagMergeThr - (in) distance in voxel where walkable flag is favored over non-walkable. void rcRasterizeTriangle(rcContext* ctx, const float* v0, const float* v1, const float* v2, const unsigned char area, rcHeightfield& solid, @@ -502,7 +502,7 @@ void rcRasterizeTriangle(rcContext* ctx, const float* v0, const float* v1, const // tris - (in) array of triangle vertex indices // area - (in) array of triangle area types. // nt - (in) triangle count -// solid - (in) heighfield where the triangles are rasterized +// solid - (in) heightfield where the triangles are rasterized // flagMergeThr - (in) distance in voxel where walkable flag is favored over non-walkable. void rcRasterizeTriangles(rcContext* ctx, const float* verts, const int nv, const int* tris, const unsigned char* areas, const int nt, @@ -515,7 +515,7 @@ void rcRasterizeTriangles(rcContext* ctx, const float* verts, const int nv, // tris - (in) array of triangle vertex indices // area - (in) array of triangle area types. // nt - (in) triangle count -// solid - (in) heighfield where the triangles are rasterized +// solid - (in) heightfield where the triangles are rasterized // flagMergeThr - (in) distance in voxel where walkable flag is favored over non-walkable. void rcRasterizeTriangles(rcContext* ctx, const float* verts, const int nv, const unsigned short* tris, const unsigned char* areas, const int nt, @@ -526,7 +526,7 @@ void rcRasterizeTriangles(rcContext* ctx, const float* verts, const int nv, // verts - (in) array of vertices // area - (in) array of triangle area types. // nt - (in) triangle count -// solid - (in) heighfield where the triangles are rasterized +// solid - (in) heightfield where the triangles are rasterized void rcRasterizeTriangles(rcContext* ctx, const float* verts, const unsigned char* areas, const int nt, rcHeightfield& solid, const int flagMergeThr = 1); @@ -549,7 +549,7 @@ void rcFilterLowHangingWalkableObstacles(rcContext* ctx, const int walkableClimb void rcFilterLedgeSpans(rcContext* ctx, const int walkableHeight, const int walkableClimb, rcHeightfield& solid); // Removes WALKABLE flag from all spans which have smaller than -// 'walkableHeight' clearane above them. +// 'walkableHeight' clearance above them. // Params: // walkableHeight - (in) minimum height where the agent can still walk // solid - (in/out) heightfield describing the solid space @@ -585,7 +585,7 @@ bool rcErodeWalkableArea(rcContext* ctx, int radius, rcCompactHeightfield& chf); // Returns false if operation ran out of memory. bool rcMedianFilterWalkableArea(rcContext* ctx, rcCompactHeightfield& chf); -// Marks the area of the convex polygon into the area type of the compact heighfield. +// Marks the area of the convex polygon into the area type of the compact heightfield. // Params: // bmin/bmax - (in) bounds of the axis aligned box. // areaId - (in) area ID to mark. @@ -593,7 +593,7 @@ bool rcMedianFilterWalkableArea(rcContext* ctx, rcCompactHeightfield& chf); void rcMarkBoxArea(rcContext* ctx, const float* bmin, const float* bmax, unsigned char areaId, rcCompactHeightfield& chf); -// Marks the area of the convex polygon into the area type of the compact heighfield. +// Marks the area of the convex polygon into the area type of the compact heightfield. // Params: // verts - (in) vertices of the convex polygon. // nverts - (in) number of vertices in the polygon. @@ -613,7 +613,6 @@ bool rcBuildDistanceField(rcContext* ctx, rcCompactHeightfield& chf); // Divides the walkable heighfied into simple regions using watershed partitioning. // Each region has only one contour and no overlaps. // The regions are stored in the compact heightfield 'reg' field. -// The regions will be shrinked by the radius of the agent. // The process sometimes creates small regions. The parameter // 'minRegionSize' specifies the smallest allowed regions size. // If the area of a regions is smaller than allowed, the regions is @@ -629,7 +628,6 @@ bool rcBuildRegions(rcContext* ctx, rcCompactHeightfield& chf, // Divides the walkable heighfied into simple regions using simple monotone partitioning. // Each region has only one contour and no overlaps. // The regions are stored in the compact heightfield 'reg' field. -// The regions will be shrinked by the radius of the agent. // The process sometimes creates small regions. The parameter // 'minRegionSize' specifies the smallest allowed regions size. // If the area of a regions is smaller than allowed, the regions is @@ -645,7 +643,7 @@ bool rcBuildRegionsMonotone(rcContext* ctx, rcCompactHeightfield& chf, // Builds simplified contours from the regions outlines. // Params: // chf - (in) compact heightfield which has regions set. -// maxError - (in) maximum allowed distance between simplified countour and cells. +// maxError - (in) maximum allowed distance between simplified contour and cells. // maxEdgeLen - (in) maximum allowed contour edge length in cells. // cset - (out) Resulting contour set. // flags - (in) build flags, see rcBuildContoursFlags. @@ -667,7 +665,7 @@ bool rcMergePolyMeshes(rcContext* ctx, rcPolyMesh** meshes, const int nmeshes, r // Builds detail triangle mesh for each polygon in the poly mesh. // Params: // mesh - (in) poly mesh to detail. -// chf - (in) compacy height field, used to query height for new vertices. +// chf - (in) compact height field, used to query height for new vertices. // sampleDist - (in) spacing between height samples used to generate more detail into mesh. // sampleMaxError - (in) maximum allowed distance between simplified detail mesh and height sample. // pmdtl - (out) detail mesh. diff --git a/Recast/Source/Recast.cpp b/Recast/Source/Recast.cpp index 0da5b44..369e1ee 100644 --- a/Recast/Source/Recast.cpp +++ b/Recast/Source/Recast.cpp @@ -263,7 +263,7 @@ bool rcBuildCompactHeightfield(rcContext* ctx, const int walkableHeight, const i { rcAssert(ctx); - ctx->startTimer(RC_TIMER_BUILD_COMPACTHEIGHFIELD); + ctx->startTimer(RC_TIMER_BUILD_COMPACTHEIGHTFIELD); const int w = hf.width; const int h = hf.height; @@ -387,11 +387,11 @@ bool rcBuildCompactHeightfield(rcContext* ctx, const int walkableHeight, const i if (tooHighNeighbour > MAX_LAYERS) { - ctx->log(RC_LOG_ERROR, "rcBuildCompactHeightfield: Heighfield has too many layers %d (max: %d)", + ctx->log(RC_LOG_ERROR, "rcBuildCompactHeightfield: Heightfield has too many layers %d (max: %d)", tooHighNeighbour, MAX_LAYERS); } - ctx->stopTimer(RC_TIMER_BUILD_COMPACTHEIGHFIELD); + ctx->stopTimer(RC_TIMER_BUILD_COMPACTHEIGHTFIELD); return true; } diff --git a/Recast/Source/RecastContour.cpp b/Recast/Source/RecastContour.cpp index c7f8cbe..1906b6e 100644 --- a/Recast/Source/RecastContour.cpp +++ b/Recast/Source/RecastContour.cpp @@ -340,7 +340,7 @@ static void simplifyContour(rcIntArray& points, rcIntArray& simplified, endi = ai; } - // Tesselate only outer edges oredges between areas. + // Tessellate only outer edges oredges between areas. if ((points[ci*4+3] & RC_CONTOUR_REG_MASK) == 0 || (points[ci*4+3] & RC_AREA_BORDER)) { @@ -402,7 +402,7 @@ static void simplifyContour(rcIntArray& points, rcIntArray& simplified, int maxi = -1; int ci = (ai+1) % pn; - // Tesselate only outer edges or edges between areas. + // Tessellate only outer edges or edges between areas. bool tess = false; // Wall edges. if ((buildFlags & RC_CONTOUR_TESS_WALL_EDGES) && (points[ci*4+3] & RC_CONTOUR_REG_MASK) == 0) @@ -693,7 +693,7 @@ bool rcBuildContours(rcContext* ctx, rcCompactHeightfield& chf, if (cset.nconts >= maxContours) { // Allocate more contours. - // This can happen when there are tiny holes in the heighfield. + // This can happen when there are tiny holes in the heightfield. const int oldMax = maxContours; maxContours *= 2; rcContour* newConts = (rcContour*)rcAlloc(sizeof(rcContour)*maxContours, RC_ALLOC_PERM); @@ -749,7 +749,7 @@ bool rcBuildContours(rcContext* ctx, rcCompactHeightfield& chf, } // Check and merge droppings. - // Sometimes the previous algorithms can fail and create several countours + // Sometimes the previous algorithms can fail and create several contours // per area. This pass will try to merge the holes into the main region. for (int i = 0; i < cset.nconts; ++i) { diff --git a/Recast/Source/RecastMeshDetail.cpp b/Recast/Source/RecastMeshDetail.cpp index 9f671ad..e6d7e56 100644 --- a/Recast/Source/RecastMeshDetail.cpp +++ b/Recast/Source/RecastMeshDetail.cpp @@ -512,7 +512,7 @@ static bool buildPolyDetail(rcContext* ctx, const float* in, const int nin, const float cs = chf.cs; const float ics = 1.0f/cs; - // Tesselate outlines. + // Tessellate outlines. // This is done in separate pass in order to ensure // seamless height values across the ply boundaries. if (sampleDist > 0) @@ -618,7 +618,7 @@ static bool buildPolyDetail(rcContext* ctx, const float* in, const int nin, } - // Tesselate the base mesh. + // Tessellate the base mesh. edges.resize(0); tris.resize(0); diff --git a/RecastDemo/Build/Xcode/Recast.xcodeproj/memon.pbxuser b/RecastDemo/Build/Xcode/Recast.xcodeproj/memon.pbxuser index 2b02e8d..22d46ee 100644 --- a/RecastDemo/Build/Xcode/Recast.xcodeproj/memon.pbxuser +++ b/RecastDemo/Build/Xcode/Recast.xcodeproj/memon.pbxuser @@ -246,6 +246,64 @@ 6BA7F89C1226ED5200C8C47A /* PBXTextBookmark */ = 6BA7F89C1226ED5200C8C47A /* PBXTextBookmark */; 6BA7F89D1226ED5200C8C47A /* PBXTextBookmark */ = 6BA7F89D1226ED5200C8C47A /* PBXTextBookmark */; 6BA7F89E1226ED5200C8C47A /* PBXTextBookmark */ = 6BA7F89E1226ED5200C8C47A /* PBXTextBookmark */; + 6BA7F8A71226EF0400C8C47A /* PBXTextBookmark */ = 6BA7F8A71226EF0400C8C47A /* PBXTextBookmark */; + 6BA7F8A81226EF0400C8C47A /* PBXTextBookmark */ = 6BA7F8A81226EF0400C8C47A /* PBXTextBookmark */; + 6BA7F8A91226EF0400C8C47A /* PBXTextBookmark */ = 6BA7F8A91226EF0400C8C47A /* PBXTextBookmark */; + 6BA7F8AA1226EF0400C8C47A /* PBXTextBookmark */ = 6BA7F8AA1226EF0400C8C47A /* PBXTextBookmark */; + 6BA7F8AB1226EF0400C8C47A /* PBXTextBookmark */ = 6BA7F8AB1226EF0400C8C47A /* PBXTextBookmark */; + 6BA7F8AC1226EF0400C8C47A /* PBXTextBookmark */ = 6BA7F8AC1226EF0400C8C47A /* PBXTextBookmark */; + 6BA7F8AD1226EF0400C8C47A /* PBXTextBookmark */ = 6BA7F8AD1226EF0400C8C47A /* PBXTextBookmark */; + 6BA7F8AE1226EF0400C8C47A /* PBXTextBookmark */ = 6BA7F8AE1226EF0400C8C47A /* PBXTextBookmark */; + 6BA7F8AF1226EF0400C8C47A /* PBXTextBookmark */ = 6BA7F8AF1226EF0400C8C47A /* PBXTextBookmark */; + 6BA7F8B01226EF0400C8C47A /* PBXTextBookmark */ = 6BA7F8B01226EF0400C8C47A /* PBXTextBookmark */; + 6BA7F8B11226EF0400C8C47A /* PBXTextBookmark */ = 6BA7F8B11226EF0400C8C47A /* PBXTextBookmark */; + 6BA7F8B21226EF0400C8C47A /* PBXTextBookmark */ = 6BA7F8B21226EF0400C8C47A /* PBXTextBookmark */; + 6BA7F8B31226EF0400C8C47A /* PBXTextBookmark */ = 6BA7F8B31226EF0400C8C47A /* PBXTextBookmark */; + 6BA7F8B41226EF0400C8C47A /* PBXTextBookmark */ = 6BA7F8B41226EF0400C8C47A /* PBXTextBookmark */; + 6BA7F8B51226EF0400C8C47A /* PBXTextBookmark */ = 6BA7F8B51226EF0400C8C47A /* PBXTextBookmark */; + 6BA7F8B61226EF1100C8C47A /* PBXTextBookmark */ = 6BA7F8B61226EF1100C8C47A /* PBXTextBookmark */; + 6BA7F8B71226EF1100C8C47A /* PBXTextBookmark */ = 6BA7F8B71226EF1100C8C47A /* PBXTextBookmark */; + 6BA7F8B81226EF1100C8C47A /* PBXTextBookmark */ = 6BA7F8B81226EF1100C8C47A /* PBXTextBookmark */; + 6BA7F8B91226EF1100C8C47A /* PBXTextBookmark */ = 6BA7F8B91226EF1100C8C47A /* PBXTextBookmark */; + 6BA7F8BA1226EF1E00C8C47A /* PBXTextBookmark */ = 6BA7F8BA1226EF1E00C8C47A /* PBXTextBookmark */; + 6BA7F8BB1226EF1E00C8C47A /* PBXTextBookmark */ = 6BA7F8BB1226EF1E00C8C47A /* PBXTextBookmark */; + 6BA7F8BC1226EF2700C8C47A /* PBXTextBookmark */ = 6BA7F8BC1226EF2700C8C47A /* PBXTextBookmark */; + 6BA7F8BD1226EF2700C8C47A /* PBXTextBookmark */ = 6BA7F8BD1226EF2700C8C47A /* PBXTextBookmark */; + 6BA7F8BE1226EF4A00C8C47A /* PBXTextBookmark */ = 6BA7F8BE1226EF4A00C8C47A /* PBXTextBookmark */; + 6BA7F8BF1226EF4A00C8C47A /* PBXTextBookmark */ = 6BA7F8BF1226EF4A00C8C47A /* PBXTextBookmark */; + 6BA7F8C01226EF4A00C8C47A /* PBXTextBookmark */ = 6BA7F8C01226EF4A00C8C47A /* PBXTextBookmark */; + 6BA7F8C11226EF4A00C8C47A /* PBXTextBookmark */ = 6BA7F8C11226EF4A00C8C47A /* PBXTextBookmark */; + 6BA7F8C21226EF4A00C8C47A /* PBXTextBookmark */ = 6BA7F8C21226EF4A00C8C47A /* PBXTextBookmark */; + 6BA7F8C31226EF4A00C8C47A /* PBXTextBookmark */ = 6BA7F8C31226EF4A00C8C47A /* PBXTextBookmark */; + 6BA7F8C41226EF6000C8C47A /* PBXTextBookmark */ = 6BA7F8C41226EF6000C8C47A /* PBXTextBookmark */; + 6BA7F8C51226EF6000C8C47A /* PBXTextBookmark */ = 6BA7F8C51226EF6000C8C47A /* PBXTextBookmark */; + 6BA7F8C61226EF6000C8C47A /* PBXTextBookmark */ = 6BA7F8C61226EF6000C8C47A /* PBXTextBookmark */; + 6BA7F8C71226EF6000C8C47A /* PBXTextBookmark */ = 6BA7F8C71226EF6000C8C47A /* PBXTextBookmark */; + 6BA7F8C81226EF6800C8C47A /* PBXTextBookmark */ = 6BA7F8C81226EF6800C8C47A /* PBXTextBookmark */; + 6BA7F8C91226EF6800C8C47A /* PBXTextBookmark */ = 6BA7F8C91226EF6800C8C47A /* PBXTextBookmark */; + 6BA7F8CA1226EF8200C8C47A /* PBXTextBookmark */ = 6BA7F8CA1226EF8200C8C47A /* PBXTextBookmark */; + 6BA7F8CB1226EF8200C8C47A /* PBXTextBookmark */ = 6BA7F8CB1226EF8200C8C47A /* PBXTextBookmark */; + 6BA7F8CC1226EF9500C8C47A /* PBXTextBookmark */ = 6BA7F8CC1226EF9500C8C47A /* PBXTextBookmark */; + 6BA7F8CD1226EF9500C8C47A /* PBXTextBookmark */ = 6BA7F8CD1226EF9500C8C47A /* PBXTextBookmark */; + 6BA7F8CE1226EF9500C8C47A /* PBXTextBookmark */ = 6BA7F8CE1226EF9500C8C47A /* PBXTextBookmark */; + 6BA7F8CF1226EF9500C8C47A /* PBXTextBookmark */ = 6BA7F8CF1226EF9500C8C47A /* PBXTextBookmark */; + 6BA7F8D01226EF9D00C8C47A /* PBXTextBookmark */ = 6BA7F8D01226EF9D00C8C47A /* PBXTextBookmark */; + 6BA7F8D11226EF9D00C8C47A /* PBXTextBookmark */ = 6BA7F8D11226EF9D00C8C47A /* PBXTextBookmark */; + 6BA7F8D21226EF9D00C8C47A /* PBXTextBookmark */ = 6BA7F8D21226EF9D00C8C47A /* PBXTextBookmark */; + 6BA7F8D31226EF9D00C8C47A /* PBXTextBookmark */ = 6BA7F8D31226EF9D00C8C47A /* PBXTextBookmark */; + 6BA7F8D71226EFF500C8C47A /* PBXTextBookmark */ = 6BA7F8D71226EFF500C8C47A /* PBXTextBookmark */; + 6BA7F8D81226EFF500C8C47A /* PBXTextBookmark */ = 6BA7F8D81226EFF500C8C47A /* PBXTextBookmark */; + 6BA7F8D91226EFF500C8C47A /* PBXTextBookmark */ = 6BA7F8D91226EFF500C8C47A /* PBXTextBookmark */; + 6BA7F8DA1226EFF500C8C47A /* PBXTextBookmark */ = 6BA7F8DA1226EFF500C8C47A /* PBXTextBookmark */; + 6BA7F8DB1226EFF500C8C47A /* PBXTextBookmark */ = 6BA7F8DB1226EFF500C8C47A /* PBXTextBookmark */; + 6BA7F8DC1226EFF500C8C47A /* PBXTextBookmark */ = 6BA7F8DC1226EFF500C8C47A /* PBXTextBookmark */; + 6BA7F8DD1226EFF500C8C47A /* PBXTextBookmark */ = 6BA7F8DD1226EFF500C8C47A /* PBXTextBookmark */; + 6BA7F8DE1226EFF500C8C47A /* PBXTextBookmark */ = 6BA7F8DE1226EFF500C8C47A /* PBXTextBookmark */; + 6BA7F8E41226F06600C8C47A /* PBXTextBookmark */ = 6BA7F8E41226F06600C8C47A /* PBXTextBookmark */; + 6BA7F8E51226F06600C8C47A /* PBXTextBookmark */ = 6BA7F8E51226F06600C8C47A /* PBXTextBookmark */; + 6BA7F8E61226F06600C8C47A /* PBXTextBookmark */ = 6BA7F8E61226F06600C8C47A /* PBXTextBookmark */; + 6BA7F8E71226F06600C8C47A /* PBXTextBookmark */ = 6BA7F8E71226F06600C8C47A /* PBXTextBookmark */; + 6BA7F8E81226F06600C8C47A /* PBXTextBookmark */ = 6BA7F8E81226F06600C8C47A /* PBXTextBookmark */; 6BAF3860120A8A8E008CFCDF = 6BAF3860120A8A8E008CFCDF /* PBXTextBookmark */; 6BAF3861120A8A8E008CFCDF = 6BAF3861120A8A8E008CFCDF /* PBXTextBookmark */; 6BAF3A3B1210235F008CFCDF = 6BAF3A3B1210235F008CFCDF /* PBXTextBookmark */; @@ -453,24 +511,24 @@ }; 6B137C7E0F7FCBFE00459200 /* Recast.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {933, 11088}}"; - sepNavSelRange = "{6995, 0}"; - sepNavVisRange = "{5917, 1209}"; + sepNavIntBoundsRect = "{{0, 0}, {933, 10304}}"; + sepNavSelRange = "{25590, 0}"; + sepNavVisRange = "{25222, 892}"; sepNavWindowFrame = "{{15, 51}, {1214, 722}}"; }; }; 6B137C820F7FCC1100459200 /* Recast.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {933, 6400}}"; - sepNavSelRange = "{10853, 173}"; - sepNavVisRange = "{10234, 796}"; + sepNavIntBoundsRect = "{{0, 0}, {933, 6576}}"; + sepNavSelRange = "{10424, 0}"; + sepNavVisRange = "{10173, 278}"; }; }; 6B137C830F7FCC1100459200 /* RecastContour.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {933, 12704}}"; - sepNavSelRange = "{21311, 0}"; - sepNavVisRange = "{20958, 602}"; + sepNavIntBoundsRect = "{{0, 0}, {933, 12480}}"; + sepNavSelRange = "{20095, 0}"; + sepNavVisRange = "{19784, 431}"; sepNavWindowFrame = "{{38, 30}, {1214, 722}}"; }; }; @@ -613,9 +671,9 @@ }; 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {936, 18896}}"; - sepNavSelRange = "{29126, 0}"; - sepNavVisRange = "{28156, 1221}"; + sepNavIntBoundsRect = "{{0, 0}, {936, 18560}}"; + sepNavSelRange = "{25434, 0}"; + sepNavVisRange = "{25185, 649}"; sepNavWindowFrame = "{{38, 30}, {1214, 722}}"; }; }; @@ -683,9 +741,9 @@ }; 6B624169103434880002E346 /* RecastMeshDetail.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {933, 18576}}"; - sepNavSelRange = "{28261, 1}"; - sepNavVisRange = "{28030, 505}"; + sepNavIntBoundsRect = "{{0, 0}, {933, 19008}}"; + sepNavSelRange = "{12379, 0}"; + sepNavVisRange = "{12177, 347}"; sepNavWindowFrame = "{{61, 36}, {1011, 695}}"; }; }; @@ -769,9 +827,9 @@ }; 6B8DE88B10B69E4C00DF20FB /* DetourNavMesh.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1219, 6240}}"; - sepNavSelRange = "{11831, 0}"; - sepNavVisRange = "{11697, 312}"; + sepNavIntBoundsRect = "{{0, 0}, {933, 6176}}"; + sepNavSelRange = "{13969, 0}"; + sepNavVisRange = "{0, 1193}"; }; }; 6B8DE88C10B69E4C00DF20FB /* DetourNavMeshBuilder.h */ = { @@ -1116,7 +1174,7 @@ fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */; name = "CrowdTool.cpp: 1411"; rLen = 0; - rLoc = 33081; + rLoc = 33107; rType = 0; vrLen = 1091; vrLoc = 31930; @@ -1126,7 +1184,7 @@ fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */; name = "CrowdTool.cpp: 1159"; rLen = 0; - rLoc = 26933; + rLoc = 26959; rType = 0; vrLen = 795; vrLoc = 27439; @@ -1340,7 +1398,7 @@ fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */; name = "CrowdTool.cpp: 1046"; rLen = 0; - rLoc = 25216; + rLoc = 25242; rType = 0; vrLen = 699; vrLoc = 24766; @@ -1370,7 +1428,7 @@ fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */; name = "CrowdTool.cpp: 1046"; rLen = 0; - rLoc = 25216; + rLoc = 25242; rType = 0; vrLen = 733; vrLoc = 24732; @@ -1390,7 +1448,7 @@ fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */; name = "CrowdTool.cpp: 1046"; rLen = 0; - rLoc = 25216; + rLoc = 25242; rType = 0; vrLen = 699; vrLoc = 24766; @@ -1570,7 +1628,7 @@ fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */; name = "Sample_TileMesh.cpp: 1014"; rLen = 19; - rLoc = 28211; + rLoc = 28212; rType = 0; vrLen = 1193; vrLoc = 28159; @@ -1600,7 +1658,7 @@ fRef = 6B137C820F7FCC1100459200 /* Recast.cpp */; name = "Recast.cpp: 417"; rLen = 173; - rLoc = 10853; + rLoc = 10856; rType = 0; vrLen = 796; vrLoc = 10234; @@ -1610,7 +1668,7 @@ fRef = 6B137C7E0F7FCBFE00459200 /* Recast.h */; name = "Recast.h: 190"; rLen = 0; - rLoc = 6995; + rLoc = 6999; rType = 0; vrLen = 1209; vrLoc = 5917; @@ -1630,7 +1688,7 @@ fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */; name = "Sample_TileMesh.cpp: 1014"; rLen = 19; - rLoc = 28211; + rLoc = 28212; rType = 0; vrLen = 1193; vrLoc = 28159; @@ -1660,7 +1718,7 @@ fRef = 6B137C7E0F7FCBFE00459200 /* Recast.h */; name = "Recast.h: 190"; rLen = 0; - rLoc = 6995; + rLoc = 6999; rType = 0; vrLen = 1209; vrLoc = 5917; @@ -1786,7 +1844,7 @@ fRef = 6B137C830F7FCC1100459200 /* RecastContour.cpp */; name = "RecastContour.cpp: 716"; rLen = 0; - rLoc = 15774; + rLoc = 15776; rType = 0; vrLen = 1104; vrLoc = 18553; @@ -1810,9 +1868,9 @@ }; 6BA1E88810C7BFC9008007F6 /* Sample_SoloMeshSimple.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {933, 11136}}"; - sepNavSelRange = "{2597, 0}"; - sepNavVisRange = "{2136, 847}"; + sepNavIntBoundsRect = "{{0, 0}, {933, 10592}}"; + sepNavSelRange = "{12359, 0}"; + sepNavVisRange = "{12190, 634}"; }; }; 6BA1E88E10C7BFD3008007F6 /* Sample_SoloMeshSimple.h */ = { @@ -1985,7 +2043,7 @@ fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */; name = "Sample_TileMesh.cpp: 1014"; rLen = 19; - rLoc = 28211; + rLoc = 28212; rType = 0; vrLen = 1227; vrLoc = 28156; @@ -2005,11 +2063,561 @@ fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */; name = "Sample_TileMesh.cpp: 1038"; rLen = 0; - rLoc = 29126; + rLoc = 29127; rType = 0; vrLen = 1221; vrLoc = 28156; }; + 6BA7F8A71226EF0400C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */; + name = "CrowdTool.cpp: 945"; + rLen = 0; + rLoc = 22740; + rType = 0; + vrLen = 357; + vrLoc = 22594; + }; + 6BA7F8A81226EF0400C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6BB93CF510CFEC4500F74F2B /* RecastDump.cpp */; + name = "RecastDump.cpp: 415"; + rLen = 0; + rLoc = 10606; + rType = 0; + vrLen = 830; + vrLoc = 10346; + }; + 6BA7F8A91226EF0400C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B137C7E0F7FCBFE00459200 /* Recast.h */; + name = "Recast.h: 596"; + rLen = 0; + rLoc = 22005; + rType = 0; + vrLen = 848; + vrLoc = 21558; + }; + 6BA7F8AA1226EF0400C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B137C820F7FCC1100459200 /* Recast.cpp */; + name = "Recast.cpp: 394"; + rLen = 0; + rLoc = 10424; + rType = 0; + vrLen = 278; + vrLoc = 10173; + }; + 6BA7F8AB1226EF0400C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B137C830F7FCC1100459200 /* RecastContour.cpp */; + name = "RecastContour.cpp: 696"; + rLen = 0; + rLoc = 18304; + rType = 0; + vrLen = 602; + vrLoc = 18010; + }; + 6BA7F8AC1226EF0400C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */; + name = "Sample_TileMesh.cpp: 929"; + rLen = 0; + rLoc = 25434; + rType = 0; + vrLen = 649; + vrLoc = 25185; + }; + 6BA7F8AD1226EF0400C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6BA1E88810C7BFC9008007F6 /* Sample_SoloMeshSimple.cpp */; + rLen = 11; + rLoc = 12431; + rType = 0; + }; + 6BA7F8AE1226EF0400C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */; + name = "Sample_TileMesh.cpp: 1029"; + rLen = 0; + rLoc = 28861; + rType = 0; + vrLen = 1221; + vrLoc = 28156; + }; + 6BA7F8AF1226EF0400C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */; + name = "CrowdTool.cpp: 945"; + rLen = 0; + rLoc = 22740; + rType = 0; + vrLen = 357; + vrLoc = 22594; + }; + 6BA7F8B01226EF0400C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6BB93CF510CFEC4500F74F2B /* RecastDump.cpp */; + name = "RecastDump.cpp: 415"; + rLen = 0; + rLoc = 10606; + rType = 0; + vrLen = 830; + vrLoc = 10346; + }; + 6BA7F8B11226EF0400C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B137C7E0F7FCBFE00459200 /* Recast.h */; + name = "Recast.h: 596"; + rLen = 0; + rLoc = 22005; + rType = 0; + vrLen = 848; + vrLoc = 21558; + }; + 6BA7F8B21226EF0400C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B137C820F7FCC1100459200 /* Recast.cpp */; + name = "Recast.cpp: 394"; + rLen = 0; + rLoc = 10424; + rType = 0; + vrLen = 278; + vrLoc = 10173; + }; + 6BA7F8B31226EF0400C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B137C830F7FCC1100459200 /* RecastContour.cpp */; + name = "RecastContour.cpp: 696"; + rLen = 0; + rLoc = 18304; + rType = 0; + vrLen = 602; + vrLoc = 18010; + }; + 6BA7F8B41226EF0400C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B2AEC520FFB8958005BE9CC /* Sample_TileMesh.cpp */; + name = "Sample_TileMesh.cpp: 929"; + rLen = 0; + rLoc = 25434; + rType = 0; + vrLen = 649; + vrLoc = 25185; + }; + 6BA7F8B51226EF0400C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6BA1E88810C7BFC9008007F6 /* Sample_SoloMeshSimple.cpp */; + name = "Sample_SoloMeshSimple.cpp: 405"; + rLen = 0; + rLoc = 12437; + rType = 0; + vrLen = 634; + vrLoc = 12190; + }; + 6BA7F8B61226EF1100C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6BA1E88810C7BFC9008007F6 /* Sample_SoloMeshSimple.cpp */; + name = "Sample_SoloMeshSimple.cpp: 400"; + rLen = 0; + rLoc = 12359; + rType = 0; + vrLen = 634; + vrLoc = 12190; + }; + 6BA7F8B71226EF1100C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B137C7E0F7FCBFE00459200 /* Recast.h */; + rLen = 8; + rLoc = 3960; + rType = 0; + }; + 6BA7F8B81226EF1100C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6BA1E88810C7BFC9008007F6 /* Sample_SoloMeshSimple.cpp */; + name = "Sample_SoloMeshSimple.cpp: 400"; + rLen = 0; + rLoc = 12359; + rType = 0; + vrLen = 634; + vrLoc = 12190; + }; + 6BA7F8B91226EF1100C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B137C7E0F7FCBFE00459200 /* Recast.h */; + name = "Recast.h: 109"; + rLen = 0; + rLoc = 3965; + rType = 0; + vrLen = 1044; + vrLoc = 3604; + }; + 6BA7F8BA1226EF1E00C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B137C7E0F7FCBFE00459200 /* Recast.h */; + rLen = 7; + rLoc = 8016; + rType = 0; + }; + 6BA7F8BB1226EF1E00C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B137C7E0F7FCBFE00459200 /* Recast.h */; + name = "Recast.h: 221"; + rLen = 0; + rLoc = 8023; + rType = 0; + vrLen = 715; + vrLoc = 7678; + }; + 6BA7F8BC1226EF2700C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B137C7E0F7FCBFE00459200 /* Recast.h */; + rLen = 7; + rLoc = 9164; + rType = 0; + }; + 6BA7F8BD1226EF2700C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B137C7E0F7FCBFE00459200 /* Recast.h */; + name = "Recast.h: 249"; + rLen = 0; + rLoc = 9168; + rType = 0; + vrLen = 734; + vrLoc = 8816; + }; + 6BA7F8BE1226EF4A00C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B137C7E0F7FCBFE00459200 /* Recast.h */; + name = "Recast.h: 284"; + rLen = 0; + rLoc = 10568; + rType = 0; + vrLen = 555; + vrLoc = 10139; + }; + 6BA7F8BF1226EF4A00C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B137C830F7FCC1100459200 /* RecastContour.cpp */; + name = "RecastContour.cpp: 343"; + rLen = 0; + rLoc = 9211; + rType = 0; + vrLen = 363; + vrLoc = 8945; + }; + 6BA7F8C01226EF4A00C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B624169103434880002E346 /* RecastMeshDetail.cpp */; + rLen = 10; + rLoc = 12372; + rType = 0; + }; + 6BA7F8C11226EF4A00C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B137C7E0F7FCBFE00459200 /* Recast.h */; + name = "Recast.h: 284"; + rLen = 0; + rLoc = 10568; + rType = 0; + vrLen = 555; + vrLoc = 10139; + }; + 6BA7F8C21226EF4A00C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B137C830F7FCC1100459200 /* RecastContour.cpp */; + name = "RecastContour.cpp: 343"; + rLen = 0; + rLoc = 9211; + rType = 0; + vrLen = 363; + vrLoc = 8945; + }; + 6BA7F8C31226EF4A00C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B624169103434880002E346 /* RecastMeshDetail.cpp */; + name = "RecastMeshDetail.cpp: 515"; + rLen = 0; + rLoc = 12379; + rType = 0; + vrLen = 347; + vrLoc = 12177; + }; + 6BA7F8C41226EF6000C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B624169103434880002E346 /* RecastMeshDetail.cpp */; + name = "RecastMeshDetail.cpp: 515"; + rLen = 0; + rLoc = 12379; + rType = 0; + vrLen = 347; + vrLoc = 12177; + }; + 6BA7F8C51226EF6000C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B137C7E0F7FCBFE00459200 /* Recast.h */; + rLen = 7; + rLoc = 15646; + rType = 0; + }; + 6BA7F8C61226EF6000C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B624169103434880002E346 /* RecastMeshDetail.cpp */; + name = "RecastMeshDetail.cpp: 515"; + rLen = 0; + rLoc = 12379; + rType = 0; + vrLen = 347; + vrLoc = 12177; + }; + 6BA7F8C71226EF6000C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B137C7E0F7FCBFE00459200 /* Recast.h */; + name = "Recast.h: 465"; + rLen = 0; + rLoc = 15653; + rType = 0; + vrLen = 812; + vrLoc = 15212; + }; + 6BA7F8C81226EF6800C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B137C7E0F7FCBFE00459200 /* Recast.h */; + rLen = 9; + rLoc = 19980; + rType = 0; + }; + 6BA7F8C91226EF6800C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B137C7E0F7FCBFE00459200 /* Recast.h */; + name = "Recast.h: 552"; + rLen = 0; + rLoc = 19988; + rType = 0; + vrLen = 797; + vrLoc = 19644; + }; + 6BA7F8CA1226EF8200C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B137C7E0F7FCBFE00459200 /* Recast.h */; + rLen = 0; + rLoc = 23774; + rType = 0; + }; + 6BA7F8CB1226EF8200C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B137C7E0F7FCBFE00459200 /* Recast.h */; + name = "Recast.h: 631"; + rLen = 0; + rLoc = 23774; + rType = 0; + vrLen = 950; + vrLoc = 23484; + }; + 6BA7F8CC1226EF9500C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B137C7E0F7FCBFE00459200 /* Recast.h */; + name = "Recast.h: 646"; + rLen = 0; + rLoc = 24624; + rType = 0; + vrLen = 871; + vrLoc = 24231; + }; + 6BA7F8CD1226EF9500C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B137C830F7FCC1100459200 /* RecastContour.cpp */; + rLen = 7; + rLoc = 20093; + rType = 0; + }; + 6BA7F8CE1226EF9500C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B137C7E0F7FCBFE00459200 /* Recast.h */; + name = "Recast.h: 646"; + rLen = 0; + rLoc = 24624; + rType = 0; + vrLen = 871; + vrLoc = 24231; + }; + 6BA7F8CF1226EF9500C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B137C830F7FCC1100459200 /* RecastContour.cpp */; + name = "RecastContour.cpp: 752"; + rLen = 0; + rLoc = 20095; + rType = 0; + vrLen = 431; + vrLoc = 19784; + }; + 6BA7F8D01226EF9D00C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B137C830F7FCC1100459200 /* RecastContour.cpp */; + name = "RecastContour.cpp: 752"; + rLen = 0; + rLoc = 20095; + rType = 0; + vrLen = 431; + vrLoc = 19784; + }; + 6BA7F8D11226EF9D00C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B137C7E0F7FCBFE00459200 /* Recast.h */; + rLen = 7; + rLoc = 25583; + rType = 0; + }; + 6BA7F8D21226EF9D00C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B137C830F7FCC1100459200 /* RecastContour.cpp */; + name = "RecastContour.cpp: 752"; + rLen = 0; + rLoc = 20095; + rType = 0; + vrLen = 431; + vrLoc = 19784; + }; + 6BA7F8D31226EF9D00C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B137C7E0F7FCBFE00459200 /* Recast.h */; + name = "Recast.h: 668"; + rLen = 0; + rLoc = 25590; + rType = 0; + vrLen = 892; + vrLoc = 25222; + }; + 6BA7F8D71226EFF500C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B137C7E0F7FCBFE00459200 /* Recast.h */; + name = "Recast.h: 668"; + rLen = 0; + rLoc = 25590; + rType = 0; + vrLen = 892; + vrLoc = 25222; + }; + 6BA7F8D81226EFF500C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6BAF40DA12196A3D008CFCDF /* DetourNavMeshQuery.cpp */; + name = "DetourNavMeshQuery.cpp: 1131"; + rLen = 0; + rLoc = 30713; + rType = 0; + vrLen = 783; + vrLoc = 30491; + }; + 6BA7F8D91226EFF500C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B8DE88B10B69E4C00DF20FB /* DetourNavMesh.h */; + name = "DetourNavMesh.h: 363"; + rLen = 0; + rLoc = 13969; + rType = 0; + vrLen = 1193; + vrLoc = 0; + }; + 6BA7F8DA1226EFF500C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6BAF40D912196A25008CFCDF /* DetourNavMeshQuery.h */; + name = "DetourNavMeshQuery.h: 126"; + rLen = 15; + rLoc = 5464; + rType = 0; + vrLen = 1364; + vrLoc = 4755; + }; + 6BA7F8DB1226EFF500C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B137C7E0F7FCBFE00459200 /* Recast.h */; + name = "Recast.h: 668"; + rLen = 0; + rLoc = 25590; + rType = 0; + vrLen = 892; + vrLoc = 25222; + }; + 6BA7F8DC1226EFF500C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6BAF40DA12196A3D008CFCDF /* DetourNavMeshQuery.cpp */; + name = "DetourNavMeshQuery.cpp: 1131"; + rLen = 0; + rLoc = 30713; + rType = 0; + vrLen = 783; + vrLoc = 30491; + }; + 6BA7F8DD1226EFF500C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6B8DE88B10B69E4C00DF20FB /* DetourNavMesh.h */; + name = "DetourNavMesh.h: 363"; + rLen = 0; + rLoc = 13969; + rType = 0; + vrLen = 1193; + vrLoc = 0; + }; + 6BA7F8DE1226EFF500C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6BAF40D912196A25008CFCDF /* DetourNavMeshQuery.h */; + name = "DetourNavMeshQuery.h: 28"; + rLen = 0; + rLoc = 1321; + rType = 0; + vrLen = 1322; + vrLoc = 711; + }; + 6BA7F8E41226F06600C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6BAF40DA12196A3D008CFCDF /* DetourNavMeshQuery.cpp */; + name = "DetourNavMeshQuery.cpp: 53"; + rLen = 0; + rLoc = 1961; + rType = 0; + vrLen = 1265; + vrLoc = 1466; + }; + 6BA7F8E51226F06600C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6BAF40D912196A25008CFCDF /* DetourNavMeshQuery.h */; + name = "DetourNavMeshQuery.h: 76"; + rLen = 0; + rLoc = 3379; + rType = 0; + vrLen = 1526; + vrLoc = 2700; + }; + 6BA7F8E61226F06600C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6BAF40D912196A25008CFCDF /* DetourNavMeshQuery.h */; + name = "DetourNavMeshQuery.h: 76"; + rLen = 0; + rLoc = 3379; + rType = 0; + vrLen = 1526; + vrLoc = 2700; + }; + 6BA7F8E71226F06600C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6BAF40DA12196A3D008CFCDF /* DetourNavMeshQuery.cpp */; + name = "DetourNavMeshQuery.cpp: 53"; + rLen = 0; + rLoc = 1961; + rType = 0; + vrLen = 1265; + vrLoc = 1466; + }; + 6BA7F8E81226F06600C8C47A /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 6BAF40D912196A25008CFCDF /* DetourNavMeshQuery.h */; + name = "DetourNavMeshQuery.h: 30"; + rLen = 22; + rLoc = 1333; + rType = 0; + vrLen = 1409; + vrLoc = 983; + }; 6BAF3860120A8A8E008CFCDF /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 6BB93CF410CFEC4500F74F2B /* RecastDump.h */; @@ -2069,9 +2677,9 @@ }; 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1219, 28496}}"; - sepNavSelRange = "{20534, 0}"; - sepNavVisRange = "{20593, 322}"; + sepNavIntBoundsRect = "{{0, 0}, {933, 28496}}"; + sepNavSelRange = "{22740, 0}"; + sepNavVisRange = "{22594, 357}"; }; }; 6BAF3CB012116AD9008CFCDF /* PBXTextBookmark */ = { @@ -2146,16 +2754,16 @@ }; 6BAF40D912196A25008CFCDF /* DetourNavMeshQuery.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {933, 6368}}"; - sepNavSelRange = "{5464, 15}"; - sepNavVisRange = "{4755, 1662}"; + sepNavIntBoundsRect = "{{0, 0}, {933, 6336}}"; + sepNavSelRange = "{1333, 22}"; + sepNavVisRange = "{983, 1409}"; }; }; 6BAF40DA12196A3D008CFCDF /* DetourNavMeshQuery.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {933, 38544}}"; - sepNavSelRange = "{2687, 242}"; - sepNavVisRange = "{2261, 930}"; + sepNavIntBoundsRect = "{{0, 0}, {933, 38272}}"; + sepNavSelRange = "{1961, 0}"; + sepNavVisRange = "{1466, 1265}"; }; }; 6BAF411712197F3D008CFCDF /* PBXTextBookmark */ = { @@ -2252,7 +2860,7 @@ rLen = 0; rLoc = 6523; rType = 0; - vrLen = 632; + vrLen = 478; vrLoc = 29617; }; 6BAF43FB121C241D008CFCDF /* PBXTextBookmark */ = { @@ -2519,9 +3127,9 @@ }; 6BB93CF510CFEC4500F74F2B /* RecastDump.cpp */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {933, 6352}}"; - sepNavSelRange = "{10209, 0}"; - sepNavVisRange = "{10093, 1297}"; + sepNavIntBoundsRect = "{{0, 0}, {933, 6400}}"; + sepNavSelRange = "{10606, 0}"; + sepNavVisRange = "{10346, 830}"; }; }; 6BBB4AA5115B4F3400CF791D /* PBXTextBookmark */ = { @@ -2868,7 +3476,7 @@ fRef = 6B137C7E0F7FCBFE00459200 /* Recast.h */; name = "Recast.h: 83"; rLen = 0; - rLoc = 1977; + rLoc = 1978; rType = 0; vrLen = 1539; vrLoc = 1797; @@ -2888,9 +3496,9 @@ fRef = 6B137C830F7FCC1100459200 /* RecastContour.cpp */; name = "RecastContour.cpp: 791"; rLen = 0; - rLoc = 21306; + rLoc = 21308; rType = 0; - vrLen = 602; + vrLen = 597; vrLoc = 20958; }; 6BD402491224345E00995864 /* PBXTextBookmark */ = { @@ -2898,7 +3506,7 @@ fRef = 6B624169103434880002E346 /* RecastMeshDetail.cpp */; name = "RecastMeshDetail.cpp: 1137"; rLen = 1; - rLoc = 28231; + rLoc = 28233; rType = 0; vrLen = 505; vrLoc = 28030; @@ -3038,7 +3646,7 @@ fRef = 6BAF40DA12196A3D008CFCDF /* DetourNavMeshQuery.cpp */; name = "DetourNavMeshQuery.cpp: 183"; rLen = 0; - rLoc = 5327; + rLoc = 5333; rType = 0; vrLen = 1236; vrLoc = 4746; @@ -3110,7 +3718,7 @@ fRef = 6BAF40DA12196A3D008CFCDF /* DetourNavMeshQuery.cpp */; name = "DetourNavMeshQuery.cpp: 74"; rLen = 242; - rLoc = 2687; + rLoc = 2693; rType = 0; vrLen = 930; vrLoc = 2261; diff --git a/RecastDemo/Build/Xcode/Recast.xcodeproj/memon.perspectivev3 b/RecastDemo/Build/Xcode/Recast.xcodeproj/memon.perspectivev3 index 8f0f418..b274cd9 100644 --- a/RecastDemo/Build/Xcode/Recast.xcodeproj/memon.perspectivev3 +++ b/RecastDemo/Build/Xcode/Recast.xcodeproj/memon.perspectivev3 @@ -283,14 +283,14 @@ PBXSmartGroupTreeModuleOutlineStateSelectionKey - 46 - 38 + 17 + 11 1 0 PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 410}, {264, 660}} + {{0, 2}, {264, 660}} PBXTopSmartGroupGIDs @@ -325,7 +325,7 @@ PBXProjectModuleGUID 6B8632A30F78115100E2684A PBXProjectModuleLabel - Sample_TileMesh.cpp + DetourNavMeshQuery.h PBXSplitModuleInNavigatorKey Split0 @@ -333,11 +333,11 @@ PBXProjectModuleGUID 6B8632A40F78115100E2684A PBXProjectModuleLabel - Sample_TileMesh.cpp + DetourNavMeshQuery.h _historyCapacity 0 bookmark - 6BA7F89E1226ED5200C8C47A + 6BA7F8E81226F06600C8C47A history 6BBB4AA5115B4F3400CF791D @@ -380,9 +380,6 @@ 6BD4020E1224336600995864 6BD402111224336600995864 6BD402121224336600995864 - 6BD402461224345E00995864 - 6BD402481224345E00995864 - 6BD402491224345E00995864 6BD4024A1224345E00995864 6BD402611224387200995864 6BD402621224387200995864 @@ -394,19 +391,15 @@ 6BD402B5122441CB00995864 6BD402B7122441CB00995864 6BD402B8122441CB00995864 - 6BD402CB12244B9B00995864 6BD4034D122464E100995864 6BD40350122464E100995864 6BD403B51224F8C400995864 - 6BD403B71224F8C400995864 - 6BD403B91224F8C400995864 6BD403BA1224F8C400995864 6B9209A312259E5B00D5B5AD 6B9209A412259E5B00D5B5AD 6B9209A512259E5B00D5B5AD 6B9209B312259F2000D5B5AD 6B920A4F1225C0AC00D5B5AD - 6B920A501225C0AC00D5B5AD 6B920A521225C0AC00D5B5AD 6B920A541225C0AC00D5B5AD 6B920A6D1225C5DD00D5B5AD @@ -417,10 +410,17 @@ 6B920A8F1225D3C900D5B5AD 6B920AA71225DBCB00D5B5AD 6B920AA81225DBCB00D5B5AD - 6B920AA91225DBCB00D5B5AD - 6B920AAA1225DBCB00D5B5AD - 6BA7F89B1226ED5200C8C47A - 6BA7F89C1226ED5200C8C47A + 6BA7F8A71226EF0400C8C47A + 6BA7F8A81226EF0400C8C47A + 6BA7F8AA1226EF0400C8C47A + 6BA7F8AC1226EF0400C8C47A + 6BA7F8B61226EF1100C8C47A + 6BA7F8C41226EF6000C8C47A + 6BA7F8D01226EF9D00C8C47A + 6BA7F8D71226EFF500C8C47A + 6BA7F8D91226EFF500C8C47A + 6BA7F8E41226F06600C8C47A + 6BA7F8E51226F06600C8C47A prevStack @@ -499,6 +499,24 @@ 6B920A911225D3C900D5B5AD 6B920A921225D3C900D5B5AD 6BA7F89D1226ED5200C8C47A + 6BA7F8AE1226EF0400C8C47A + 6BA7F8AF1226EF0400C8C47A + 6BA7F8B01226EF0400C8C47A + 6BA7F8B11226EF0400C8C47A + 6BA7F8B21226EF0400C8C47A + 6BA7F8B31226EF0400C8C47A + 6BA7F8B41226EF0400C8C47A + 6BA7F8B81226EF1100C8C47A + 6BA7F8C11226EF4A00C8C47A + 6BA7F8C21226EF4A00C8C47A + 6BA7F8C61226EF6000C8C47A + 6BA7F8CE1226EF9500C8C47A + 6BA7F8D21226EF9D00C8C47A + 6BA7F8DB1226EFF500C8C47A + 6BA7F8DC1226EFF500C8C47A + 6BA7F8DD1226EFF500C8C47A + 6BA7F8E61226F06600C8C47A + 6BA7F8E71226F06600C8C47A SplitCount @@ -512,18 +530,18 @@ GeometryConfiguration Frame - {{0, 0}, {994, 592}} + {{0, 0}, {994, 501}} RubberWindowFrame 0 59 1280 719 0 0 1280 778 Module PBXNavigatorGroup Proportion - 592pt + 501pt Proportion - 81pt + 172pt Tabs @@ -538,8 +556,6 @@ Frame {{10, 27}, {994, 54}} - RubberWindowFrame - 0 59 1280 719 0 0 1280 778 Module XCDetailModule @@ -555,7 +571,7 @@ GeometryConfiguration Frame - {{10, 27}, {994, -27}} + {{10, 27}, {994, 145}} Module PBXProjectFindModule @@ -593,7 +609,9 @@ GeometryConfiguration Frame - {{10, 27}, {994, 54}} + {{10, 27}, {994, 145}} + RubberWindowFrame + 0 59 1280 719 0 0 1280 778 Module PBXBuildResultsModule diff --git a/RecastDemo/Source/Sample_SoloMeshSimple.cpp b/RecastDemo/Source/Sample_SoloMeshSimple.cpp index 392a9ba..940ecbd 100644 --- a/RecastDemo/Source/Sample_SoloMeshSimple.cpp +++ b/RecastDemo/Source/Sample_SoloMeshSimple.cpp @@ -402,7 +402,7 @@ bool Sample_SoloMeshSimple::handleBuild() // Step 2. Rasterize input polygon soup. // - // Allocate voxel heighfield where we rasterize our input data to. + // Allocate voxel heightfield where we rasterize our input data to. m_solid = rcAllocHeightfield(); if (!m_solid) { diff --git a/RecastDemo/Source/Sample_TileMesh.cpp b/RecastDemo/Source/Sample_TileMesh.cpp index 4bca77b..2b6a22e 100644 --- a/RecastDemo/Source/Sample_TileMesh.cpp +++ b/RecastDemo/Source/Sample_TileMesh.cpp @@ -926,7 +926,7 @@ unsigned char* Sample_TileMesh::buildTileMesh(const int tx, const int ty, const m_ctx->log(RC_LOG_PROGRESS, " - %d x %d cells", m_cfg.width, m_cfg.height); m_ctx->log(RC_LOG_PROGRESS, " - %.1fK verts, %.1fK tris", nverts/1000.0f, ntris/1000.0f); - // Allocate voxel heighfield where we rasterize our input data to. + // Allocate voxel heightfield where we rasterize our input data to. m_solid = rcAllocHeightfield(); if (!m_solid) {