This commit is contained in:
aozhiwei 2020-08-14 11:09:25 +08:00
parent 9a91ca6670
commit 67b7c7297a
3 changed files with 5 additions and 6 deletions

View File

@ -68,9 +68,8 @@ void NavMeshBuilder::InitBuilderParams(BuilderParams& builder_params)
} }
} }
void NavMeshBuilder::InitTileCacheParams(BuilderParams& builder_params) void NavMeshBuilder::InitTileCacheParams(BuilderParams& builder_params, dtTileCacheParams& tcparams)
{ {
dtTileCacheParams& tcparams = builder_params.tcparams;
// Tile cache params. // Tile cache params.
memset(&tcparams, 0, sizeof(tcparams)); memset(&tcparams, 0, sizeof(tcparams));
rcVcopy(tcparams.orig, builder_params.gemo->GetMeshBoundsMin()); rcVcopy(tcparams.orig, builder_params.gemo->GetMeshBoundsMin());
@ -322,10 +321,11 @@ int NavMeshBuilder::RasterizeTileLayers(const int tx, const int ty,
bool NavMeshBuilder::CreateTileCache(BuilderParams& builder_params) bool NavMeshBuilder::CreateTileCache(BuilderParams& builder_params)
{ {
InitTileCacheParams(builder_params); dtTileCacheParams tcparams;
InitTileCacheParams(builder_params, tcparams);
builder_params.tile_cache = dtAllocTileCache(); builder_params.tile_cache = dtAllocTileCache();
dtStatus status = builder_params.tile_cache->init dtStatus status = builder_params.tile_cache->init
(&builder_params.tcparams, (&tcparams,
builder_params.talloc, builder_params.talloc,
builder_params.tcomp, builder_params.tcomp,
builder_params.tmproc); builder_params.tmproc);

View File

@ -21,7 +21,7 @@ public:
private: private:
void InitBuilderParams(BuilderParams& builder_params); void InitBuilderParams(BuilderParams& builder_params);
void InitTileCacheParams(BuilderParams& builder_params); void InitTileCacheParams(BuilderParams& builder_params, dtTileCacheParams& tcparams);
void InitNavMeshParams(BuilderParams& builder_params, dtNavMeshParams& params); void InitNavMeshParams(BuilderParams& builder_params, dtNavMeshParams& params);
void BuildTiles(BuilderParams& builder_params); void BuildTiles(BuilderParams& builder_params);
int RasterizeTileLayers(const int tx, const int ty, int RasterizeTileLayers(const int tx, const int ty,

View File

@ -293,7 +293,6 @@ struct BuilderParams
InputGeom* gemo = nullptr; InputGeom* gemo = nullptr;
rcConfig cfg; rcConfig cfg;
dtTileCacheParams tcparams;
MapInstance* map_instance = nullptr; MapInstance* map_instance = nullptr;
LinearAllocator* talloc = nullptr; LinearAllocator* talloc = nullptr;
FastLZCompressor* tcomp = nullptr; FastLZCompressor* tcomp = nullptr;