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

Merge pull request #1443 from aws-lumberyard-dev/nvsickle/MergeStabilizationJun18

Browse Source 
Merge stabilization/2106 into development
This commit is contained in:
Nicholas Van Sickle
2021-06-21 10:58:07 -07:00
committed by GitHub
parent 989178d285 dc3d1dc010
commit b032177418
578 changed files with 19535 additions and 20040 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Sandbox/Editor/CMakeLists.txt
-1
View File
@@ -104,7 +104,6 @@ ly_add_target(
3rdParty::Qt::Gui
3rdParty::Qt::Widgets
3rdParty::Qt::Concurrent
3rdParty::Qt::WebEngineWidgets
3rdParty::tiff
3rdParty::squish-ccr
3rdParty::zlib
Code/Sandbox/Editor/CryEdit.cpp
+1 -8
View File
@@ -4005,17 +4005,10 @@ void CCryEditApp::SetEditorWindowTitle(QString sTitleStr, QString sPreTitleStr,
{
if (MainWindow::instance() || m_pConsoleDialog)
{
QString platform = "";
#ifdef WIN64
platform = "[x64]";
#else
platform = "[x86]";
#endif //WIN64
if (sTitleStr.isEmpty())
{
sTitleStr = QObject::tr("Open 3D Engine Editor Beta %1 - Build %2").arg(platform).arg(LY_BUILD);
sTitleStr = QObject::tr("O3DE Editor [Developer Preview]");
}
if (!sPreTitleStr.isEmpty())
Code/Sandbox/Editor/EditorPreferencesPageAWS.cpp
-2
View File
@@ -47,8 +47,6 @@ CEditorPreferencesPage_AWS::CEditorPreferencesPage_AWS()
{
m_settingsRegistry = AZStd::make_unique<AZ::SettingsRegistryImpl>();
InitializeSettings();
// TODO Update with AWS svg.
m_icon = QIcon(":/res/AWS_preferences_icon.svg");
}
Code/Sandbox/Editor/EditorPreferencesPageGeneral.cpp
+2 -20
View File
@@ -28,8 +28,6 @@
#define EDITORPREFS_EVENTVALTOGGLE "operation"
#define UNDOSLICESAVE_VALON "UndoSliceSaveValueOn"
#define UNDOSLICESAVE_VALOFF "UndoSliceSaveValueOff"
#define EDITORUI10_ENABLED "EditorUI10On"
#define EDITORUI10_DISABLED "EditorUI10Off"
void CEditorPreferencesPage_General::Reflect(AZ::SerializeContext& serialize)
{
@@ -45,8 +43,7 @@ void CEditorPreferencesPage_General::Reflect(AZ::SerializeContext& serialize)
->Field("StylusMode", &GeneralSettings::m_stylusMode)
->Field("ShowNews", &GeneralSettings::m_bShowNews)
->Field("EnableSceneInspector", &GeneralSettings::m_enableSceneInspector)
->Field("RestoreViewportCamera", &GeneralSettings::m_restoreViewportCamera)
->Field("PrefabSystem", &GeneralSettings::m_enablePrefabSystem);
->Field("RestoreViewportCamera", &GeneralSettings::m_restoreViewportCamera);
serialize.Class<Messaging>()
->Version(2)
@@ -94,8 +91,7 @@ void CEditorPreferencesPage_General::Reflect(AZ::SerializeContext& serialize)
->EnumAttribute(AzQtComponents::ToolBar::ToolBarIconSize::IconLarge, "Large")
->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_stylusMode, "Stylus Mode", "Stylus Mode for tablets and other pointing devices")
->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_restoreViewportCamera, EditorPreferencesGeneralRestoreViewportCameraSettingName, "Keep the original editor viewport transform when exiting game mode.")
->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_enableSceneInspector, "Enable Scene Inspector (EXPERIMENTAL)", "Enable the option to inspect the internal data loaded from scene files like .fbx. This is an experimental feature. Restart the Scene Settings if the option is not visible under the Help menu.")
->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_enablePrefabSystem, "Enable Prefab System (EXPERIMENTAL)", "Enable this option to preview Open 3D Engine's new prefab system. Enabling this setting removes slice support for level entities; you will need to restart the Editor for the change to take effect.");
->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_enableSceneInspector, "Enable Scene Inspector (EXPERIMENTAL)", "Enable the option to inspect the internal data loaded from scene files like .fbx. This is an experimental feature. Restart the Scene Settings if the option is not visible under the Help menu.");
editContext->Class<Messaging>("Messaging", "")
->DataElement(AZ::Edit::UIHandlers::CheckBox, &Messaging::m_showDashboard, "Show Welcome to Open 3D Engine at startup", "Show Welcome to Open 3D Engine at startup")
@@ -159,8 +155,6 @@ void CEditorPreferencesPage_General::OnApply()
gSettings.restoreViewportCamera = m_generalSettings.m_restoreViewportCamera;
gSettings.enableSceneInspector = m_generalSettings.m_enableSceneInspector;
gSettings.prefabSystem = m_generalSettings.m_enablePrefabSystem;
if (static_cast<int>(m_generalSettings.m_toolbarIconSize) != gSettings.gui.nToolbarIconSize)
{
gSettings.gui.nToolbarIconSize = static_cast<int>(m_generalSettings.m_toolbarIconSize);
@@ -178,16 +172,6 @@ void CEditorPreferencesPage_General::OnApply()
//slices
gSettings.sliceSettings.dynamicByDefault = m_sliceSettings.m_slicesDynamicByDefault;
// if the user enabled/disabled the prefab context - notify them that a restart
// is required in order to see the effect of the change
if (gSettings.prefabSystem != m_generalSettings.m_enablePrefabSystemInitialValue)
{
QMessageBox::warning(
AzToolsFramework::GetActiveWindow(), QObject::tr("Restart required"),
QObject::tr("Restart the Editor in order for the Prefab/Slice system changes to take effect.")
);
}
}
void CEditorPreferencesPage_General::InitializeSettings()
@@ -202,8 +186,6 @@ void CEditorPreferencesPage_General::InitializeSettings()
m_generalSettings.m_stylusMode = gSettings.stylusMode;
m_generalSettings.m_restoreViewportCamera = gSettings.restoreViewportCamera;
m_generalSettings.m_enableSceneInspector = gSettings.enableSceneInspector;
m_generalSettings.m_enablePrefabSystem = gSettings.prefabSystem;
m_generalSettings.m_enablePrefabSystemInitialValue = gSettings.prefabSystem;
m_generalSettings.m_toolbarIconSize = static_cast<AzQtComponents::ToolBar::ToolBarIconSize>(gSettings.gui.nToolbarIconSize);
Code/Sandbox/Editor/EditorPreferencesPageGeneral.h
-4
View File
@@ -58,10 +58,6 @@ private:
bool m_restoreViewportCamera;
bool m_bShowNews;
bool m_enableSceneInspector;
bool m_enablePrefabSystem;
// Only used to tell if the user has changed this value since it requires a restart
bool m_enablePrefabSystemInitialValue;
};
struct Messaging
Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp
+22 -5
View File
@@ -154,11 +154,23 @@ SandboxIntegrationManager::SandboxIntegrationManager()
{
// Required to receive events from the Cry Engine undo system
GetIEditor()->GetUndoManager()->AddListener(this);
// Only create the PrefabIntegrationManager if prefabs are enabled
bool prefabSystemEnabled = false;
AzFramework::ApplicationRequests::Bus::BroadcastResult(
prefabSystemEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
if (prefabSystemEnabled)
{
m_prefabIntegrationManager = aznew AzToolsFramework::Prefab::PrefabIntegrationManager();
}
}
SandboxIntegrationManager::~SandboxIntegrationManager()
{
GetIEditor()->GetUndoManager()->RemoveListener(this);
delete m_prefabIntegrationManager;
m_prefabIntegrationManager = nullptr;
}
void SandboxIntegrationManager::Setup()
@@ -187,11 +199,16 @@ void SandboxIntegrationManager::Setup()
AZ_Assert((m_editorEntityUiInterface != nullptr),
"SandboxIntegrationManager requires a EditorEntityUiInterface instance to be present on Setup().");
m_prefabIntegrationInterface = AZ::Interface<AzToolsFramework::Prefab::PrefabIntegrationInterface>::Get();
AZ_Assert(
(m_prefabIntegrationInterface != nullptr),
"SandboxIntegrationManager requires a PrefabIntegrationInterface instance to be present on Setup().");
bool prefabSystemEnabled = false;
AzFramework::ApplicationRequests::Bus::BroadcastResult(
prefabSystemEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
if (prefabSystemEnabled)
{
m_prefabIntegrationInterface = AZ::Interface<AzToolsFramework::Prefab::PrefabIntegrationInterface>::Get();
AZ_Assert(
(m_prefabIntegrationInterface != nullptr),
"SandboxIntegrationManager requires a PrefabIntegrationInterface instance to be present on Setup().");
}
m_editorEntityAPI = AZ::Interface<AzToolsFramework::EditorEntityAPI>::Get();
AZ_Assert(m_editorEntityAPI, "SandboxIntegrationManager requires an EditorEntityAPI instance to be present on Setup().");
Code/Sandbox/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h
+1 -1
View File
@@ -305,7 +305,7 @@ private:
bool m_debugDisplayBusImplementationActive = false;
AzToolsFramework::Prefab::PrefabIntegrationManager m_prefabIntegrationManager;
AzToolsFramework::Prefab::PrefabIntegrationManager* m_prefabIntegrationManager = nullptr;
AzToolsFramework::EditorEntityUiInterface* m_editorEntityUiInterface = nullptr;
AzToolsFramework::Prefab::PrefabIntegrationInterface* m_prefabIntegrationInterface = nullptr;