Merge pull request o3de#17646 from aws-lumberyard-dev/daimini/SliceLevelUiRedCode/SliceLayers

Slice Level UI Removal | Delete Slice Layers UI

Author: AMZN-daimini

Code/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.cpp

@@ -46,7 +46,6 @@
 #include <AzToolsFramework/Entity/SliceEditorEntityOwnershipServiceBus.h>
 #include <AzToolsFramework/Slice/SliceUtilities.h>
 #include <AzToolsFramework/ToolsComponents/EditorComponentBase.h>
-#include <AzToolsFramework/ToolsComponents/EditorLayerComponent.h>
 #include <AzToolsFramework/ToolsComponents/GenericComponentWrapper.h>
 #include <AzToolsFramework/ToolsComponents/TransformComponent.h>
 #include <AzToolsFramework/UI/Slice/SliceRelationshipBus.h>
@@ -735,12 +734,6 @@ void AzAssetBrowserRequestHandler::AddContextMenuActions(QWidget* caller, QMenu*
                         });
                 }
             }
-            else if (AzFramework::StringFunc::Equal(
-                         extension.c_str(), AzToolsFramework::Layers::EditorLayerComponent::GetLayerExtensionWithDot().c_str(), false))
-            {
-                QString levelPath = Path::GetPath(GetIEditor()->GetDocument()->GetActivePathName());
-                AzToolsFramework::Layers::EditorLayerComponent::CreateLayerAssetContextMenu(menu, fullFilePath, levelPath);
-            }
 
             if (!products.empty() || (entry->GetEntryType() == AssetBrowserEntry::AssetEntryType::Source))
             {

Code/Editor/CryEditDoc.cpp

@@ -31,7 +31,6 @@
 #include <AzToolsFramework/ComponentMode/EditorComponentModeBus.h>
 #include <AzToolsFramework/Slice/SliceUtilities.h>
 #include <AzToolsFramework/UI/UICore/WidgetHelpers.h>
-#include <AzToolsFramework/UI/Layer/NameConflictWarning.hxx>
 #include <AzToolsFramework/API/EditorLevelNotificationBus.h>
 
 // Editor
@@ -928,12 +927,6 @@ bool CCryEditDoc::OnSaveDocument(const QString& lpszPathName)
 
 bool CCryEditDoc::BeforeSaveDocument(const QString& lpszPathName, TSaveDocContext& context)
 {
-    // Don't save level data if any conflict exists
-    if (HasLayerNameConflicts())
-    {
-        return false;
-    }
-
     // Restore directory to root.
     QDir::setCurrent(GetIEditor()->GetPrimaryCDFolder());
 
@@ -954,35 +947,6 @@ bool CCryEditDoc::BeforeSaveDocument(const QString& lpszPathName, TSaveDocContex
     return true;
 }
 
-bool CCryEditDoc::HasLayerNameConflicts() const
-{
-    AZStd::vector<AZ::Entity*> editorEntities;
-    AzToolsFramework::EditorEntityContextRequestBus::Broadcast(
-        &AzToolsFramework::EditorEntityContextRequestBus::Events::GetLooseEditorEntities,
-        editorEntities);
-
-    AZStd::unordered_map<AZStd::string, int> nameConflictMapping;
-    for (AZ::Entity* entity : editorEntities)
-    {
-        AzToolsFramework::Layers::EditorLayerComponentRequestBus::Event(
-            entity->GetId(),
-            &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::UpdateLayerNameConflictMapping,
-            nameConflictMapping);
-    }
-
-    if (!nameConflictMapping.empty())
-    {
-        AzToolsFramework::Layers::NameConflictWarning* nameConflictWarning = new AzToolsFramework::Layers::NameConflictWarning(
-            MainWindow::instance(),
-            nameConflictMapping);
-        nameConflictWarning->exec();
-
-        return true;
-    }
-
-    return false;
-}
-
 bool CCryEditDoc::DoSaveDocument(const QString& filename, TSaveDocContext& context)
 {
     bool& bSaved = context.bSaved;
@@ -1201,38 +1165,6 @@ bool CCryEditDoc::SaveLevel(const QString& filename)
             &AzToolsFramework::EditorEntityContextRequestBus::Events::GetLooseEditorEntities,
             editorEntities);
 
-        AZStd::vector<AZ::Entity*> layerEntities;
-        AZ::SliceComponent::SliceReferenceToInstancePtrs instancesInLayers;
-        for (AZ::Entity* entity : editorEntities)
-        {
-            AzToolsFramework::Layers::LayerResult layerSaveResult(AzToolsFramework::Layers::LayerResult::CreateSuccess());
-            AzToolsFramework::Layers::EditorLayerComponentRequestBus::EventResult(
-                layerSaveResult,
-                entity->GetId(),
-                &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::WriteLayerAndGetEntities,
-                newLevelFolder,
-                layerEntities,
-                instancesInLayers);
-            layerSaveResult.MessageResult();
-        }
-
-        AZ::IO::ByteContainerStream<AZStd::vector<char>> entitySaveStream(&entitySaveBuffer);
-        {
-            AZ_PROFILE_SCOPE(Editor, "CCryEditDoc::SaveLevel Save Entities To Stream");
-            AzToolsFramework::EditorEntityContextRequestBus::BroadcastResult(
-                savedEntities,
-                &AzToolsFramework::EditorEntityContextRequestBus::Events::SaveToStreamForEditor,
-                entitySaveStream,
-                layerEntities,
-                instancesInLayers);
-        }
-
-        for (AZ::Entity* entity : editorEntities)
-        {
-            AzToolsFramework::Layers::EditorLayerComponentRequestBus::Event(
-                entity->GetId(), &AzToolsFramework::Layers::EditorLayerComponentRequestBus::Events::RestoreEditorData);
-        }
-
         if (savedEntities)
         {
             AZ_PROFILE_SCOPE(AzToolsFramework, "CCryEditDoc::SaveLevel Updated PakFile levelEntities.editor_xml");

Code/Editor/CryEditDoc.h

@@ -169,7 +169,6 @@ class CCryEditDoc
         bool bSaved;
     };
     bool BeforeSaveDocument(const QString& lpszPathName, TSaveDocContext& context);
-    bool HasLayerNameConflicts() const;
     bool DoSaveDocument(const QString& lpszPathName, TSaveDocContext& context);
     bool AfterSaveDocument(const QString& lpszPathName, TSaveDocContext& context, bool bShowPrompt = true);