phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-05-06 17:13:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix(editor): remove nested upload batch, add instance creation diagnostics

Browse source
This commit is contained in:
Kelsi 2026-05-06 00:16:25 -07:00
parent a845723635
commit e97d6d0c23
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
tools/editor/editor_viewport.cpp
View file

@ -119,7 +119,7 @@ void EditorViewport::rebuildObjects(const std::vector<PlacedObject>& objects,
clearObjects();
if (objects.empty() && npcs.empty()) return;
vkCtx_->beginUploadBatch();
// Don't call beginUploadBatch here — loadModel starts its own batch
uint32_t nextModelId = 1;
std::unordered_map<std::string, uint32_t> m2ModelIds, wmoModelIds;
@ -385,9 +385,14 @@ void EditorViewport::rebuildObjects(const std::vector<PlacedObject>& objects,
}
for (const auto& npc : npcs) {
auto it = m2ModelIds.find(npc.modelPath);
if (it == m2ModelIds.end()) continue;
if (it == m2ModelIds.end()) {
LOG_WARNING("NPC instance skip — no loaded model for: ", npc.modelPath);
continue;
}
glm::vec3 rotRad = glm::radians(glm::vec3(0, 0, npc.orientation));
m2Renderer_->createInstance(it->second, npc.position, rotRad, npc.scale);
uint32_t instId = m2Renderer_->createInstance(it->second, npc.position, rotRad, npc.scale);
LOG_WARNING("NPC instance created: id=", instId, " modelId=", it->second,
" pos=(", npc.position.x, ",", npc.position.y, ",", npc.position.z, ")");
}
// Update NPC markers via dedicated method