fix(Core/Collision): typo in VMap BIH generation. (#7066)

* Core/Collision: Fix typo in VMap BIH generation.

Fixed #5768.

* Bump vmap and mmap versions.

* chore: update data version in the bash installer
This commit is contained in:
UltraNix
2021-08-08 12:21:29 +02:00
committed by GitHub
parent f01cb2d71b
commit 261d5c62cd
6 changed files with 9 additions and 9 deletions

View File

@@ -148,6 +148,7 @@ void BIH::subdivide(int left, int right, std::vector<uint32>& tempTree, buildDat
else if (left > right)
{
// all right
right = rightOrig;
if (prevAxis == axis && G3D::fuzzyEq(prevSplit, split))
{
// we are stuck here - create a leaf
@@ -155,7 +156,6 @@ void BIH::subdivide(int left, int right, std::vector<uint32>& tempTree, buildDat
createNode(tempTree, nodeIndex, left, right);
return;
}
right = rightOrig;
if (clipR >= split)
{
// keep looping on right half

View File

@@ -13,7 +13,7 @@
#define SIZE_OF_GRIDS 533.3333f
#define MMAP_MAGIC 0x4d4d4150 // 'MMAP'
#define MMAP_VERSION 11
#define MMAP_VERSION 12
struct MmapTileHeader
{

View File

@@ -12,8 +12,8 @@
namespace VMAP
{
const char VMAP_MAGIC[] = "VMAP_4.5";
const char RAW_VMAP_MAGIC[] = "VMAP045"; // used in extracted vmap files with raw data
const char VMAP_MAGIC[] = "VMAP_4.6";
const char RAW_VMAP_MAGIC[] = "VMAP046"; // used in extracted vmap files with raw data
const char GAMEOBJECT_MODELS[] = "GameObjectModels.dtree";
// defined in TileAssembler.cpp currently...