diff --git a/Code/CMakeLists.txt b/Code/CMakeLists.txt index cb84d251e5..16984a2a4a 100644 --- a/Code/CMakeLists.txt +++ b/Code/CMakeLists.txt @@ -8,5 +8,5 @@ add_subdirectory(Framework) add_subdirectory(LauncherUnified) add_subdirectory(Legacy) -add_subdirectory(Sandbox) +add_subdirectory(Editor) add_subdirectory(Tools) diff --git a/Code/Editor/CMakeLists.txt b/Code/Editor/CMakeLists.txt index 06a73f06dc..8efe83be3d 100644 --- a/Code/Editor/CMakeLists.txt +++ b/Code/Editor/CMakeLists.txt @@ -9,6 +9,8 @@ if(NOT PAL_TRAIT_BUILD_HOST_TOOLS) return() endif() +add_subdirectory(Plugins) + ly_add_target( NAME EditorCore SHARED NAMESPACE Legacy diff --git a/Code/Editor/CryEdit.cpp b/Code/Editor/CryEdit.cpp index ceced74070..a0e37bd4a8 100644 --- a/Code/Editor/CryEdit.cpp +++ b/Code/Editor/CryEdit.cpp @@ -1602,7 +1602,7 @@ BOOL CCryEditApp::InitInstance() QDir engineRoot = QString::fromUtf8(engineRootPath.c_str(), aznumeric_cast(engineRootPath.Native().size())); AzQtComponents::StyleManager::addSearchPaths( QStringLiteral("style"), - engineRoot.filePath(QStringLiteral("Code/Sandbox/Editor/Style")), + engineRoot.filePath(QStringLiteral("Code/Editor/Style")), QStringLiteral(":/Assets/Editor/Style"), engineRootPath); AzQtComponents::StyleManager::setStyleSheet(mainWindow, QStringLiteral("style:Editor.qss")); diff --git a/Code/Editor/CryEdit.h b/Code/Editor/CryEdit.h index c3df9c1afc..870d659068 100644 --- a/Code/Editor/CryEdit.h +++ b/Code/Editor/CryEdit.h @@ -128,7 +128,7 @@ public: void SaveAutoBackup(); void SaveAutoRemind(); void ExportToGame(bool bNoMsgBox = true); - //! \param sTitleStr overwrites the default title - "Sandbox Editor 3 (tm)" + //! \param sTitleStr overwrites the default title of the Editor void SetEditorWindowTitle(QString sTitleStr = QString(), QString sPreTitleStr = QString(), QString sPostTitleStr = QString()); RecentFileList* GetRecentFileList(); virtual void AddToRecentFileList(const QString& lpszPathName); diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/resources.qrc b/Code/Framework/AzQtComponents/AzQtComponents/Components/resources.qrc index 7070bd372b..904be3897f 100644 --- a/Code/Framework/AzQtComponents/AzQtComponents/Components/resources.qrc +++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/resources.qrc @@ -393,8 +393,8 @@ img/line.png - ../../../../Sandbox/Editor/Style/EditorStylesheetVariables_Dark.json - ../../../../Sandbox/Editor/Style/NewEditorStylesheet.qss + ../../../../Editor/Style/EditorStylesheetVariables_Dark.json + ../../../../Editor/Style/NewEditorStylesheet.qss img/UI20/Cards/point_hand.png diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp index 0dbaa42e1a..e0b7dd2350 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp @@ -2049,7 +2049,7 @@ namespace AzToolsFramework { AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework); - // note: see Code/Sandbox/Editor/Resource.h for ID_EDIT_ ids + // note: see Code/Editor/Resource.h for ID_EDIT_ ids const auto lockUnlock = [this](const bool lock) { diff --git a/Code/Sandbox/CMakeLists.txt b/Code/Sandbox/CMakeLists.txt deleted file mode 100644 index 5b420c10fe..0000000000 --- a/Code/Sandbox/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -# -# Copyright (c) Contributors to the Open 3D Engine Project -# -# SPDX-License-Identifier: Apache-2.0 OR MIT -# -# - -# Plugins should be processed before because we are going to generate the list of plugins -# that the editor should load -add_subdirectory(Plugins) -add_subdirectory(Editor) diff --git a/Tools/LyTestTools/ly_test_tools/environment/reg_cleaner.py b/Tools/LyTestTools/ly_test_tools/environment/reg_cleaner.py index f344ea1739..90e4ce2b2b 100755 --- a/Tools/LyTestTools/ly_test_tools/environment/reg_cleaner.py +++ b/Tools/LyTestTools/ly_test_tools/environment/reg_cleaner.py @@ -117,6 +117,6 @@ def create_ly_keys(): process_utils.check_call( ["reg", "add", target_key, "/v", "RC_EnableSourceControl", "/t", "REG_DWORD", "/d", "0", "/f"]) # The editor will ignore settings unless EditorSettingsVersion is what it expects - # The value it expects is in Code\Sandbox\Editor\Settings.cpp + # The value it expects is in Code\Editor\Settings.cpp process_utils.check_call( ["reg", "add", target_key, "/v", "EditorSettingsVersion", "/t", "REG_DWORD", "/d", "2", "/f"]) diff --git a/editor.cfg b/editor.cfg index f2d75a3da2..843a52824d 100644 --- a/editor.cfg +++ b/editor.cfg @@ -1,4 +1,4 @@ --- Settings stored here are only used in the Sandbox Editor +-- Settings stored here are only used in the Editor -- Disable the Missing Asset Resolver by default ed_MissingAssetResolver = 0 diff --git a/scripts/build/package/Platform/Windows/package_filelists/atom.json b/scripts/build/package/Platform/Windows/package_filelists/atom.json index 3bd02de7e3..7f049981a7 100644 --- a/scripts/build/package/Platform/Windows/package_filelists/atom.json +++ b/scripts/build/package/Platform/Windows/package_filelists/atom.json @@ -29,7 +29,7 @@ "Legacy/**": "#include", "Framework/**": "#include", "LauncherUnified/**": "#include", - "Sandbox/**": "#include", + "Editor/**": "#include", "Tools": { "Android/**": "#include", "AWSNativeSDKInit/**": "#include", diff --git a/scripts/commit_validation/commit_validation/pal_allowedlist.txt b/scripts/commit_validation/commit_validation/pal_allowedlist.txt index 7c989e6f10..5ea71e0363 100644 --- a/scripts/commit_validation/commit_validation/pal_allowedlist.txt +++ b/scripts/commit_validation/commit_validation/pal_allowedlist.txt @@ -1,5 +1,4 @@ */Code/Legacy/* -*/Code/Deprecated/Sandbox/* */Code/Framework/AzCore/AzCore/Math/Aabb.h */Code/Framework/AzCore/AzCore/Math/Color.h */Code/Framework/AzCore/AzCore/Math/Crc.h @@ -47,7 +46,7 @@ */Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkAPI.h */Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkApplication.cpp */Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFramework.cpp -*/Code/Sandbox/* +*/Code/Editor/* */Code/Tools/* */Gems/*/3rdParty/* */Gems/*/External/*