phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-04-25 21:03:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix map exploration by checking subzone bits instead of only the parent zone bit

Browse source
This commit is contained in:
Kelsi 2026-02-26 11:01:52 -08:00
parent 5d92152701
commit 66bcb0a712
2 changed files with 25 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/rendering/world_map.hpp
View file

@ -24,7 +24,7 @@ struct WorldMapZone {
float locLeft = 0, locRight = 0, locTop = 0, locBottom = 0; float locLeft = 0, locRight = 0, locTop = 0, locBottom = 0;
uint32_t displayMapID = 0; uint32_t displayMapID = 0;
uint32_t parentWorldMapID = 0; uint32_t parentWorldMapID = 0;
uint32_t exploreFlag = 0; std::vector<uint32_t> exploreBits; // all AreaBit indices (zone + subzones)
// Per-zone cached textures (owned by WorldMap::zoneTextures) // Per-zone cached textures (owned by WorldMap::zoneTextures)
VkTexture* tileTextures[12] = {}; VkTexture* tileTextures[12] = {};

39
src/rendering/world_map.cpp
View file

@ -276,13 +276,18 @@ void WorldMap::loadZonesFromDBC() {
} }
const auto* atL = activeLayout ? activeLayout->getLayout("AreaTable") : nullptr; const auto* atL = activeLayout ? activeLayout->getLayout("AreaTable") : nullptr;
// Map areaID → its own AreaBit, and parentAreaID → list of child AreaBits
std::unordered_map<uint32_t, uint32_t> exploreFlagByAreaId; std::unordered_map<uint32_t, uint32_t> exploreFlagByAreaId;
std::unordered_map<uint32_t, std::vector<uint32_t>> childBitsByParent;
auto areaDbc = assetManager->loadDBC("AreaTable.dbc"); auto areaDbc = assetManager->loadDBC("AreaTable.dbc");
if (areaDbc && areaDbc->isLoaded() && areaDbc->getFieldCount() > 3) { if (areaDbc && areaDbc->isLoaded() && areaDbc->getFieldCount() > 3) {
const uint32_t parentField = atL ? (*atL)["ParentAreaNum"] : 2;
for (uint32_t i = 0; i < areaDbc->getRecordCount(); i++) { for (uint32_t i = 0; i < areaDbc->getRecordCount(); i++) {
const uint32_t areaId = areaDbc->getUInt32(i, atL ? (*atL)["ID"] : 0); const uint32_t areaId = areaDbc->getUInt32(i, atL ? (*atL)["ID"] : 0);
const uint32_t exploreFlag = areaDbc->getUInt32(i, atL ? (*atL)["ExploreFlag"] : 3); const uint32_t exploreFlag = areaDbc->getUInt32(i, atL ? (*atL)["ExploreFlag"] : 3);
const uint32_t parentArea = areaDbc->getUInt32(i, parentField);
if (areaId != 0) exploreFlagByAreaId[areaId] = exploreFlag; if (areaId != 0) exploreFlagByAreaId[areaId] = exploreFlag;
if (parentArea != 0) childBitsByParent[parentArea].push_back(exploreFlag);
} }
} }
@ -308,9 +313,15 @@ void WorldMap::loadZonesFromDBC() {
zone.locBottom = wmaDbc->getFloat(i, wmaL ? (*wmaL)["LocBottom"] : 7); zone.locBottom = wmaDbc->getFloat(i, wmaL ? (*wmaL)["LocBottom"] : 7);
zone.displayMapID = wmaDbc->getUInt32(i, wmaL ? (*wmaL)["DisplayMapID"] : 8); zone.displayMapID = wmaDbc->getUInt32(i, wmaL ? (*wmaL)["DisplayMapID"] : 8);
zone.parentWorldMapID = wmaDbc->getUInt32(i, wmaL ? (*wmaL)["ParentWorldMapID"] : 10); zone.parentWorldMapID = wmaDbc->getUInt32(i, wmaL ? (*wmaL)["ParentWorldMapID"] : 10);
// Collect the zone's own AreaBit plus all subzone AreaBits
auto exploreIt = exploreFlagByAreaId.find(zone.areaID); auto exploreIt = exploreFlagByAreaId.find(zone.areaID);
if (exploreIt != exploreFlagByAreaId.end()) if (exploreIt != exploreFlagByAreaId.end())
zone.exploreFlag = exploreIt->second; zone.exploreBits.push_back(exploreIt->second);
auto childIt = childBitsByParent.find(zone.areaID);
if (childIt != childBitsByParent.end()) {
for (uint32_t bit : childIt->second)
zone.exploreBits.push_back(bit);
}
int idx = static_cast<int>(zones.size()); int idx = static_cast<int>(zones.size());
@ -730,16 +741,11 @@ glm::vec2 WorldMap::renderPosToMapUV(const glm::vec3& renderPos, int zoneIdx) co
// -------------------------------------------------------- // --------------------------------------------------------
void WorldMap::updateExploration(const glm::vec3& playerRenderPos) { void WorldMap::updateExploration(const glm::vec3& playerRenderPos) {
auto isExploreFlagSet = [this](uint32_t flag) -> bool { auto isBitSet = [this](uint32_t bitIndex) -> bool {
if (!hasServerExplorationMask || serverExplorationMask.empty() || flag == 0) return false; if (!hasServerExplorationMask || serverExplorationMask.empty()) return false;
const auto isSet = [this](uint32_t bitIndex) -> bool { const size_t word = bitIndex / 32;
const size_t word = bitIndex / 32; if (word >= serverExplorationMask.size()) return false;
if (word >= serverExplorationMask.size()) return false; return (serverExplorationMask[word] & (1u << (bitIndex % 32))) != 0;
return (serverExplorationMask[word] & (1u << (bitIndex % 32))) != 0;
};
if (isSet(flag)) return true;
if (flag > 0 && isSet(flag - 1)) return true;
return false;
}; };
bool markedAny = false; bool markedAny = false;
@ -747,10 +753,13 @@ void WorldMap::updateExploration(const glm::vec3& playerRenderPos) {
exploredZones.clear(); exploredZones.clear();
for (int i = 0; i < static_cast<int>(zones.size()); i++) { for (int i = 0; i < static_cast<int>(zones.size()); i++) {
const auto& z = zones[i]; const auto& z = zones[i];
if (z.areaID == 0 || z.exploreFlag == 0) continue; if (z.areaID == 0 || z.exploreBits.empty()) continue;
if (isExploreFlagSet(z.exploreFlag)) { for (uint32_t bit : z.exploreBits) {
exploredZones.insert(i); if (isBitSet(bit)) {
markedAny = true; exploredZones.insert(i);
markedAny = true;
break;
}
} }
} }
} }