diff options
Diffstat (limited to 'src/tools/vmap4_assembler/TileAssembler.cpp')
| -rw-r--r-- | src/tools/vmap4_assembler/TileAssembler.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/tools/vmap4_assembler/TileAssembler.cpp b/src/tools/vmap4_assembler/TileAssembler.cpp index b3a0af3f008..c9c652d0f16 100644 --- a/src/tools/vmap4_assembler/TileAssembler.cpp +++ b/src/tools/vmap4_assembler/TileAssembler.cpp @@ -32,7 +32,8 @@ template<> struct BoundsTrait<VMAP::ModelSpawn*> { - static void getBounds(VMAP::ModelSpawn const* const& obj, G3D::AABox& out) { out = obj->getBounds(); } + static void getBounds(VMAP::ModelSpawn const* obj, G3D::AABox& out) { out = obj->getBounds(); } + void operator()(VMAP::ModelSpawn const* obj, G3D::AABox& out) const { getBounds(obj, out); } }; namespace VMAP @@ -197,7 +198,7 @@ namespace VMAP try { - pTree.build(mapSpawns, BoundsTrait<ModelSpawn*>::getBounds); + pTree.build(mapSpawns, BoundsTrait<ModelSpawn*>()); } catch (std::exception& e) { @@ -348,7 +349,7 @@ namespace VMAP if (groups != 1) printf("Warning: '%s' does not seem to be a M2 model!\n", modelFilename.string().c_str()); - G3D::AABox rotated_bounds; + G3D::AABox rotated_bounds = G3D::AABox::empty(); for (int i = 0; i < 8; ++i) rotated_bounds.merge(modelPosition.transform(raw_model.groupsArray[0].bounds.corner(i))); @@ -440,7 +441,7 @@ namespace VMAP continue; spawnedModelFiles.insert(model_name); - G3D::AABox bounds; + G3D::AABox bounds = G3D::AABox::empty(); for (GroupModel_Raw const& groupModel : raw_model.groupsArray) for (G3D::Vector3 const& vertice : groupModel.vertexArray) bounds.merge(vertice); |