natsirt/noggit-red
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update context menu object replace

Browse Source
This commit is contained in:
T1ti
2024-07-18 19:34:10 +02:00
parent 04b993b6d5
commit b5c96babd9
1 changed files with 34 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
src/noggit/MapView.cpp
View File

@@ -6215,54 +6215,47 @@ void MapView::ShowContextMenu(QPoint pos)
if (terrainMode != editing_mode::object && NOGGIT_CUR_ACTION) if (terrainMode != editing_mode::object && NOGGIT_CUR_ACTION)
return; return;
// verify this
NOGGIT_ACTION_MGR->beginAction(this, Noggit::ActionFlags::eOBJECTS_ADDED | Noggit::ActionFlags::eOBJECTS_REMOVED); // Noggit::ActionFlags::eOBJECTS_TRANSFORMED
// NOGGIT_ACTION_MGR->beginAction(this, Noggit::ActionFlags::eOBJECTS_TRANSFORMED);
if (!objectEditor->clipboardSize()) if (!objectEditor->clipboardSize())
return; return;
// verify this
NOGGIT_ACTION_MGR->beginAction(this, Noggit::ActionFlags::eOBJECTS_ADDED | Noggit::ActionFlags::eOBJECTS_REMOVED); // Noggit::ActionFlags::eOBJECTS_TRANSFORMED
// get the model to replace by // get the model to replace by
auto replace_select = objectEditor->getClipboard().front(); auto replace_select = objectEditor->getClipboard().front();
auto replace_obj = std::get<selected_object_type>(replace_select); auto replacement_obj = std::get<selected_object_type>(replace_select);
// bool replace_is_wmo = replace_obj->which() == eWMO; auto& replace_path = replacement_obj->instance_model()->file_key().filepath();
auto& replace_path = replace_obj->instance_model()->file_key().filepath();
std::vector<SceneObject*> objects_to_delete;
// iterate selection (objects to replace) // iterate selection (objects to replace)
for (auto& source_obj : _world->get_selected_objects()) std::vector<selected_object_type> selected_objects = _world->get_selected_objects();
for (SceneObject* old_obj : selected_objects)
{ {
if (old_obj->instance_model()->file_key().filepath() == replace_path)
math::degrees::vec3 source_rot(math::degrees(0)._, math::degrees(0)._, math::degrees(0)._);
source_rot = source_obj->dir;
float source_scale = source_obj->scale;
auto source_pos = source_obj->pos;
if (source_obj->instance_model()->file_key().filepath() == replace_path)
continue; continue;
// TODO : Test if this breaks if clipboard is empty math::degrees::vec3 source_rot(math::degrees(0)._, math::degrees(0)._, math::degrees(0)._);
source_rot = old_obj->dir;
float source_scale = old_obj->scale;
glm::vec3 source_pos = old_obj->pos;
if (replace_obj->which() == eWMO) // _world->deleteInstance(old_obj->uid);
objects_to_delete.emplace_back(old_obj);
if (replacement_obj->which() == eWMO)
{ {
// if (!replace_is_wmo) // auto replace_wmo = static_cast<WMOInstance*>(replacement_obj);
// continue; // auto source_wmo = static_cast<WMOInstance*>(old_obj);
// auto replace_wmo = static_cast<WMOInstance*>(replace_obj);
// auto source_wmo = static_cast<WMOInstance*>(source_obj);
auto new_obj = _world->addWMOAndGetInstance(replace_path, source_pos, source_rot); auto new_obj = _world->addWMOAndGetInstance(replace_path, source_pos, source_rot);
// new_obj->wmo->wait_until_loaded(); new_obj->wmo->wait_until_loaded();
// new_obj->wmo->waitForChildrenLoaded(); new_obj->wmo->waitForChildrenLoaded();
new_obj->recalcExtents(); new_obj->recalcExtents();
_world->deleteWMOInstance(source_obj->uid);
} }
else if (replace_obj->which() == eMODEL) else if (replacement_obj->which() == eMODEL)
{ {
// if (replace_is_wmo) // auto replace_m2 = static_cast<ModelInstance*>(replacement_obj);
// continue;
// auto replace_m2 = static_cast<ModelInstance*>(replace_obj);
// auto source_m2 = static_cast<ModelInstance*>(source_obj); // auto source_m2 = static_cast<ModelInstance*>(source_obj);
// Just swapping model // Just swapping model
@@ -6272,7 +6265,6 @@ void MapView::ShowContextMenu(QPoint pos)
// source_m2->recalcExtents(); // source_m2->recalcExtents();
// _world->updateTilesEntry(entry, model_update::add); // _world->updateTilesEntry(entry, model_update::add);
auto new_obj = _world->addM2AndGetInstance(replace_path auto new_obj = _world->addM2AndGetInstance(replace_path
, source_pos , source_pos
, source_scale , source_scale
@@ -6280,16 +6272,21 @@ void MapView::ShowContextMenu(QPoint pos)
, &_object_paste_params , &_object_paste_params
, true , true
); );
// new_obj->model->wait_until_loaded(); new_obj->model->wait_until_loaded();
// new_obj->model->waitForChildrenLoaded(); new_obj->model->waitForChildrenLoaded();
new_obj->recalcExtents(); new_obj->recalcExtents();
_world->deleteModelInstance(source_obj->uid);
} }
} }
// can cause the usual crash of deleting models overlapping unloaded tiles. // can cause the usual crash of deleting models overlapping unloaded tiles.
// DeleteSelectedObjects(); // _world->delete_selected_models();
// NOGGIT_ACTION_MGR->beginAction(this, Noggit::ActionFlags::eOBJECTS_REMOVED); // NOGGIT_ACTION_MGR->beginAction(this, Noggit::ActionFlags::eOBJECTS_REMOVED);
// this would also delete models that got skipped
// _world->delete_selected_models();
_world->deleteObjects(objects_to_delete);
_world->reset_selection();
NOGGIT_ACTION_MGR->endAction(); NOGGIT_ACTION_MGR->endAction();
}); });