josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tools/vmaps_extractor: Include cleanup

Browse Source
This commit is contained in:
Shauren
2025-11-02 13:03:52 +01:00
parent 9b3c20515d
commit d1a4551bc6
11 changed files with 81 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tools/vmap4_extractor/adtfile.cpp
+9 -7
View File
@@ -20,7 +20,10 @@
#include "Memory.h"
#include "StringFormat.h"
#include "Util.h"
#include "model.h"
#include "vmapexport.h"
#include "wmo.h"
#include <algorithm>
#include <cstdio>
std::string_view GetPlainName(std::string_view fileName)
@@ -92,15 +95,14 @@ bool ADTFile::init(uint32 map_num, uint32 originalMapId)
while (!_file.isEof())
{
char fourcc[5];
char fourcc[4];
_file.read(&fourcc,4);
_file.read(&size, 4);
flipcc(fourcc);
fourcc[4] = 0;
std::ranges::reverse(fourcc);
size_t nextpos = _file.getPos() + size;
if (!strcmp(fourcc,"MMDX"))
if (!memcmp(fourcc, "MMDX", 4))
{
if (size)
{
@@ -116,7 +118,7 @@ bool ADTFile::init(uint32 map_num, uint32 originalMapId)
}
}
}
else if (!strcmp(fourcc,"MWMO"))
else if (!memcmp(fourcc, "MWMO", 4))
{
if (size)
{
@@ -133,7 +135,7 @@ bool ADTFile::init(uint32 map_num, uint32 originalMapId)
}
}
//======================
else if (!strcmp(fourcc, "MDDF"))
else if (!memcmp(fourcc, "MDDF", 4))
{
if (size)
{
@@ -156,7 +158,7 @@ bool ADTFile::init(uint32 map_num, uint32 originalMapId)
ModelInstanceNames.clear();
}
}
else if (!strcmp(fourcc,"MODF"))
else if (!memcmp(fourcc, "MODF", 4))
{
if (size)
{
src/tools/vmap4_extractor/adtfile.h
+2 -2
View File
@@ -19,8 +19,8 @@
#define ADT_H
#include "cascfile.h"
#include "wmo.h"
#include "model.h"
#include "vec3d.h"
#include <vector>
#pragma pack(push, 1)
namespace ADT
src/tools/vmap4_extractor/cascfile.h
-8
View File
@@ -18,11 +18,9 @@
#ifndef MPQ_H
#define MPQ_H
#include "Define.h"
#include "CascHandles.h"
#include <memory>
#include <string>
#include <utility>
class CASCFile
{
@@ -50,10 +48,4 @@ public:
void close();
};
inline void flipcc(char *fcc)
{
std::swap(fcc[0], fcc[3]);
std::swap(fcc[1], fcc[2]);
}
#endif
src/tools/vmap4_extractor/model.h
+2 -1
View File
@@ -18,9 +18,10 @@
#ifndef MODEL_H
#define MODEL_H
#include "vec3d.h"
#include "modelheaders.h"
#include <string>
#include <vector>
#include <cstdio> // for FILE*
class CASCFile;
struct ADTOutputCache;
src/tools/vmap4_extractor/vec3d.h
+2 -180
View File
@@ -18,9 +18,6 @@
#ifndef VEC3D_H
#define VEC3D_H
#include <iostream>
#include <cmath>
class Vec3D
{
public:
@@ -34,36 +31,12 @@ public:
Vec3D operator+(Vec3D const& v) const
{
Vec3D r(x + v.x, y + v.y, z + v.z);
return r;
return Vec3D(*this) += v;
}
Vec3D operator-(Vec3D const& v) const
{
Vec3D r(x - v.x, y - v.y, z - v.z);
return r;
}
float operator*(Vec3D const& v) const
{
return x * v.x + y * v.y + z * v.z;
}
Vec3D operator*(float d) const
{
Vec3D r(x * d, y * d, z * d);
return r;
}
friend Vec3D operator*(float d, Vec3D const& v)
{
return v * d;
}
Vec3D operator%(Vec3D const& v) const
{
Vec3D r(y * v.z - z * v.y, z * v.x - x * v.z, x * v.y - y * v.x);
return r;
return Vec3D(*this) -= v;
}
Vec3D& operator+=(Vec3D const& v)
@@ -81,54 +54,6 @@ public:
z -= v.z;
return *this;
}
Vec3D& operator*=(float d)
{
x *= d;
y *= d;
z *= d;
return *this;
}
float lengthSquared() const
{
return x * x + y * y + z * z;
}
float length() const
{
return std::sqrt(lengthSquared());
}
Vec3D& normalize()
{
*this *= (1.0f / length());
return *this;
}
Vec3D operator~() const
{
Vec3D r(*this);
r.normalize();
return r;
}
friend std::istream& operator>>(std::istream& in, Vec3D& v)
{
in >> v.x >> v.y >> v.z;
return in;
}
friend std::ostream& operator<<(std::ostream& out, Vec3D const& v)
{
out << v.x << " " << v.y << " " << v.z;
return out;
}
operator float*()
{
return (float*)this;
}
};
class AaBox3D
@@ -145,109 +70,6 @@ public:
}
};
class Vec2D
{
public:
float x, y;
Vec2D(float x0 = 0.0f, float y0 = 0.0f) : x(x0), y(y0) { }
Vec2D(Vec2D const& v) = default;
Vec2D& operator=(Vec2D const& v) = default;
Vec2D operator+(Vec2D const& v) const
{
Vec2D r(x + v.x, y + v.y);
return r;
}
Vec2D operator-(Vec2D const& v) const
{
Vec2D r(x - v.x, y - v.y);
return r;
}
float operator*(Vec2D const& v) const
{
return x * v.x + y * v.y;
}
Vec2D operator*(float d) const
{
Vec2D r(x * d, y * d);
return r;
}
friend Vec2D operator*(float d, Vec2D const& v)
{
return v * d;
}
Vec2D& operator+=(Vec2D const& v)
{
x += v.x;
y += v.y;
return *this;
}
Vec2D& operator-=(Vec2D const& v)
{
x -= v.x;
y -= v.y;
return *this;
}
Vec2D& operator*=(float d)
{
x *= d;
y *= d;
return *this;
}
float lengthSquared() const
{
return x * x + y * y;
}
float length() const
{
return std::sqrt(lengthSquared());
}
Vec2D& normalize()
{
*this *= (1.0f / length());
return *this;
}
Vec2D operator~() const
{
Vec2D r(*this);
r.normalize();
return r;
}
friend std::istream& operator>>(std::istream& in, Vec2D& v)
{
in >> v.x >> v.y;
return in;
}
operator float*()
{
return (float*)this;
}
};
inline void rotate(float x0, float y0, float* x, float* y, float angle)
{
float xa = *x - x0;
float ya = *y - y0;
*x = xa*cosf(angle) - ya*sinf(angle) + x0;
*y = xa*sinf(angle) + ya*cosf(angle) + y0;
}
struct Quaternion
{
float X, Y, Z, W;
src/tools/vmap4_extractor/vmapexport.cpp
+2 -3
View File
@@ -32,14 +32,13 @@
#include "VMapDefinitions.h"
#include "wdtfile.h"
#include "wmo.h"
#include <CascLib.h>
#include <boost/filesystem/directory.hpp>
#include <boost/filesystem/operations.hpp>
#include <CascLib.h>
#include <algorithm>
#include <list>
#include <map>
#include <mutex>
#include <unordered_map>
#include <unordered_set>
#include <vector>
#include <cstdio>
src/tools/vmap4_extractor/vmapexport.h
-1
View File
@@ -22,7 +22,6 @@
#include <atomic>
#include <memory>
#include <string>
#include <unordered_map>
// flags of each spawn
enum ModelInstanceFlags
src/tools/vmap4_extractor/wdtfile.cpp
+11 -10
View File
@@ -15,14 +15,16 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "vmapexport.h"
#include "wdtfile.h"
#include "adtfile.h"
#include "Common.h"
#include "Errors.h"
#include "Memory.h"
#include "model.h"
#include "StringFormat.h"
#include "Util.h"
#include "vmapexport.h"
#include "wmo.h"
#include <algorithm>
#include <cstdio>
extern std::shared_ptr<CASC::Storage> CascStorage;
@@ -40,7 +42,7 @@ bool WDTFile::init(uint32 mapId)
if (_file.isEof())
return false;
char fourcc[5];
char fourcc[4];
uint32 size;
std::string dirname = Trinity::StringFormat("{}/dir_bin/{:04}", szWorkDirWmo, mapId);
@@ -56,28 +58,27 @@ bool WDTFile::init(uint32 mapId)
_file.read(fourcc,4);
_file.read(&size, 4);
flipcc(fourcc);
fourcc[4] = 0;
std::ranges::reverse(fourcc);
size_t nextpos = _file.getPos() + size;
if (!strcmp(fourcc, "MPHD"))
if (!memcmp(fourcc, "MPHD", 4))
{
ASSERT(size == sizeof(WDT::MPHD));
_file.read(&_header, sizeof(WDT::MPHD));
}
else if (!strcmp(fourcc,"MAIN"))
else if (!memcmp(fourcc, "MAIN", 4))
{
ASSERT(size == sizeof(WDT::MAIN));
_file.read(&_adtInfo, sizeof(WDT::MAIN));
}
else if (!strcmp(fourcc, "MAID"))
else if (!memcmp(fourcc, "MAID", 4))
{
ASSERT(size == sizeof(WDT::MAID));
_adtFileDataIds = std::make_unique<WDT::MAID>();
_file.read(_adtFileDataIds.get(), sizeof(WDT::MAID));
}
else if (!strcmp(fourcc,"MWMO"))
else if (!memcmp(fourcc, "MWMO", 4))
{
// global map objects
if (size)
@@ -94,7 +95,7 @@ bool WDTFile::init(uint32 mapId)
}
}
}
else if (!strcmp(fourcc, "MODF"))
else if (!memcmp(fourcc, "MODF", 4))
{
// global wmo instance data
if (size)
src/tools/vmap4_extractor/wdtfile.h
-1
View File
@@ -19,7 +19,6 @@
#define WDTFILE_H
#include "cascfile.h"
#include "wmo.h"
#include <memory>
#include <string>
#include <vector>
src/tools/vmap4_extractor/wmo.cpp
+52 -55
View File
@@ -15,18 +15,15 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "vmapexport.h"
#include "wmo.h"
#include "adtfile.h"
#include "cascfile.h"
#include "Errors.h"
#include "StringFormat.h"
#include "vec3d.h"
#include "VMapDefinitions.h"
#include "wmo.h"
#include "Util.h"
#include "VMapDefinitions.h"
#include "vmapexport.h"
#include <algorithm>
#include <fstream>
#include <map>
#include <cstdio>
#include <cstdlib>
@@ -50,19 +47,18 @@ bool WMORoot::open()
}
uint32 size;
char fourcc[5];
char fourcc[4];
while (!f.isEof())
{
f.read(fourcc,4);
f.read(&size, 4);
flipcc(fourcc);
fourcc[4] = 0;
std::ranges::reverse(fourcc);
size_t nextpos = f.getPos() + size;
if (!strcmp(fourcc,"MOHD")) // header
if (!memcmp(fourcc, "MOHD", 4)) // header
{
f.read(&nTextures, 4);
f.read(&nGroups, 4);
@@ -78,12 +74,12 @@ bool WMORoot::open()
f.read(&flags, 2);
f.read(&numLod, 2);
}
else if (!strcmp(fourcc, "MODS"))
else if (!memcmp(fourcc, "MODS", 4))
{
DoodadData.Sets.resize(size / sizeof(WMO::MODS));
f.read(DoodadData.Sets.data(), size);
}
else if (!strcmp(fourcc,"MODN"))
else if (!memcmp(fourcc, "MODN", 4))
{
ASSERT(!DoodadData.FileDataIds);
@@ -103,7 +99,7 @@ bool WMORoot::open()
ValidDoodadNames.insert(doodadNameIndex);
}
}
else if (!strcmp(fourcc, "MODI"))
else if (!memcmp(fourcc, "MODI", 4))
{
ASSERT(!DoodadData.Paths);
@@ -120,17 +116,17 @@ bool WMORoot::open()
ValidDoodadNames.insert(i);
}
}
else if (!strcmp(fourcc,"MODD"))
else if (!memcmp(fourcc, "MODD", 4))
{
DoodadData.Spawns.resize(size / sizeof(WMO::MODD));
f.read(DoodadData.Spawns.data(), size);
}
else if (!strcmp(fourcc, "MOGN"))
else if (!memcmp(fourcc, "MOGN", 4))
{
GroupNames.resize(size);
f.read(GroupNames.data(), size);
}
else if (!strcmp(fourcc, "GFID"))
else if (!memcmp(fourcc, "GFID", 4))
{
// full LOD reading code for reference
// commented out as we are not interested in any of them beyond first, most detailed
@@ -156,31 +152,31 @@ bool WMORoot::open()
//}
}
/*
else if (!strcmp(fourcc,"MOTX"))
else if (!memcmp(fourcc, "MOTX", 4))
{
}
else if (!strcmp(fourcc,"MOMT"))
else if (!memcmp(fourcc, "MOMT", 4))
{
}
else if (!strcmp(fourcc,"MOGI"))
else if (!memcmp(fourcc, "MOGI", 4))
{
}
else if (!strcmp(fourcc,"MOLT"))
else if (!memcmp(fourcc, "MOLT", 4))
{
}
else if (!strcmp(fourcc,"MOSB"))
else if (!memcmp(fourcc, "MOSB", 4))
{
}
else if (!strcmp(fourcc,"MOPV"))
else if (!memcmp(fourcc, "MOPV", 4))
{
}
else if (!strcmp(fourcc,"MOPT"))
else if (!memcmp(fourcc, "MOPT", 4))
{
}
else if (!strcmp(fourcc,"MOPR"))
else if (!memcmp(fourcc, "MOPR", 4))
{
}
else if (!strcmp(fourcc,"MFOG"))
else if (!memcmp(fourcc, "MFOG", 4))
{
}
*/
@@ -208,7 +204,9 @@ WMOGroup::WMOGroup(const std::string &filename) :
filename(filename), MPY2(nullptr), MOVX(nullptr), MOVT(nullptr), MOBA(nullptr), MobaEx(nullptr),
hlq(nullptr), LiquEx(nullptr), LiquBytes(nullptr), groupName(0), descGroupName(0), mogpFlags(0),
moprIdx(0), moprNItems(0), nBatchA(0), nBatchB(0), nBatchC(0), fogIdx(0),
groupLiquid(0), groupWMOID(0), moba_size(0), LiquEx_size(0),
groupLiquid(0), groupWMOID(0), mogpFlags2(0),
parentOrFirstChildSplitGroupIndex(0), nextSplitChildGroupIndex(0),
moba_size(0), LiquEx_size(0),
nVertices(0), nTriangles(0), liquflags(0)
{
memset(bbcorn1, 0, sizeof(bbcorn1));
@@ -224,17 +222,17 @@ bool WMOGroup::open(WMORoot* rootWMO)
return false;
}
uint32 size;
char fourcc[5] = { };
char fourcc[4] = { };
while (!f.isEof())
{
f.read(fourcc,4);
f.read(&size, 4);
flipcc(fourcc);
if (!strcmp(fourcc,"MOGP")) //size specified in MOGP chunk is all the other chunks combined, adjust to read MOGP-only
std::ranges::reverse(fourcc);
if (!memcmp(fourcc, "MOGP", 4)) //size specified in MOGP chunk is all the other chunks combined, adjust to read MOGP-only
size = 68;
size_t nextpos = f.getPos() + size;
if (!strcmp(fourcc,"MOGP"))//header
if (!memcmp(fourcc, "MOGP", 4))//header
{
f.read(&groupName, 4);
f.read(&descGroupName, 4);
@@ -264,7 +262,7 @@ bool WMOGroup::open(WMORoot* rootWMO)
if (groupLiquid && !IsLiquidIgnored(groupLiquid))
liquflags |= 2;
}
else if (!strcmp(fourcc,"MOPY"))
else if (!memcmp(fourcc, "MOPY", 4))
{
MPY2 = std::make_unique<uint16[]>(size);
std::unique_ptr<uint8[]> MOPY = std::make_unique<uint8[]>(size);
@@ -272,48 +270,48 @@ bool WMOGroup::open(WMORoot* rootWMO)
f.read(MOPY.get(), size);
std::copy_n(MOPY.get(), size, MPY2.get());
}
else if (!strcmp(fourcc,"MPY2"))
else if (!memcmp(fourcc, "MPY2", 4))
{
MPY2 = std::make_unique<uint16[]>(size / 2);
nTriangles = (int)size / 4;
f.read(MPY2.get(), size);
}
else if (!strcmp(fourcc,"MOVI"))
else if (!memcmp(fourcc, "MOVI", 4))
{
MOVX = std::make_unique<uint32[]>(size / 2);
std::unique_ptr<uint16[]> MOVI = std::make_unique<uint16[]>(size / 2);
f.read(MOVI.get(), size);
std::copy_n(MOVI.get(), size / 2, MOVX.get());
}
else if (!strcmp(fourcc,"MOVX"))
else if (!memcmp(fourcc, "MOVX", 4))
{
MOVX = std::make_unique<uint32[]>(size / 4);
f.read(MOVX.get(), size);
}
else if (!strcmp(fourcc,"MOVT"))
else if (!memcmp(fourcc, "MOVT", 4))
{
MOVT = new float[size/4];
MOVT = new float[size / 4];
f.read(MOVT, size);
nVertices = (int)size / 12;
}
else if (!strcmp(fourcc,"MONR"))
else if (!memcmp(fourcc, "MONR", 4))
{
}
else if (!strcmp(fourcc,"MOTV"))
else if (!memcmp(fourcc, "MOTV", 4))
{
}
else if (!strcmp(fourcc,"MOBA"))
else if (!memcmp(fourcc, "MOBA", 4))
{
MOBA = new uint16[size/2];
moba_size = size/2;
MOBA = new uint16[size / 2];
moba_size = size / 2;
f.read(MOBA, size);
}
else if (!strcmp(fourcc,"MODR"))
else if (!memcmp(fourcc, "MODR", 4))
{
DoodadReferences.resize(size / sizeof(uint16));
f.read(DoodadReferences.data(), size);
}
else if (!strcmp(fourcc,"MLIQ"))
else if (!memcmp(fourcc, "MLIQ", 4))
{
liquflags |= 1;
hlq = new WMOLiquidHeader();
@@ -341,12 +339,16 @@ bool WMOGroup::open(WMORoot* rootWMO)
if (IsLiquidIgnored(groupLiquid))
liquflags = 0;
/* std::ofstream llog("Buildings/liquid.log", ios_base::out | ios_base::app);
llog << filename;
llog << "\nbbox: " << bbcorn1[0] << ", " << bbcorn1[1] << ", " << bbcorn1[2] << " | " << bbcorn2[0] << ", " << bbcorn2[1] << ", " << bbcorn2[2];
llog << "\nlpos: " << hlq->pos_x << ", " << hlq->pos_y << ", " << hlq->pos_z;
llog << "\nx-/yvert: " << hlq->xverts << "/" << hlq->yverts << " size: " << size << " expected size: " << 30 + hlq->xverts*hlq->yverts*8 + hlq->xtiles*hlq->ytiles << std::endl;
llog.close(); */
/*
if (auto llog = Trinity::make_unique_ptr_with_deleter<&::fclose>(fopen("Buildings/liquid.log", "a")))
{
fprintf(llog.get(), "%s\n", filename.c_str());
fprintf(llog.get(), "type: %u\n", groupLiquid);
fprintf(llog.get(), "bbox: %f, %f, %f | %f, %f, %f\n", bbcorn1[0], bbcorn1[1], bbcorn1[2], bbcorn2[0], bbcorn2[1], bbcorn2[2]);
fprintf(llog.get(), "lpos: %f, %f, %f\n", hlq->pos_x, hlq->pos_y, hlq->pos_z);
fprintf(llog.get(), "x/y vert: %d/%d\n", hlq->xverts, hlq->yverts);
}
*/
}
f.seek((int)nextpos);
}
@@ -523,11 +525,6 @@ int WMOGroup::ConvertToVMAPGroupWmo(FILE* output, bool preciseVectorData)
int LIQU_h[] = { 0x5551494C, LIQU_totalSize };// "LIQU"
fwrite(LIQU_h, 4, 2, output);
/* std::ofstream llog("Buildings/liquid.log", ios_base::out | ios_base::app);
llog << filename;
llog << ":\nliquidEntry: " << liquidEntry << " type: " << hlq->type << " (root:" << rootWMO->flags << " group:" << flags << ")\n";
llog.close(); */
fwrite(&groupLiquid, sizeof(uint32), 1, output);
if (liquflags & 1)
{
@@ -569,7 +566,7 @@ bool WMOGroup::ShouldSkip(WMORoot const* root) const
if (mogpFlags & 0x4000000)
return true;
if (groupName < int32(root->GroupNames.size()) && !strcmp(&root->GroupNames[groupName], "antiportal"))
if (groupName < std::ssize(root->GroupNames) && !strcmp(&root->GroupNames[groupName], "antiportal"))
return true;
return false;
src/tools/vmap4_extractor/wmo.h
+1
View File
@@ -18,6 +18,7 @@
#ifndef WMO_H
#define WMO_H
#include "Define.h"
#include "vec3d.h"
#include <memory>
#include <string>