some replacements and fixes that were referring Sandbox/Editor

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
main
Esteban Papp 5 years ago
parent 1696680240
commit d14229c67e

@ -8,5 +8,5 @@
add_subdirectory(Framework) add_subdirectory(Framework)
add_subdirectory(LauncherUnified) add_subdirectory(LauncherUnified)
add_subdirectory(Legacy) add_subdirectory(Legacy)
add_subdirectory(Sandbox) add_subdirectory(Editor)
add_subdirectory(Tools) add_subdirectory(Tools)

@ -9,6 +9,8 @@ if(NOT PAL_TRAIT_BUILD_HOST_TOOLS)
return() return()
endif() endif()
add_subdirectory(Plugins)
ly_add_target( ly_add_target(
NAME EditorCore SHARED NAME EditorCore SHARED
NAMESPACE Legacy NAMESPACE Legacy

@ -1602,7 +1602,7 @@ BOOL CCryEditApp::InitInstance()
QDir engineRoot = QString::fromUtf8(engineRootPath.c_str(), aznumeric_cast<int>(engineRootPath.Native().size())); QDir engineRoot = QString::fromUtf8(engineRootPath.c_str(), aznumeric_cast<int>(engineRootPath.Native().size()));
AzQtComponents::StyleManager::addSearchPaths( AzQtComponents::StyleManager::addSearchPaths(
QStringLiteral("style"), QStringLiteral("style"),
engineRoot.filePath(QStringLiteral("Code/Sandbox/Editor/Style")), engineRoot.filePath(QStringLiteral("Code/Editor/Style")),
QStringLiteral(":/Assets/Editor/Style"), QStringLiteral(":/Assets/Editor/Style"),
engineRootPath); engineRootPath);
AzQtComponents::StyleManager::setStyleSheet(mainWindow, QStringLiteral("style:Editor.qss")); AzQtComponents::StyleManager::setStyleSheet(mainWindow, QStringLiteral("style:Editor.qss"));

@ -128,7 +128,7 @@ public:
void SaveAutoBackup(); void SaveAutoBackup();
void SaveAutoRemind(); void SaveAutoRemind();
void ExportToGame(bool bNoMsgBox = true); 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()); void SetEditorWindowTitle(QString sTitleStr = QString(), QString sPreTitleStr = QString(), QString sPostTitleStr = QString());
RecentFileList* GetRecentFileList(); RecentFileList* GetRecentFileList();
virtual void AddToRecentFileList(const QString& lpszPathName); virtual void AddToRecentFileList(const QString& lpszPathName);

@ -393,8 +393,8 @@
<file>img/line.png</file> <file>img/line.png</file>
</qresource> </qresource>
<qresource> <qresource>
<file alias="Assets/Editor/Style/EditorStylesheetVariables_Dark.json">../../../../Sandbox/Editor/Style/EditorStylesheetVariables_Dark.json</file> <file alias="Assets/Editor/Style/EditorStylesheetVariables_Dark.json">../../../../Editor/Style/EditorStylesheetVariables_Dark.json</file>
<file alias="Assets/Editor/Style/NewEditorStylesheet.qss">../../../../Sandbox/Editor/Style/NewEditorStylesheet.qss</file> <file alias="Assets/Editor/Style/NewEditorStylesheet.qss">../../../../Editor/Style/NewEditorStylesheet.qss</file>
</qresource> </qresource>
<qresource prefix="/Cards"> <qresource prefix="/Cards">
<file>img/UI20/Cards/point_hand.png</file> <file>img/UI20/Cards/point_hand.png</file>

@ -2049,7 +2049,7 @@ namespace AzToolsFramework
{ {
AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework); AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
// note: see Code/Sandbox/Editor/Resource.h for ID_EDIT_<action> ids // note: see Code/Editor/Resource.h for ID_EDIT_<action> ids
const auto lockUnlock = [this](const bool lock) const auto lockUnlock = [this](const bool lock)
{ {

@ -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)

@ -117,6 +117,6 @@ def create_ly_keys():
process_utils.check_call( process_utils.check_call(
["reg", "add", target_key, "/v", "RC_EnableSourceControl", "/t", "REG_DWORD", "/d", "0", "/f"]) ["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 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( process_utils.check_call(
["reg", "add", target_key, "/v", "EditorSettingsVersion", "/t", "REG_DWORD", "/d", "2", "/f"]) ["reg", "add", target_key, "/v", "EditorSettingsVersion", "/t", "REG_DWORD", "/d", "2", "/f"])

@ -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 -- Disable the Missing Asset Resolver by default
ed_MissingAssetResolver = 0 ed_MissingAssetResolver = 0

@ -29,7 +29,7 @@
"Legacy/**": "#include", "Legacy/**": "#include",
"Framework/**": "#include", "Framework/**": "#include",
"LauncherUnified/**": "#include", "LauncherUnified/**": "#include",
"Sandbox/**": "#include", "Editor/**": "#include",
"Tools": { "Tools": {
"Android/**": "#include", "Android/**": "#include",
"AWSNativeSDKInit/**": "#include", "AWSNativeSDKInit/**": "#include",

@ -1,5 +1,4 @@
*/Code/Legacy/* */Code/Legacy/*
*/Code/Deprecated/Sandbox/*
*/Code/Framework/AzCore/AzCore/Math/Aabb.h */Code/Framework/AzCore/AzCore/Math/Aabb.h
*/Code/Framework/AzCore/AzCore/Math/Color.h */Code/Framework/AzCore/AzCore/Math/Color.h
*/Code/Framework/AzCore/AzCore/Math/Crc.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/EditorFrameworkAPI.h
*/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkApplication.cpp */Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkApplication.cpp
*/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFramework.cpp */Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFramework.cpp
*/Code/Sandbox/* */Code/Editor/*
*/Code/Tools/* */Code/Tools/*
*/Gems/*/3rdParty/* */Gems/*/3rdParty/*
*/Gems/*/External/* */Gems/*/External/*

Loading…
Cancel
Save