aboutsummaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2014-02-21 23:06:27 +0100
committerjackpoz <giacomopoz@gmail.com>2014-02-23 12:39:16 +0100
commitf7bc86a17cc0dd1c59c338539c1a7f1d7d6e5f64 (patch)
tree52a7d6137bbfd619094c3bb9157424cff1573436 /src/tools
parent66b4b5e05559e67ce85109436d39c2700b4c3003 (diff)
Core/MMAPs: Update recast
Update recast from https://github.com/memononen/recastnavigation/commit/1be9de72d87dcfdecf6bea30f5461745f7d7afe6 to https://github.com/memononen/recastnavigation/commit/740a7ba51600a3c87ce5667ae276a38284a1ce75 . This differs from https://github.com/TrinityCore/TrinityCore/commit/aa645683b8b25bfb35cb977678daf5c56c1531e6 because it includes a fix https://github.com/memononen/recastnavigation/commit/77ebf643531c90ea712b496e23c48f0b0671f43d which correctly extract tile connections when using rcMergePolyMeshes(), used by mmaps_generator. MMAPs version is now set to 5. Re-extract MMAPs using mmaps_generator , any old extracted MMAPs will not work.
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/mmaps_generator/MapBuilder.cpp15
1 files changed, 3 insertions, 12 deletions
diff --git a/src/tools/mmaps_generator/MapBuilder.cpp b/src/tools/mmaps_generator/MapBuilder.cpp
index 5524b994175..d60924a83f9 100644
--- a/src/tools/mmaps_generator/MapBuilder.cpp
+++ b/src/tools/mmaps_generator/MapBuilder.cpp
@@ -36,7 +36,7 @@ namespace DisableMgr
}
#define MMAP_MAGIC 0x4d4d4150 // 'MMAP'
-#define MMAP_VERSION 3
+#define MMAP_VERSION 5
struct MmapTileHeader
{
@@ -701,14 +701,6 @@ namespace MMAP
delete[] dmmerge;
delete[] tiles;
- // remove padding for extraction
- for (int i = 0; i < iv.polyMesh->nverts; ++i)
- {
- unsigned short* v = &iv.polyMesh->verts[i * 3];
- v[0] -= (unsigned short)config.borderSize;
- v[2] -= (unsigned short)config.borderSize;
- }
-
// set polygons as walkable
// TODO: special flags for DYNAMIC polygons, ie surfaces that can be turned on and off
for (int i = 0; i < iv.polyMesh->npolys; ++i)
@@ -747,9 +739,8 @@ namespace MMAP
rcVcopy(params.bmax, bmax);
params.cs = config.cs;
params.ch = config.ch;
- params.tileSize = VERTEX_PER_MAP;
- /*params.tileLayer = 0;
- params.buildBvTree = true;*/
+ params.tileLayer = 0;
+ params.buildBvTree = true;
// will hold final navmesh
unsigned char* navData = NULL;