phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-05-07 01:23:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

feat(adt): preserve MODF nameSet + scale fields across load/save round-trip

Browse source 
WMOPlacement struct gains nameSet and scale fields (defaulting to 0 and
1024 = 1.0). The loader now reads them when the entry is the full 64
bytes (WotLK+); the writer emits the actual values rather than always
hard-coding (0, 1024). Older expansions still round-trip cleanly because
defaults match the previous behaviour.
This commit is contained in:
Kelsi 2026-05-06 03:37:13 -07:00
parent 446b0970dc
commit db1968f2cc
3 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/pipeline/adt_loader.hpp
View file

@ -113,6 +113,8 @@ struct ADTTerrain {
float extentUpper[3];
uint16_t flags;
uint16_t doodadSet;
uint16_t nameSet = 0; // MODF nameSet (rare; usually 0)
uint16_t scale = 1024; // MODF scale * 1024 (1024 = 1.0)
};
std::vector<WMOPlacement> wmoPlacements;

7
src/pipeline/adt_loader.cpp
View file

@ -248,6 +248,13 @@ void ADTLoader::parseMODF(const uint8_t* data, size_t size, ADTTerrain& terrain)
placement.extentUpper[2] = readFloat(data, offset + 52);
placement.flags = readUInt16(data, offset + 56);
placement.doodadSet = readUInt16(data, offset + 58);
// WotLK MODF entries include trailing nameSet + scale (4 bytes); older
// expansions left them as padding.
if (offset + 64 <= size) {
placement.nameSet = readUInt16(data, offset + 60);
placement.scale = readUInt16(data, offset + 62);
if (placement.scale == 0) placement.scale = 1024;
}
terrain.wmoPlacements.push_back(placement);
}

9
tools/editor/adt_writer.cpp
View file

@ -154,11 +154,10 @@ void ADTWriter::writeMODF(std::vector<uint8_t>& buf, const pipeline::ADTTerrain&
writeFloat(buf, p.extentUpper[2]);
writeU16(buf, p.flags);
writeU16(buf, p.doodadSet);
// MODF entry is 64 bytes total; we wrote 60, pad with nameSet(0) + scale(1024).
// Loader treats entrySize as 64, so missing trailing bytes mis-align the
// next entry. scale=1024 = 1.0 in MODF's fixed-point u16 encoding.
writeU16(buf, 0);
writeU16(buf, 1024);
// MODF entry is 64 bytes total; the trailing nameSet + scale slots are
// populated when present (WotLK+) and default to (0, 1024) otherwise.
writeU16(buf, p.nameSet);
writeU16(buf, p.scale != 0 ? p.scale : 1024);
}
patchSize(buf, start);
}