editor: copy-paste fixes

This commit is contained in:
Turánszki János
2022-03-13 11:17:24 +01:00
parent 344dfdd826
commit cedcbcb2f6
2 changed files with 2 additions and 15 deletions
+2 -6
View File
@@ -979,6 +979,8 @@ void EditorComponent::Update(float dt)
{
wi::profiler::range_id profrange = wi::profiler::BeginRangeCPU("Editor Update");
translator.Update(*this);
Scene& scene = wi::scene::GetScene();
CameraComponent& camera = wi::scene::GetCamera();
@@ -1441,12 +1443,10 @@ void EditorComponent::Update(float dt)
EntitySerializer seri;
clipboard.SetReadModeAndResetPos(false);
clipboard << prevSel.size();
translator.PreTranslate();
for (auto& x : prevSel)
{
scene.Entity_Serialize(clipboard, seri, x);
}
translator.PostTranslate();
if (wi::input::Press((wi::input::BUTTON)'X'))
{
@@ -1488,7 +1488,6 @@ void EditorComponent::Update(float dt)
RecordSelection(archive);
auto& prevSel = translator.selectedEntitiesNonRecursive;
translator.PreTranslate();
wi::vector<Entity> addedEntities;
for (auto& x : prevSel)
{
@@ -1496,7 +1495,6 @@ void EditorComponent::Update(float dt)
picked.entity = scene.Entity_Duplicate(x);
addedEntities.push_back(picked.entity);
}
translator.PostTranslate();
ClearSelected();
@@ -1685,8 +1683,6 @@ void EditorComponent::Update(float dt)
}
}
translator.Update(*this);
if (translator.IsDragEnded())
{
wi::Archive& archive = AdvanceHistory();
-9
View File
@@ -594,8 +594,6 @@ void Translator::PostTranslate()
TransformComponent* transform_selected = scene.transforms.GetComponent(x);
if (transform_selected != nullptr)
{
XMFLOAT4X4 worldPrev = transform_selected->world;
transform_selected->UpdateTransform_Parented(transform);
// selected to world space:
@@ -611,13 +609,6 @@ void Translator::PostTranslate()
transform_selected->MatrixTransform(XMMatrixInverse(nullptr, XMLoadFloat4x4(&transform_parent->world)));
}
}
// Restore worldPrev, so velocity buffer is correctly updated:
// (Only when dragging, otherwise if it's released, we want to record the matrix properly for undo)
if (dragging)
{
transform_selected->world = worldPrev;
}
}
}
}