1f9b284de2
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> # Conflicts: # Code/Editor/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin_precompiled.h # Code/Editor/Plugins/EditorCommon/EditorCommon_precompiled.h # Code/Editor/Plugins/EditorCommon/stdafx.cpp # Code/Editor/Plugins/FFMPEGPlugin/FFMPEGPlugin_precompiled.h # Code/Editor/Plugins/PerforcePlugin/PerforcePlugin_precompiled.h # Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsTool_precompiled.h # Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFramework_precompiled.h # Code/Tools/AssetProcessor/native/precompiled.h # Code/Tools/Standalone/StandaloneTools_precompiled.h # Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer_precompiled.h # Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessing_precompiled.h # Gems/Atom/RHI/DX12/Code/Source/RHI/Atom_RHI_DX12_precompiled.h # Gems/Atom/RHI/Metal/Code/Include/Platform/Mac/Atom_RHI_Metal_precompiled_Platform.h # Gems/Atom/RHI/Metal/Code/Include/Platform/iOS/Atom_RHI_Metal_precompiled_Platform.h # Gems/Atom/RHI/Metal/Code/Source/Atom_RHI_Metal_precompiled.h # Gems/Atom/RHI/Metal/Code/atom_rhi_metal_common_files.cmake # Gems/Atom/RHI/Null/Code/Source/Atom_RHI_Null_precompiled.h # Gems/Atom/RHI/Null/Code/atom_rhi_null_common_files.cmake # Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/Atom_RHI_Vulkan_precompiled_Platform.h # Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/Atom_RHI_Vulkan_precompiled_Platform.h # Gems/Atom/RHI/Vulkan/Code/Include/Platform/Mac/Atom_RHI_Vulkan_precompiled_Platform.h # Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/Atom_RHI_Vulkan_precompiled_Platform.h # Gems/Atom/RHI/Vulkan/Code/Source/Atom_RHI_Vulkan_precompiled.h # Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp # Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_common_files.cmake # Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont_precompiled.h # Gems/Blast/Code/Source/StdAfx.cpp # Gems/Camera/Code/Source/Camera_precompiled.h # Gems/EMotionFX/Code/Source/EMotionFX_precompiled.h # Gems/FastNoise/Code/Source/FastNoise_precompiled.h # Gems/Gestures/Code/Source/Gestures_precompiled.h # Gems/GradientSignal/Code/Source/GradientSignal_precompiled.h # Gems/GraphCanvas/Code/precompiled.h # Gems/ImGui/Code/Source/ImGui_precompiled.h # Gems/InAppPurchases/Code/Source/InAppPurchases_precompiled.h # Gems/LmbrCentral/Code/Source/LmbrCentral_precompiled.h # Gems/LmbrCentral/Code/Tests/ShapeGeometryUtilTest.cpp # Gems/LyShine/Code/Editor/UiCanvasEditor_precompiled.h # Gems/LyShine/Code/Source/Animation/LyShine_precompiled.h # Gems/LyShine/Code/Source/LyShine_precompiled.h # Gems/LyShineExamples/Code/Source/LyShineExamples_precompiled.h # Gems/Maestro/Code/Source/Cinematics/Maestro_precompiled.h # Gems/Maestro/Code/Source/Maestro_precompiled.h # Gems/MessagePopup/Code/Source/MessagePopup_precompiled.h # Gems/Metastream/Code/Source/Metastream_precompiled.h # Gems/Microphone/Code/Source/Microphone_precompiled.h # Gems/Multiplayer/Code/Source/Multiplayer_precompiled.h # Gems/PhysX/Code/NumericalMethods/Source/NumericalMethods_precompiled.h # Gems/PhysX/Code/Source/PhysXUnsupported_precompiled.h # Gems/PhysX/Code/Source/PhysX_precompiled.h # Gems/PhysX/Code/physx_unsupported_files.cmake # Gems/PhysXDebug/Code/Source/PhysXDebugUnsupported_precompiled.h # Gems/PhysXDebug/Code/Source/PhysXDebug_precompiled.h # Gems/ScriptCanvas/Code/Editor/precompiled.h # Gems/ScriptCanvas/Code/Source/precompiled.h # Gems/ScriptCanvasDeveloper/Code/Source/precompiled.h # Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysics_precompiled.h # Gems/ScriptEvents/Code/Source/precompiled.h # Gems/ScriptEvents/Code/Tests/Editor/EditorTests.cpp # Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweener_precompiled.h # Gems/SliceFavorites/Code/Source/SliceFavorites_precompiled.h # Gems/StartingPointCamera/Code/Source/StartingPointCamera_precompiled.h # Gems/StartingPointInput/Code/Source/StartingPointInput_precompiled.h # Gems/StartingPointMovement/Code/Source/StartingPointMovement_precompiled.h # Gems/SurfaceData/Code/Source/SurfaceData_precompiled.h # Gems/TextureAtlas/Code/Source/TextureAtlas_precompiled.h # Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewer_precompiled.h # Gems/Twitch/Code/Source/Twitch_precompiled.h # Gems/VirtualGamepad/Code/Source/VirtualGamepad_precompiled.h # Gems/WhiteBox/Code/Source/WhiteBoxUnsupported_precompiled.h # Gems/WhiteBox/Code/Source/WhiteBox_precompiled.h
118 lines
4.6 KiB
C++
118 lines
4.6 KiB
C++
/*
|
|
* Copyright (c) Contributors to the Open 3D Engine Project.
|
|
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0 OR MIT
|
|
*
|
|
*/
|
|
#include "BaseSliceCommand.h"
|
|
#include <AzToolsFramework/Entity/SliceEditorEntityOwnershipServiceBus.h>
|
|
|
|
namespace AzToolsFramework
|
|
{
|
|
BaseSliceCommand::BaseSliceCommand(const AZStd::string& friendlyName)
|
|
: UndoSystem::URSequencePoint(friendlyName)
|
|
, m_changed(true)
|
|
{
|
|
}
|
|
|
|
bool BaseSliceCommand::CaptureRestoreInfoForUndo(const AZ::EntityId& entityId)
|
|
{
|
|
AZ::SliceComponent* editorRootSlice = nullptr;
|
|
AzToolsFramework::SliceEditorEntityOwnershipServiceRequestBus::BroadcastResult(editorRootSlice,
|
|
&AzToolsFramework::SliceEditorEntityOwnershipServiceRequestBus::Events::GetEditorRootSlice);
|
|
|
|
AZ::SliceComponent::EntityRestoreInfo restoreInfo;
|
|
AZ::SliceComponent::SliceInstanceAddress owningSlice = editorRootSlice->FindSlice(entityId);
|
|
|
|
// If no owning slice then store with an empty restore info
|
|
// We'll only need to detach the entity on undo
|
|
if (!owningSlice.IsValid())
|
|
{
|
|
m_entityUndoRestoreInfoArray.emplace_back(entityId, restoreInfo);
|
|
|
|
return true;
|
|
}
|
|
|
|
// Gather restore info so that on undo we can return this entity
|
|
// to its original owning slice instance
|
|
if (editorRootSlice->GetEntityRestoreInfo(entityId, restoreInfo))
|
|
{
|
|
m_entityUndoRestoreInfoArray.emplace_back(entityId, restoreInfo);
|
|
}
|
|
else
|
|
{
|
|
AZ_Error("CreateSliceCommand::Capture",
|
|
false,
|
|
"Failed to capture RestoreInfo for entity with Id: %s owned by sliceInstance with asset Id: %s. Unable to capture undo/redo state",
|
|
entityId.ToString().c_str(),
|
|
owningSlice.GetReference()->GetSliceAsset().GetId().ToString<AZStd::string>().c_str());
|
|
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
void BaseSliceCommand::RestoreEntities(AZ::SliceComponent::EntityRestoreInfoList& entitiesToRestore,
|
|
bool clearRestoreList /*=false*/,
|
|
SliceEntityRestoreType restoreType /*=SliceEntityRestoreType::Detached*/)
|
|
{
|
|
AZ::SliceComponent* editorRootSlice = nullptr;
|
|
AzToolsFramework::SliceEditorEntityOwnershipServiceRequestBus::BroadcastResult(editorRootSlice,
|
|
&AzToolsFramework::SliceEditorEntityOwnershipServiceRequestBus::Events::GetEditorRootSlice);
|
|
|
|
if (!editorRootSlice)
|
|
{
|
|
AZ_Assert(false,
|
|
"BaseSliceCommand::RestoreEntities: GetEditorRootSlice returned nullptr. Unable to proceed.");
|
|
|
|
return;
|
|
}
|
|
|
|
AzToolsFramework::EntityIdList detachedEntities;
|
|
for (const auto& restoreInfoPair : entitiesToRestore)
|
|
{
|
|
const AZ::EntityId& entityId = restoreInfoPair.first;
|
|
const AZ::SliceComponent::EntityRestoreInfo& restoreInfo = restoreInfoPair.second;
|
|
|
|
AZ::Entity* entity = editorRootSlice->FindEntity(entityId);
|
|
|
|
if (!entity)
|
|
{
|
|
AZ_Error("BaseSliceCommand::RestoreEntities",
|
|
false,
|
|
"Unable to find entity with Id: %s in the EditorEntityContext. Cannot complete operation and restore entity",
|
|
entityId.ToString().c_str());
|
|
|
|
return;
|
|
}
|
|
|
|
// Detach the entity from whatever slice instance owned it before and place it directly in the root slice
|
|
editorRootSlice->RemoveEntity(entity, false);
|
|
editorRootSlice->AddEntity(entity);
|
|
|
|
if (restoreInfo)
|
|
{
|
|
SliceEditorEntityOwnershipServiceRequestBus::Broadcast(
|
|
&SliceEditorEntityOwnershipServiceRequestBus::Events::RestoreSliceEntity, entity, restoreInfo, restoreType);
|
|
}
|
|
else
|
|
{
|
|
// An invalid restoreInfo implies no slice to restore to
|
|
// Detaching the entity is all that's needed
|
|
detachedEntities.emplace_back(entity->GetId());
|
|
}
|
|
}
|
|
|
|
// RestoreSliceEntity will update slice info for the entities passed in. Only need to handle entities that weren't restored that way.
|
|
SliceEditorEntityOwnershipServiceNotificationBus::Broadcast(
|
|
&SliceEditorEntityOwnershipServiceNotificationBus::Events::OnEditorEntitiesSliceOwnershipChanged, detachedEntities);
|
|
|
|
if (clearRestoreList)
|
|
{
|
|
entitiesToRestore.clear();
|
|
}
|
|
}
|
|
}
|