diff options
| -rw-r--r-- | src/tools/mesh_extractor/ContinentBuilder.cpp | 4 | ||||
| -rw-r--r-- | src/tools/mesh_extractor/MeshExtractor.cpp | 4 | ||||
| -rw-r--r-- | src/tools/mesh_extractor/WorldModelHandler.cpp | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/tools/mesh_extractor/ContinentBuilder.cpp b/src/tools/mesh_extractor/ContinentBuilder.cpp index 1e4b63ccec9..9e64e7a1b05 100644 --- a/src/tools/mesh_extractor/ContinentBuilder.cpp +++ b/src/tools/mesh_extractor/ContinentBuilder.cpp @@ -110,8 +110,8 @@ void ContinentBuilder::Build() } else { - params.maxPolys = 32768; - params.maxTiles = 4096; + params.maxPolys = 1024; + params.maxTiles = TileMap->TileTable.size(); rcVcopy(params.orig, Constants::Origin); params.tileHeight = Constants::TileSize; params.tileWidth = Constants::TileSize; diff --git a/src/tools/mesh_extractor/MeshExtractor.cpp b/src/tools/mesh_extractor/MeshExtractor.cpp index 6e0cd11740c..de791b04d36 100644 --- a/src/tools/mesh_extractor/MeshExtractor.cpp +++ b/src/tools/mesh_extractor/MeshExtractor.cpp @@ -453,7 +453,7 @@ int main(int argc, char* argv[]) dtPolyRef m_startRef; dtPolyRef m_endRef; - FILE* mmap = fopen("mmaps/389.mmap", "rb"); + FILE* mmap = fopen("mmaps/631.mmap", "rb"); dtNavMeshParams params; int count = fread(¶ms, sizeof(dtNavMeshParams), 1, mmap); fclose(mmap); @@ -472,7 +472,7 @@ int main(int argc, char* argv[]) for (int j = 0; j <= 32; ++j) { char buff[100]; - sprintf(buff, "mmaps/389%02i%02i.mmtile", i, j); + sprintf(buff, "mmaps/631%02i%02i.mmtile", i, j); LoadTile(navMesh, buff); } } diff --git a/src/tools/mesh_extractor/WorldModelHandler.cpp b/src/tools/mesh_extractor/WorldModelHandler.cpp index 00e2d462dbf..18a90365c5b 100644 --- a/src/tools/mesh_extractor/WorldModelHandler.cpp +++ b/src/tools/mesh_extractor/WorldModelHandler.cpp @@ -102,8 +102,9 @@ void WorldModelHandler::InsertModelGeometry( std::vector<Vector3>& verts, std::v for (uint32 i = 0; i < group->Triangles.size(); ++i) { // only include colliding tris - if ((group->TriangleFlags[i] & 0x04) != 0 && group->TriangleMaterials[i] != 0xFF) + if ((group->TriangleFlags[i] & 0x04) != 0 || group->TriangleMaterials[i] == 0xFF) continue; + Triangle<uint16> tri = group->Triangles[i]; tris.push_back(Triangle<uint32>(Constants::TRIANGLE_TYPE_WMO, tri.V0 + vertOffset, tri.V1 + vertOffset, tri.V2 + vertOffset)); } |