Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-06 17:08:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tools/MMaps: corrected hole format for terrain builder

Browse Source
This commit is contained in:
Ovahlord
2020-03-05 19:40:46 +01:00
parent 6f5ac9d93c
commit d4ede67e1b
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/tools/mmaps_generator/TerrainBuilder.cpp
View File

@@ -177,7 +177,7 @@ namespace MMAP
}
// data used later
uint8 holes[16][16][8];
uint16 holes[16][16];
memset(holes, 0, sizeof(holes));
uint16 liquid_entry[16][16];
memset(liquid_entry, 0, sizeof(liquid_entry));
@@ -611,17 +611,22 @@ namespace MMAP
coord[2] = v[index2];
}
static uint16 holetab_h[4] = { 0x1111, 0x2222, 0x4444, 0x8888 };
static uint16 holetab_v[4] = { 0x000F, 0x00F0, 0x0F00, 0xF000 };
/**************************************************************************/
bool TerrainBuilder::isHole(int square, uint8 const holes[16][16][8])
bool TerrainBuilder::isHole(int square, const uint16 holes[16][16])
{
int row = square / 128;
int col = square % 128;
int cellRow = row / 8; // 8 squares per cell
int cellCol = col / 8;
int holeRow = row % 8;
int holeCol = (square - (row * 128 + cellCol * 8));
int holeRow = row % 8 / 2;
int holeCol = (square - (row * 128 + cellCol * 8)) / 2;
return (holes[cellRow][cellCol][holeRow] & (1 << holeCol)) != 0;
uint16 hole = holes[cellRow][cellCol];
return (hole & holetab_h[holeCol] & holetab_v[holeRow]) != 0;
}
/**************************************************************************/

2
src/tools/mmaps_generator/TerrainBuilder.h
View File

@@ -112,7 +112,7 @@ namespace MMAP
void getHeightTriangle(int square, Spot triangle, int* indices, bool liquid = false);
/// Determines if the specific position's triangles should be rendered
bool isHole(int square, uint8 const holes[16][16][8]);
bool isHole(int square, uint16 const holes[16][16]);
/// Get the liquid vector coordinate for a specific position
void getLiquidCoord(int index, int index2, float xOffset, float yOffset, float* coord, float* v);