birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved PrefabSavePreference settings registry code from PrefabEditorEntityOwnershipInterface to PrefabLoaderInterface

Browse Source 
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
This commit is contained in:
srikappa-amzn
2021-08-24 18:34:51 -07:00
parent 79dd041d02
commit 1ca67cad80
13 changed files with 95 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipInterface.h
-9
View File
@@ -18,13 +18,6 @@
namespace AzToolsFramework
{
enum class SavePrefabsPreference : AZ::s64
{
Unspecified = 0,
SaveAll = 1,
SaveNone = -1
};
class PrefabEditorEntityOwnershipInterface
{
public:
@@ -60,7 +53,5 @@ namespace AzToolsFramework
virtual void StopPlayInEditor() = 0;
virtual void CreateNewLevelPrefab(AZStd::string_view filename, const AZStd::string& templateFilename) = 0;
virtual SavePrefabsPreference GetSavePrefabsPreference() = 0;
virtual void SetSavePrefabsPreference(SavePrefabsPreference savePrefabsPreference) = 0;
};
}
Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.cpp
-20
View File
@@ -28,8 +28,6 @@
namespace AzToolsFramework
{
static constexpr const char s_savePrefabsKey[] = "/O3DE/Preferences/SavePrefabs";
PrefabEditorEntityOwnershipService::PrefabEditorEntityOwnershipService(const AzFramework::EntityContextId& entityContextId,
AZ::SerializeContext* serializeContext)
: m_entityContextId(entityContextId)
@@ -610,24 +608,6 @@ namespace AzToolsFramework
m_playInEditorData.m_isEnabled = false;
}
SavePrefabsPreference PrefabEditorEntityOwnershipService::GetSavePrefabsPreference()
{
AZ::s64 savePrefabsPreference = static_cast<AZ::s64>(SavePrefabsPreference::Unspecified);
if (auto* registry = AZ::SettingsRegistry::Get())
{
registry->Get(savePrefabsPreference, s_savePrefabsKey);
}
return static_cast<SavePrefabsPreference>(savePrefabsPreference);
}
void PrefabEditorEntityOwnershipService::SetSavePrefabsPreference(SavePrefabsPreference savePrefabsPreference)
{
if (auto* registry = AZ::SettingsRegistry::Get())
{
registry->Set(s_savePrefabsKey, static_cast<AZ::s64>(savePrefabsPreference));
}
}
//////////////////////////////////////////////////////////////////////////
// Slice Buses implementation with Assert(false), this will exist only during Slice->Prefab
// development to pinpoint and replace specific calls to Slice system
Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.h
-3
View File
@@ -168,9 +168,6 @@ namespace AzToolsFramework
void CreateNewLevelPrefab(AZStd::string_view filename, const AZStd::string& templateFilename) override;
SavePrefabsPreference GetSavePrefabsPreference() override;
void SetSavePrefabsPreference(SavePrefabsPreference savePrefabsPreference) override;
protected:
AZ::SliceComponent::SliceInstanceAddress GetOwningSlice() override;