LYN-2537 engine assets (#254)
* LYN-2537 Moved the Engine and Editor folder to be within the EngineAssets folder * Fixed Documentation in bootstrap.cfg to correct the path to the user project specific registry file * Adding a newline to the output of AssetCatalog 'Registering asset..., but type is not set' message * Updating the AssetProcessorPlatformConfig.setreg Scan Folder to detect the @ENGINEROOT@/EngineAssets/Engine path for engine runtime assets and @ENGINEROOT@/EngineAssets/Editor path for engine tool assets * Updating references to Icons and other assets to account for moving the Engine and Editor folder under a single EngineAssets folder * Moving the Engine Settings Registry folder from Engine/Registry -> Registry * Removed the LY_PROJECT_CMAKE_PATH define as it is not portable to other locations. It is hard coded to the project location that was used for the CMake configuration. Furthermore it paths with backslashes within it are treated as escape characters and not a path separator * Updated the LyTestTools asset_processor.py script to copy the exclude.filetag from the EngineAssets/Engine directory now * Fixed Atom Shader Preprocessing when running using an External Project * Updated the TSGenerateAction.cpp to fix the build error with using a renamed variable * Updated the Install_Common.cmake ly_setup_others function to install the EngineAssets directory and the each of the Gem's Assets directory while maintaining the relative directory structure to the Engine Root Also updated the install step to install the Registry folder at the engine root * Fixed the copying of the Registry folder to be in the install root, instead of under a second 'Registry' folder * Moving the AssetProcessorPlatformConfig.setreg file over to the Registry folder * Updated the LyTestTools and C++ code to point that the new location of the AssetProcessorPlatformConfig.setreg file inside of the Registry folder * Renamed Test AssetProcessor*Config.ini files to have the .setreg extension * Converted the AssetProcessor test setreg files from ini format to json format using the SerializeContextTools convert-ini command * Updated the AssetProcessor CMakeLists.txt to copy over the test setreg files to the build folder * Updated the assetprocessor test file list to point at the renamed AsssetProcessor*Config setreg filenames * Removed the Output Prefix code from the AssetProcessor. The complexity that it brought to the AP code is not needed, as users can replicate the behavior by just moving there assets underneath a another folder, underneath the scan folder * Adding back support to read the AssetProcessorPlatformConfig.setreg file from the asset root. This is only needed for C++ UnitTests as they run in an environment where the accessing the Engine Settings Registry is not available * Updating the Install_common.cmake logic to copy any "Assets" folder to the install layout. The Script has also been updated to copy over the "Assets" folder in the Engine Root to the install layout instead of an "EngineAssets" folder * Updating References to EngineAssets source asset folder in code to be the Assets source folder * Moved the Engine Source Asset folder of 'EngineAssets' to a new folder name of 'Assets'. This is inline with the naming scheme we use for Gem asset folders * Adding the EngineFinder.cmake to the AutomatedTesting project to allow it to work in a project centric manner * Updating the LyTestTools copy_assets_to_project function to be able to copy assets with folders to the temporary project root Fixed an issue in LyTestTools where the temporary log directory could have shutil.rmtree being called twice on it leading to an exception which fails an automated test Updated the asset_procesor_gui_tests_2 AddScanFolder test to not use the output prefix, but instead place the source asset root into a subdirectory * Correct the AssetProcessorPlatformConfig Scan Folders for the EngineAssets directory to point at the Assets directory * Updated the asset procesor batch dependency test scan folder to point at the 'Assets' folder instead of 'EngineAssets'
This commit is contained in:
lumberyard-employee-dm
committed by
GitHub
GitHub
parent
ed74bb9166
commit
3dec5d3b71
@@ -19,6 +19,8 @@
|
||||
#include <QPushButton>
|
||||
|
||||
// AzCore
|
||||
#include <AzCore/Utils/Utils.h>
|
||||
|
||||
#include <Pak/CryPakUtils.h>
|
||||
|
||||
// Editor
|
||||
@@ -70,12 +72,13 @@ void CAlembicCompileDialog::OnInitDialog()
|
||||
|
||||
SDirectoryEnumeratorHelper dirHelper;
|
||||
|
||||
dirHelper.ScanDirectoryRecursive(gEnv->pCryPak, "@engroot@/", "Editor/Presets/GeomCache", filePattern, presetFiles);
|
||||
auto engineAssetSourceRoot = AZ::IO::FixedMaxPath(AZ::Utils::GetEnginePath()) / "Assets";
|
||||
dirHelper.ScanDirectoryRecursive(gEnv->pCryPak, engineAssetSourceRoot.c_str(), "Editor/Presets/GeomCache", filePattern, presetFiles);
|
||||
|
||||
for (auto iter = presetFiles.begin(); iter != presetFiles.end(); ++iter)
|
||||
{
|
||||
const auto& file = *iter;
|
||||
const AZStd::string filePath = "@engroot@/" + file;
|
||||
const AZ::IO::FixedMaxPath filePath = engineAssetSourceRoot / file;
|
||||
m_presets.push_back(LoadConfig(Path::GetFileName(file.c_str()), XmlHelpers::LoadXmlFromFile(filePath.c_str())));
|
||||
m_ui->m_presetComboBox->addItem(m_presets.back().m_name);
|
||||
}
|
||||
|
||||
@@ -1154,9 +1154,9 @@ BOOL CCryEditApp::CheckIfAlreadyRunning()
|
||||
m_mutexApplication = new QSharedMemory(O3DEApplicationName);
|
||||
if (!m_mutexApplication->create(16))
|
||||
{
|
||||
// Don't prompt the user in non-interactive export mode. Instead, default to allowing multiple instances to
|
||||
// run simultaneously, so that multiple level exports can be run in parallel on the same machine.
|
||||
// NOTE: If you choose to do this, be sure to export *different* levels, since nothing prevents multiple runs
|
||||
// Don't prompt the user in non-interactive export mode. Instead, default to allowing multiple instances to
|
||||
// run simultaneously, so that multiple level exports can be run in parallel on the same machine.
|
||||
// NOTE: If you choose to do this, be sure to export *different* levels, since nothing prevents multiple runs
|
||||
// from trying to write to the same level at the same time.
|
||||
// If we're running interactively, let's ask and make sure the user actually intended to do this.
|
||||
if (!m_bExportMode && QMessageBox::question(AzToolsFramework::GetActiveWindow(), QObject::tr("Too many apps"), QObject::tr("There is already an Open 3D Engine application running\nDo you want to start another one?")) != QMessageBox::Yes)
|
||||
@@ -1717,7 +1717,7 @@ BOOL CCryEditApp::InitInstance()
|
||||
AzQtComponents::StyleManager::addSearchPaths(
|
||||
QStringLiteral("style"),
|
||||
engineRoot.filePath(QStringLiteral("Code/Sandbox/Editor/Style")),
|
||||
QStringLiteral(":/Editor/Style"),
|
||||
QStringLiteral(":/Assets/Editor/Style"),
|
||||
engineRootPath);
|
||||
AzQtComponents::StyleManager::setStyleSheet(mainWindow, QStringLiteral("style:Editor.qss"));
|
||||
|
||||
|
||||
@@ -83,7 +83,7 @@ static const char* kHoldFolder = "$tmp_hold"; // conform to the ignored file typ
|
||||
static const char* kSaveBackupFolder = "_savebackup";
|
||||
static const char* kResizeTempFolder = "$tmp_resize"; // conform to the ignored file types $tmp[0-9]*_ regex
|
||||
|
||||
static const char* kBackupOrTempFolders[] =
|
||||
static const char* kBackupOrTempFolders[] =
|
||||
{
|
||||
kAutoBackupFolder,
|
||||
kHoldFolder,
|
||||
@@ -1164,7 +1164,7 @@ bool CCryEditDoc::OnSaveDocument(const QString& lpszPathName)
|
||||
{
|
||||
DoSaveDocument(lpszPathName, context);
|
||||
saveSuccess = AfterSaveDocument(lpszPathName, context);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return saveSuccess;
|
||||
@@ -1436,7 +1436,7 @@ bool CCryEditDoc::SaveLevel(const QString& filename)
|
||||
// Save AZ entities to the editor level.
|
||||
|
||||
bool contentsAllSaved = false; // abort level save if anything within it fails
|
||||
|
||||
|
||||
auto tempFilenameStrData = tempSaveFile.toStdString();
|
||||
auto filenameStrData = fullPathName.toStdString();
|
||||
|
||||
@@ -1458,7 +1458,7 @@ bool CCryEditDoc::SaveLevel(const QString& filename)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
AZStd::vector<AZ::Entity*> editorEntities;
|
||||
AzToolsFramework::EditorEntityContextRequestBus::Broadcast(
|
||||
&AzToolsFramework::EditorEntityContextRequestBus::Events::GetLooseEditorEntities,
|
||||
@@ -1815,7 +1815,7 @@ bool CCryEditDoc::LoadLevel(TDocMultiArchive& arrXmlAr, const QString& absoluteC
|
||||
AzFramework::ApplicationRequests::Bus::BroadcastResult(isPrefabEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
|
||||
|
||||
auto pIPak = GetIEditor()->GetSystem()->GetIPak();
|
||||
|
||||
|
||||
QString folderPath = QFileInfo(absoluteCryFilePath).absolutePath();
|
||||
|
||||
OnStartLevelResourceList();
|
||||
@@ -2391,7 +2391,8 @@ void CCryEditDoc::InitEmptyLevel(int /*resolution*/, int /*unitSize*/, bool /*bU
|
||||
GetIEditor()->GetGameEngine()->SetLevelCreated(false);
|
||||
|
||||
// Default time of day.
|
||||
XmlNodeRef root = GetISystem()->LoadXmlFromFile("@engroot@/Editor/default_time_of_day.xml");
|
||||
auto defaultTimeOfDayPath = AZ::IO::FixedMaxPath(AZ::Utils::GetEnginePath()) / "Assets" / "Editor" / "default_time_of_day.xml";
|
||||
XmlNodeRef root = GetISystem()->LoadXmlFromFile(defaultTimeOfDayPath.c_str());
|
||||
if (root)
|
||||
{
|
||||
ITimeOfDay* pTimeOfDay = gEnv->p3DEngine ? gEnv->p3DEngine->GetTimeOfDay() : nullptr;
|
||||
@@ -2454,7 +2455,7 @@ void CCryEditDoc::CreateDefaultLevelAssets(int resolution, int unitSize)
|
||||
|
||||
AZ::Transform worldTransform = AZ::Transform::CreateIdentity();
|
||||
worldTransform = AZ::Transform::CreateTranslation(AZ::Vector3(halfTerrainSize, halfTerrainSize, m_envProbeHeight / 2));
|
||||
|
||||
|
||||
AzToolsFramework::SliceEditorEntityOwnershipServiceNotificationBus::Handler::BusConnect();
|
||||
GetIEditor()->SuspendUndo();
|
||||
AzToolsFramework::SliceEditorEntityOwnershipServiceRequestBus::Broadcast(
|
||||
@@ -2613,7 +2614,7 @@ void CCryEditDoc::OnSliceInstantiated(const AZ::Data::AssetId& sliceAssetId, AZ:
|
||||
sliceAddress.SetReference(nullptr);
|
||||
SetModifiedFlag(true);
|
||||
SetModifiedModules(eModifiedEntities);
|
||||
|
||||
|
||||
AzToolsFramework::SliceEditorEntityOwnershipServiceNotificationBus::Handler::BusDisconnect();
|
||||
|
||||
//save after level default slice fully instantiated
|
||||
|
||||
@@ -71,24 +71,8 @@ CPythonScriptsDialog::CPythonScriptsDialog(QWidget* parent)
|
||||
AzQtComponents::LineEdit::applySearchStyle(ui->searchField);
|
||||
|
||||
QStringList scriptFolders;
|
||||
|
||||
const auto editorEnvStr = gSettings.strEditorEnv.toLocal8Bit();
|
||||
AZStd::string editorScriptsPath = AZStd::string::format("@engroot@/%s", editorEnvStr.constData());
|
||||
XmlNodeRef envNode = XmlHelpers::LoadXmlFromFile(editorScriptsPath.c_str());
|
||||
if (envNode)
|
||||
{
|
||||
QString scriptPath;
|
||||
int childrenCount = envNode->getChildCount();
|
||||
for (int idx = 0; idx < childrenCount; ++idx)
|
||||
{
|
||||
XmlNodeRef child = envNode->getChild(idx);
|
||||
if (child->haveAttr("scriptPath"))
|
||||
{
|
||||
scriptPath = child->getAttr("scriptPath");
|
||||
scriptFolders.push_back(scriptPath);
|
||||
}
|
||||
}
|
||||
}
|
||||
auto engineScriptPath = AZ::IO::FixedMaxPath(AZ::Utils::GetEnginePath()) / "Assets" / "Editor" / "Scripts";
|
||||
scriptFolders.push_back(engineScriptPath.c_str());
|
||||
|
||||
AZ::IO::FixedMaxPathString projectPath = AZ::Utils::GetProjectPath();
|
||||
ScanFolderForScripts(QString("%1/Editor/Scripts").arg(projectPath.c_str()), scriptFolders);
|
||||
|
||||
@@ -16,6 +16,8 @@
|
||||
|
||||
#include "EditorPanelUtils.h"
|
||||
|
||||
#include <AzCore/Utils/Utils.h>
|
||||
|
||||
// Qt
|
||||
#include <QInputDialog>
|
||||
#include <QFileDialog>
|
||||
@@ -147,7 +149,8 @@ public:
|
||||
|
||||
virtual void HotKey_Export() override
|
||||
{
|
||||
QString filepath = QFileDialog::getSaveFileName(nullptr, "Select shortcut configuration to load", "Editor/Plugins/ParticleEditorPlugin/settings", "HotKey Config Files (*.hkxml)");
|
||||
auto settingDir = AZ::IO::FixedMaxPath(AZ::Utils::GetEnginePath()) / "Editor" / "Plugins" / "ParticleEditorPlugin" / "settings";
|
||||
QString filepath = QFileDialog::getSaveFileName(nullptr, "Select shortcut configuration to load", settingDir.c_str(), "HotKey Config Files (*.hkxml)");
|
||||
QFile file(filepath);
|
||||
if (!file.open(QIODevice::WriteOnly))
|
||||
{
|
||||
|
||||
@@ -27,27 +27,27 @@
|
||||
#include "Util/ImageUtil.h"
|
||||
|
||||
|
||||
#define HELPER_MATERIAL "Editor/Objects/Helper"
|
||||
#define HELPER_MATERIAL "Objects/Helper"
|
||||
|
||||
namespace
|
||||
{
|
||||
// Object names in this array must correspond to EObject enumeration.
|
||||
const char* g_ObjectNames[eStatObject_COUNT] =
|
||||
{
|
||||
"Editor/Objects/Arrow.cgf",
|
||||
"Editor/Objects/Axis.cgf",
|
||||
"Editor/Objects/Sphere.cgf",
|
||||
"Editor/Objects/Anchor.cgf",
|
||||
"Editor/Objects/entrypoint.cgf",
|
||||
"Editor/Objects/hidepoint.cgf",
|
||||
"Editor/Objects/hidepoint_sec.cgf",
|
||||
"Editor/Objects/reinforcement_point.cgf",
|
||||
"Objects/Arrow.cgf",
|
||||
"Objects/Axis.cgf",
|
||||
"Objects/Sphere.cgf",
|
||||
"Objects/Anchor.cgf",
|
||||
"Objects/entrypoint.cgf",
|
||||
"Objects/hidepoint.cgf",
|
||||
"Objects/hidepoint_sec.cgf",
|
||||
"Objects/reinforcement_point.cgf",
|
||||
};
|
||||
|
||||
const char* g_IconNames[eIcon_COUNT] =
|
||||
{
|
||||
"Editor/Icons/ScaleWarning.png",
|
||||
"Editor/Icons/RotationWarning.png",
|
||||
"Icons/ScaleWarning.png",
|
||||
"Icons/RotationWarning.png",
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
// ...
|
||||
// return previousValue;
|
||||
// }
|
||||
// REGISTER_RESOURCE_SELECTOR("Sound", SoundFileSelector, "Editor/icons/sound_16x16.png")
|
||||
// REGISTER_RESOURCE_SELECTOR("Sound", SoundFileSelector, "Icons/sound_16x16.png")
|
||||
//
|
||||
// To expose it to serialization:
|
||||
//
|
||||
|
||||
@@ -228,7 +228,7 @@ AzToolsFramework::AssetBrowser::SourceFileDetails CLensFlareManager::GetSourceFi
|
||||
{
|
||||
if (IsLensFlareLibraryXML(fullSourceFileName))
|
||||
{
|
||||
return AzToolsFramework::AssetBrowser::SourceFileDetails("Editor/Icons/AssetBrowser/LensFlare_16.png");
|
||||
return AzToolsFramework::AssetBrowser::SourceFileDetails("Icons/AssetBrowser/LensFlare_16.png");
|
||||
}
|
||||
return AzToolsFramework::AssetBrowser::SourceFileDetails();
|
||||
}
|
||||
|
||||
@@ -96,25 +96,25 @@ void CMatEditPreviewDlg::SetupMenuBar()
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
void CMatEditPreviewDlg::OnPreviewSphere()
|
||||
{
|
||||
m_previewCtrl->LoadModelFile("Editor/Objects/MtlSphere.cgf");
|
||||
m_previewCtrl->LoadModelFile("Objects/MtlSphere.cgf");
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
void CMatEditPreviewDlg::OnPreviewBox()
|
||||
{
|
||||
m_previewCtrl->LoadModelFile("Editor/Objects/MtlBox.cgf");
|
||||
m_previewCtrl->LoadModelFile("Objects/MtlBox.cgf");
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
void CMatEditPreviewDlg::OnPreviewTeapot()
|
||||
{
|
||||
m_previewCtrl->LoadModelFile("Editor/Objects/MtlTeapot.cgf");
|
||||
m_previewCtrl->LoadModelFile("Objects/MtlTeapot.cgf");
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
void CMatEditPreviewDlg::OnPreviewPlane()
|
||||
{
|
||||
m_previewCtrl->LoadModelFile("Editor/Objects/MtlPlane.cgf");
|
||||
m_previewCtrl->LoadModelFile("Objects/MtlPlane.cgf");
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -25,26 +25,26 @@
|
||||
#include "MaterialBrowser.h"
|
||||
#include "Util/Image.h"
|
||||
|
||||
#define ME_BG_TEXTURE "Editor/Materials/Stripes.dds"
|
||||
#define ME_BG_TEXTURE "Materials/Stripes.dds"
|
||||
|
||||
|
||||
#define MATERIAL_EDITOR_SPHERE_MODEL_FILE "Editor/Objects/MtlSphere.cgf"
|
||||
#define MATERIAL_EDITOR_SPHERE_MODEL_FILE "Objects/MtlSphere.cgf"
|
||||
#define MATERIAL_EDITOR_SPHERE_CAMERA_RADIUS 1.6f
|
||||
#define MATERIAL_EDITOR_SPHERE_CAMERA_FROM_DIRECTION Vec3(0.1f, -1.0f, -0.1f)
|
||||
|
||||
#define MATERIAL_EDITOR_BOX_MODEL_FILE "Editor/Objects/MtlBox.cgf"
|
||||
#define MATERIAL_EDITOR_BOX_MODEL_FILE "Objects/MtlBox.cgf"
|
||||
#define MATERIAL_EDITOR_BOX_CAMERA_RADIUS 2.0f
|
||||
#define MATERIAL_EDITOR_BOX_CAMERA_FROM_DIRECTION Vec3(0.75f, -0.75f, -0.5f)
|
||||
|
||||
#define MATERIAL_EDITOR_TEAPOT_MODEL_FILE "Editor/Objects/MtlTeapot.cgf"
|
||||
#define MATERIAL_EDITOR_TEAPOT_MODEL_FILE "Objects/MtlTeapot.cgf"
|
||||
#define MATERIAL_EDITOR_TEAPOT_CAMERA_RADIUS 1.6f
|
||||
#define MATERIAL_EDITOR_TEAPOT_CAMERA_FROM_DIRECTION Vec3(0.1f, -0.75f, -0.25f)
|
||||
|
||||
#define MATERIAL_EDITOR_PLANE_MODEL_FILE "Editor/Objects/MtlPlane.cgf"
|
||||
#define MATERIAL_EDITOR_PLANE_MODEL_FILE "Objects/MtlPlane.cgf"
|
||||
#define MATERIAL_EDITOR_PLANE_CAMERA_RADIUS 1.6f
|
||||
#define MATERIAL_EDITOR_PLANE_CAMERA_FROM_DIRECTION Vec3(-0.5f, 0.5f, -0.5f)
|
||||
|
||||
#define MATERIAL_EDITOR_SWATCH_MODEL_FILE "Editor/Objects/MtlSwatch.cgf"
|
||||
#define MATERIAL_EDITOR_SWATCH_MODEL_FILE "Objects/MtlSwatch.cgf"
|
||||
#define MATERIAL_EDITOR_SWATCH_CAMERA_RADIUS 1.0f
|
||||
#define MATERIAL_EDITOR_SWATCH_CAMERA_FROM_DIRECTION Vec3(0.0f, 0.0f, -1.0f)
|
||||
|
||||
|
||||
@@ -298,7 +298,7 @@ namespace
|
||||
AZ::IO::FixedMaxPathString engineRoot = AZ::Utils::GetEnginePath();
|
||||
QDir engineDir = !engineRoot.empty() ? QDir(QString(engineRoot.c_str())) : QDir::current();
|
||||
|
||||
QString scriptFolder = engineDir.absoluteFilePath("Editor/Scripts/");
|
||||
QString scriptFolder = engineDir.absoluteFilePath("Assets/Editor/Scripts/");
|
||||
Path::ConvertBackSlashToSlash(scriptFolder);
|
||||
path = scriptFolder + pFile;
|
||||
|
||||
@@ -524,7 +524,7 @@ namespace
|
||||
// for example: Hello
|
||||
return AZStd::make_any<AZStd::string>(stringValue.toUtf8().data());
|
||||
}
|
||||
else // then it looks like an integer
|
||||
else // then it looks like an integer
|
||||
{
|
||||
// for example: 456
|
||||
return AZStd::make_any<AZ::s64>(stringValue.toInt());
|
||||
|
||||
@@ -196,7 +196,6 @@ SEditorSettings::SEditorSettings()
|
||||
enableSceneInspector = false;
|
||||
|
||||
strStandardTempDirectory = "Temp";
|
||||
strEditorEnv = "Editor/Editor.env";
|
||||
|
||||
// Init source safe params.
|
||||
enableSourceControl = true;
|
||||
@@ -532,7 +531,6 @@ void SEditorSettings::Save()
|
||||
SaveValue("Settings", "editorConfigSpec", editorConfigSpec);
|
||||
|
||||
SaveValue("Settings", "TemporaryDirectory", strStandardTempDirectory);
|
||||
SaveValue("Settings", "EditorEnv", strEditorEnv);
|
||||
|
||||
SaveValue("Settings", "ConsoleBackgroundColorThemeV2", (int)consoleBackgroundColorTheme);
|
||||
|
||||
@@ -747,7 +745,6 @@ void SEditorSettings::Load()
|
||||
|
||||
|
||||
LoadValue("Settings", "TemporaryDirectory", strStandardTempDirectory);
|
||||
LoadValue("Settings", "EditorEnv", strEditorEnv);
|
||||
|
||||
int consoleBackgroundColorThemeInt = (int)consoleBackgroundColorTheme;
|
||||
LoadValue("Settings", "ConsoleBackgroundColorThemeV2", consoleBackgroundColorThemeInt);
|
||||
@@ -760,7 +757,7 @@ void SEditorSettings::Load()
|
||||
LoadValue("Settings", "ShowTimeInConsole", bShowTimeInConsole);
|
||||
|
||||
LoadValue("Settings", "EnableSceneInspector", enableSceneInspector);
|
||||
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
// Viewport Settings.
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -419,7 +419,6 @@ AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
|
||||
|
||||
// This directory is related to the editor root.
|
||||
QString strStandardTempDirectory;
|
||||
QString strEditorEnv;
|
||||
|
||||
SGUI_Settings gui;
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
#include "QtViewPaneManager.h"
|
||||
|
||||
|
||||
#define TOOLBOX_FILE "Editor/ToolBox.xml"
|
||||
#define TOOLBOX_FILE "ToolBox.xml"
|
||||
#define TOOLBOX_NODE "ToolBox"
|
||||
|
||||
CSettingsManager::CSettingsManager(EditorSettingsManagerType managerType)
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
|
||||
class QByteArray;
|
||||
|
||||
#define EDITOR_LAYOUT_FILE_PATH "@engroot@/Editor/EditorLayout.xml"
|
||||
#define EDITOR_SETTINGS_FILE_PATH "@engroot@/Editor/EditorSettings.xml"
|
||||
#define EDITOR_LAYOUT_FILE_PATH "@user@/Editor/EditorLayout.xml"
|
||||
#define EDITOR_SETTINGS_FILE_PATH "@user@/Editor/EditorSettings.xml"
|
||||
#define EDITOR_LAYOUT_ROOT_NODE "EditorLayout"
|
||||
#define EDITOR_SETTINGS_ROOT_NODE "EditorSettings"
|
||||
#define EDITOR_SETTINGS_CONTENT_NODE "EditorSettingsContent"
|
||||
@@ -30,7 +30,7 @@ class QByteArray;
|
||||
#define CVARS_NODE "CVars"
|
||||
#define CVAR_NODE "CVar"
|
||||
|
||||
#define EDITOR_EVENT_LOG_FILE_PATH "@engroot@/Editor/EditorEventLog.xml"
|
||||
#define EDITOR_EVENT_LOG_FILE_PATH "@user@/Editor/EditorEventLog.xml"
|
||||
#define EDITOR_EVENT_LOG_ROOT_NODE "EventRecorder"
|
||||
#define EVENT_LOG_EVENT_NAME "eventName"
|
||||
#define EDITOR_EVENT_LOG_ATTRIB_NAME "value"
|
||||
|
||||
@@ -71,7 +71,7 @@ int CShaderEnum::EnumShaders()
|
||||
m_shaders.push_back(sd);
|
||||
}
|
||||
|
||||
XmlNodeRef root = GetISystem()->GetXmlUtils()->LoadXmlFromFile("Editor/Materials/ShaderList.xml");
|
||||
XmlNodeRef root = GetISystem()->GetXmlUtils()->LoadXmlFromFile("Materials/ShaderList.xml");
|
||||
if (root)
|
||||
{
|
||||
for (int i = 0; i < root->getChildCount(); ++i)
|
||||
|
||||
@@ -1,488 +0,0 @@
|
||||
/*
|
||||
* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
|
||||
* its licensors.
|
||||
*
|
||||
* For complete copyright and license terms please see the LICENSE at the root of this
|
||||
* distribution (the "License"). All use of this software is governed by the License,
|
||||
* or, if provided, by the license below or the license accompanying this file. Do not
|
||||
* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
*
|
||||
*/
|
||||
|
||||
#ResourceManagement QLabel
|
||||
{
|
||||
/*
|
||||
This sets the indent Q_PROPERTY on QLabel to 0. The default value is -1,
|
||||
which triggers some computation based on the font size. But that only
|
||||
happens under some cicumstances, such as when using a stylesheet to set
|
||||
margins or padding on the QLabel. Adding such styling suddenly causes
|
||||
the indent to be applied, causing the left alignment of the text to break.
|
||||
*/
|
||||
qproperty-indent: 0
|
||||
}
|
||||
|
||||
#ResourceManagement #TreeTitle
|
||||
{
|
||||
font-size: 12px;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
#ResourceManagement #ButtonBar {
|
||||
margin-top: 6px;
|
||||
}
|
||||
|
||||
#ResourceManagement #ButtonBar QPushButton {
|
||||
padding: 6px 9px 6px 9px;
|
||||
margin-right: 6px;
|
||||
}
|
||||
|
||||
#ResourceManagement #Message, #ResourceManagement *[class='Message'] {
|
||||
font-size: 12px;
|
||||
margin-top: 6;
|
||||
}
|
||||
|
||||
#ResourceManagement #Title {
|
||||
font-size: 14px;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
#ResourceManagement #Refreshing {
|
||||
color: #F0C32D;
|
||||
}
|
||||
|
||||
#ResourceManagement #LinkButton, #ResourceManagement *[class='Link'] {
|
||||
border: none;
|
||||
color: #00A1C9;
|
||||
margin-top: 6px;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
#ResourceManagement QHeaderView::section {
|
||||
color: #999999;
|
||||
font-weight: bold;
|
||||
border: none;
|
||||
padding-top: 0px;
|
||||
padding-bottom: 3px;
|
||||
padding-right: 3px;
|
||||
padding-left: 3px;
|
||||
}
|
||||
|
||||
#ResourceManagement #Table {
|
||||
qproperty-showGrid: false;
|
||||
border: none;
|
||||
}
|
||||
|
||||
#ResourceManagement #Table::item {
|
||||
padding-right: 12px;
|
||||
padding-top: 3px;
|
||||
padding-bottom: 3px;
|
||||
}
|
||||
|
||||
#ResourceManagement #TextContentHelp
|
||||
{
|
||||
margin: 0px;
|
||||
padding: 12px;
|
||||
border-style: outset;
|
||||
border-width: 1px;
|
||||
border-color: #303030;
|
||||
}
|
||||
|
||||
#ResourceManagement #TextContentEdit
|
||||
{
|
||||
}
|
||||
|
||||
#ResourceManagement #TextContentFooter
|
||||
{
|
||||
padding: 6px 12px 6px 12px;
|
||||
border-style: outset;
|
||||
border-width: 1px;
|
||||
border-color: #303030;
|
||||
}
|
||||
|
||||
#ResourceManagement #TextContentFooter QLabel
|
||||
{
|
||||
min-width: 48px;
|
||||
max-width: 48px;
|
||||
margin-right: 12px;
|
||||
color: #999999;
|
||||
}
|
||||
|
||||
#ResourceManagement #TextContentFooter QPushButton
|
||||
{
|
||||
padding: 6px 9px 6px 9px;
|
||||
margin-left: 6px;
|
||||
}
|
||||
|
||||
|
||||
#ResourceManagement #Action {
|
||||
padding: 12px;
|
||||
background-color: #404040;
|
||||
}
|
||||
|
||||
#ResourceManagement #Action #ButtonBar {
|
||||
background-color: #404040;
|
||||
}
|
||||
|
||||
#ResourceManagement #Action #Heading {
|
||||
background-color: #404040;
|
||||
}
|
||||
|
||||
#ResourceManagement #Heading #RefreshButton {
|
||||
margin-left: 12px;
|
||||
padding: 3px;
|
||||
}
|
||||
|
||||
#ResourceManagement #Action #Heading #Title {
|
||||
border: 0px solid #404040;
|
||||
}
|
||||
|
||||
#ResourceManagement #Action #Heading #Message {
|
||||
border: 0px solid #404040;
|
||||
}
|
||||
|
||||
#ResourceManagement #Action #LearnMore {
|
||||
background-color: #404040;
|
||||
}
|
||||
|
||||
#ResourceManagement #Action #LearnMore #Title {
|
||||
font-size: 12px;
|
||||
margin-top: 24px;
|
||||
font-weight:bold;
|
||||
}
|
||||
|
||||
#ResourceManagement #Action #LearnMore #LinkButton {
|
||||
background-color: #404040;
|
||||
}
|
||||
|
||||
#ResourceManagement #Action #Title, #ResourceManagement #Action #Message {
|
||||
background-color: #404040;
|
||||
}
|
||||
|
||||
#ResourceManagement #Top {
|
||||
padding: 12px;
|
||||
border-style: outset;
|
||||
border-width: 1px;
|
||||
border-color: #303030;
|
||||
}
|
||||
|
||||
#ResourceManagement #Bottom {
|
||||
background-color: #404040;
|
||||
padding: 12px;
|
||||
}
|
||||
|
||||
#ResourceManagement #Bottom #Title {
|
||||
background-color: #404040;
|
||||
font-size: 12px;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
#ResourceManagement #Bottom #Message {
|
||||
background-color: #404040;
|
||||
margin-bottom: 6px;
|
||||
}
|
||||
|
||||
#ResourceManagement #Bottom #Table {
|
||||
background-color: #404040;
|
||||
qproperty-alternatingRowColors: true;
|
||||
}
|
||||
|
||||
#ResourceManagement #Bottom #Table QHeaderView {
|
||||
background-color: #404040;
|
||||
}
|
||||
|
||||
#ResourceManagement #Bottom #Table QHeaderView::section {
|
||||
background-color: #404040;
|
||||
}
|
||||
|
||||
#ResourceManagement #Bottom #Table::item {
|
||||
background-color: #393a3c;
|
||||
}
|
||||
|
||||
#ResourceManagement #Bottom #Table::item:alternate {
|
||||
background-color: #303030;
|
||||
}
|
||||
|
||||
#ResourceManagement #Bottom #Resources {
|
||||
background-color: #404040;
|
||||
}
|
||||
|
||||
#ResourceManagement #Bottom #Refreshing {
|
||||
background-color: #404040;
|
||||
}
|
||||
|
||||
#ResourceManagement #Stack #Heading #Message
|
||||
{
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
#ResourceManagement #Stack #Status #Title
|
||||
{
|
||||
font-size: 12px;
|
||||
font-weight: bold;
|
||||
margin-top: 6px;
|
||||
margin-bottom: 6px;
|
||||
}
|
||||
|
||||
#ResourceManagement #StackEvents #TitleBar {
|
||||
color: #CCCCCC;
|
||||
background-color: #393a3c;
|
||||
border-style: outset;
|
||||
border-width: 1px;
|
||||
border-color: #303030;
|
||||
}
|
||||
|
||||
#ResourceManagement #StackEvents #TitleBar * {
|
||||
font-size:12px;
|
||||
}
|
||||
|
||||
#ResourceManagement #StackEvents #TitleBar #Title {
|
||||
font-weight:bold;
|
||||
margin-right: 12px;
|
||||
}
|
||||
|
||||
#ResourceManagement #StackEvents #TitleBar #InProgress #Text {
|
||||
color: #F0C32D;
|
||||
}
|
||||
|
||||
#ResourceManagement #StackEvents #TitleBar #Succeeded {
|
||||
color: #43d96a;
|
||||
}
|
||||
|
||||
#ResourceManagement #StackEvents #TitleBar #Failed {
|
||||
color: #f44642;
|
||||
}
|
||||
|
||||
#ResourceManagement #StackEvents #Content {
|
||||
border-style: inset;
|
||||
border-width: 1px;
|
||||
border-color: #303030;
|
||||
padding: 12px;
|
||||
}
|
||||
|
||||
#ResourceManagement #StackEvents #Table {
|
||||
qproperty-alternatingRowColors: true;
|
||||
qproperty-showGrid: false;
|
||||
}
|
||||
|
||||
#ResourceManagement #StackEvents QTableView::item {
|
||||
background-color: #303030;
|
||||
}
|
||||
|
||||
#ResourceManagement #StackEvents QTableView::item:focus {
|
||||
selection-color: #FFFFFF;
|
||||
selection-background-color: rgba(255, 153, 0, 128);
|
||||
}
|
||||
|
||||
#ResourceManagement #StackEvents QTableView::item:alternate {
|
||||
background-color: #393a3c;
|
||||
}
|
||||
|
||||
#ResourceManagement #CreateDeployment #LearnMore
|
||||
{
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
|
||||
#ResourceManagement #CreateDeployment #WarningMessage
|
||||
{
|
||||
margin-top: 12px;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
|
||||
#ResourceManagement #LoadingError, #ResourceManagement #LoadingError #Title, #ResourceManagement #LoadingError #Message, #ResourceManagement #LoadingError #ErrorText
|
||||
{
|
||||
background: #404040;
|
||||
}
|
||||
|
||||
#ResourceManagement #LoadingError #ErrorText
|
||||
{
|
||||
padding: 12px;
|
||||
color: #f44642;
|
||||
}
|
||||
|
||||
#ResourceManagement #Loading, #ResourceManagement #Loading #Title, #ResourceManagement #Loading #Message
|
||||
{
|
||||
background: #404040;
|
||||
}
|
||||
|
||||
#ResourceManagement #Loading, #ResourceManagement #LoadingError
|
||||
{
|
||||
padding: 12px;
|
||||
}
|
||||
|
||||
#ResourceManagement #MainToolbar
|
||||
{
|
||||
padding: 6px;
|
||||
border-style: inset;
|
||||
border-width: 1px;
|
||||
border-color: #303030;
|
||||
}
|
||||
|
||||
#ResourceManagement #MainToolbar QPushButton
|
||||
{
|
||||
border: none;
|
||||
padding: 0px;
|
||||
}
|
||||
|
||||
#ResourceManagement #MainToolbar #AddNewButton
|
||||
{
|
||||
margin-left: 12px;
|
||||
margin-right: 12px;
|
||||
}
|
||||
|
||||
#ResourceManagement #ResourceImporter #RegionBox:disabled
|
||||
{
|
||||
color: #555555;
|
||||
}
|
||||
|
||||
#ResourceManagement #ResourceImporter #ListTable
|
||||
{
|
||||
qproperty-alternatingRowColors: true;
|
||||
qproperty-showGrid: false;
|
||||
border: none;
|
||||
}
|
||||
|
||||
#ResourceManagement #ResourceImporter #ListTable::item
|
||||
{
|
||||
padding-right: 12px;
|
||||
padding-top: 3px;
|
||||
padding-bottom: 3px;
|
||||
background-color: #333436;
|
||||
}
|
||||
|
||||
#ResourceManagement #ResourceImporter #ListTable::item:alternate
|
||||
{
|
||||
background-color: #303030;
|
||||
}
|
||||
|
||||
#ResourceManagement #ResourceImporter #SelectionTable
|
||||
{
|
||||
qproperty-showGrid: false;
|
||||
border: none;
|
||||
gridline-color: #393a3c;
|
||||
}
|
||||
|
||||
#ResourceManagement #ResourceImporter #SelectionTable::item
|
||||
{
|
||||
padding: 1px 1px 1px 1px;
|
||||
|
||||
}
|
||||
|
||||
#ResourceManagement #ResourceImporter #LoadingLabel
|
||||
{
|
||||
color : #F0C32D;
|
||||
}
|
||||
|
||||
#ResourceManagement #MainToolbar #SaveButton,
|
||||
#ResourceManagement #MainToolbar #DeleteButton,
|
||||
#ResourceManagement #MainToolbar #SourceControlButton,
|
||||
#ResourceManagement #MainToolbar #AddNewButton
|
||||
{
|
||||
qproperty-flat: true;
|
||||
}
|
||||
|
||||
#ResourceManagement #MainToolbar #CurrentProfile
|
||||
{
|
||||
margin-right: 12px;
|
||||
}
|
||||
|
||||
#ResourceManagement #MainToolbar #CurrentDeployment
|
||||
{
|
||||
margin-right: 12px;
|
||||
margin-left: 12px;
|
||||
}
|
||||
|
||||
#ResourceManagement #UpdateStack #Refreshing
|
||||
{
|
||||
margin-top: 12px;
|
||||
margin-left: 12px;
|
||||
}
|
||||
|
||||
#ResourceManagement #UpdateStack #Message
|
||||
{
|
||||
margin-bottom: 6px;
|
||||
}
|
||||
|
||||
#ResourceManagement #UpdateStack #Table {
|
||||
qproperty-alternatingRowColors: true;
|
||||
qproperty-showGrid: false;
|
||||
}
|
||||
|
||||
#ResourceManagement #UpdateStack #Table::item {
|
||||
background-color: #303030;
|
||||
}
|
||||
|
||||
#ResourceManagement #UpdateStack #Table::item:alternate {
|
||||
background-color: #393a3c;
|
||||
}
|
||||
|
||||
#ResourceManagement #UpdateStack #Status {
|
||||
color: #F0C32D;
|
||||
}
|
||||
|
||||
#ProfileSelector #DeleteProfile {
|
||||
width: 38px;
|
||||
height: 11px;
|
||||
border: none;
|
||||
}
|
||||
|
||||
#ProfileSelector #EditSelectedProfile {
|
||||
color: #00A1C9;
|
||||
}
|
||||
|
||||
#InitializeCloudCanvasProject #Profiles QRadioButton {
|
||||
margin-left: 5px;
|
||||
}
|
||||
|
||||
#InitializeCloudCanvasProject #ProfileEditButtons {
|
||||
}
|
||||
|
||||
#InitializeCloudCanvasProject #ProfileEditButtons QPushButton {
|
||||
}
|
||||
|
||||
#InitializeCloudCanvasProject #ContentFrame {
|
||||
x-margin: 6px;
|
||||
x-padding: 6px;
|
||||
border: 1px solid rgb(34, 35, 38);
|
||||
x-background-color: purple;
|
||||
}
|
||||
|
||||
#LoginDialog
|
||||
{
|
||||
background-color: #F8F8F8;
|
||||
}
|
||||
|
||||
#LoginDialog Amazon--LoginWelcomeTitle
|
||||
{
|
||||
color: #444444;
|
||||
background-color: #F8F8F8;
|
||||
font-size: 21px;
|
||||
qproperty-alignment: AlignCenter;
|
||||
font-family: "Open Sans Semibold";
|
||||
}
|
||||
|
||||
#LoginDialog Amazon--LoginWelcomeText
|
||||
{
|
||||
color: #444444;
|
||||
background-color: #F8F8F8;
|
||||
font-size: 13px;
|
||||
qproperty-alignment: AlignLeft;
|
||||
}
|
||||
|
||||
#LoginDialog Amazon--LoginFooterText
|
||||
{
|
||||
color: #999999;
|
||||
background-color: #F8F8F8;
|
||||
font-size: 13px;
|
||||
qproperty-alignment: AlignCenter;
|
||||
}
|
||||
|
||||
#LoginDialog Amazon--LoginWebViewFrame
|
||||
{
|
||||
border: 2px solid #EEEEEE;
|
||||
}
|
||||
|
||||
#LoginDialog Amazon--LoginWebView
|
||||
{
|
||||
background-color: #F8F8F8;
|
||||
}
|
||||
@@ -1,10 +1,9 @@
|
||||
<!DOCTYPE RCC><RCC version="1.0">
|
||||
<qresource>
|
||||
<file alias="Editor/Style/Editor.qss">Editor.qss</file>
|
||||
<file alias="Editor/Style/EditorPreferencesDialog.qss">EditorPreferencesDialog.qss</file>
|
||||
<file alias="Editor/Style/CloudCanvas.qss">CloudCanvas.qss</file>
|
||||
<file alias="Editor/Style/LayoutConfigDialog.qss">LayoutConfigDialog.qss</file>
|
||||
<file alias="Editor/Style/GraphicsSettingsDialog.qss">GraphicsSettingsDialog.qss</file>
|
||||
<file alias="Editor/Style/LensFlareEditor.qss">LensFlareEditor.qss</file>
|
||||
<file alias="Assets/Editor/Style/Editor.qss">Editor.qss</file>
|
||||
<file alias="Assets/Editor/Style/EditorPreferencesDialog.qss">EditorPreferencesDialog.qss</file>
|
||||
<file alias="Assets/Editor/Style/LayoutConfigDialog.qss">LayoutConfigDialog.qss</file>
|
||||
<file alias="Assets/Editor/Style/GraphicsSettingsDialog.qss">GraphicsSettingsDialog.qss</file>
|
||||
<file alias="Assets/Editor/Style/LensFlareEditor.qss">LensFlareEditor.qss</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
||||
@@ -1088,7 +1088,7 @@ void CTimeOfDayDialog::OnResetToDefaultValues()
|
||||
ITimeOfDay* pTimeOfDay = gEnv->p3DEngine->GetTimeOfDay();
|
||||
|
||||
// Load the default time of day settings and use those to reset the time of day.
|
||||
XmlNodeRef root = GetISystem()->LoadXmlFromFile("Editor/default_time_of_day.xml");
|
||||
XmlNodeRef root = GetISystem()->LoadXmlFromFile("default_time_of_day.xml");
|
||||
if (root)
|
||||
{
|
||||
pTimeOfDay->Serialize(root, true);
|
||||
|
||||
@@ -335,21 +335,9 @@ void CToolBoxManager::Load(ActionManager* actionManager)
|
||||
|
||||
if (actionManager)
|
||||
{
|
||||
QByteArray array = gSettings.strEditorEnv.toUtf8();
|
||||
AZStd::string actualPath = AZStd::string::format("@engroot@/%s", array.constData());
|
||||
XmlNodeRef envNode = XmlHelpers::LoadXmlFromFile(actualPath.c_str());
|
||||
if (envNode)
|
||||
{
|
||||
int childrenCount = envNode->getChildCount();
|
||||
for (int idx = 0; idx < childrenCount; ++idx)
|
||||
{
|
||||
XmlNodeRef child = envNode->getChild(idx);
|
||||
if (child->haveAttr("scriptPath") && child->haveAttr("shelvesPath"))
|
||||
{
|
||||
LoadShelves(child->getAttr("scriptPath"), child->getAttr("shelvesPath"), actionManager);
|
||||
}
|
||||
}
|
||||
}
|
||||
auto engineSourceAssetPath = AZ::IO::FixedMaxPath(AZ::Utils::GetEnginePath()) / "Assets";
|
||||
LoadShelves((engineSourceAssetPath / "Editor" / "Scripts").c_str(),
|
||||
(engineSourceAssetPath / "Editor" / "Scripts" / "Shelves").c_str(), actionManager);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -376,9 +376,9 @@ private:
|
||||
// Tracks new entities that have not yet been saved.
|
||||
AZStd::unordered_set<AZ::EntityId> m_unsavedEntities;
|
||||
|
||||
const AZStd::string m_defaultComponentIconLocation = "Editor/Icons/Components/Component_Placeholder.svg";
|
||||
const AZStd::string m_defaultComponentViewportIconLocation = "Editor/Icons/Components/Viewport/Component_Placeholder.png";
|
||||
const AZStd::string m_defaultEntityIconLocation = "Editor/Icons/Components/Viewport/Transform.png";
|
||||
const AZStd::string m_defaultComponentIconLocation = "Icons/Components/Component_Placeholder.svg";
|
||||
const AZStd::string m_defaultComponentViewportIconLocation = "Icons/Components/Viewport/Component_Placeholder.png";
|
||||
const AZStd::string m_defaultEntityIconLocation = "Icons/Components/Viewport/Transform.png";
|
||||
|
||||
bool m_debugDisplayBusImplementationActive = false;
|
||||
|
||||
|
||||
+2
-2
@@ -33,8 +33,8 @@ void ComponentCategoryList::Init()
|
||||
headers << tr("Categories");
|
||||
setHeaderLabels(headers);
|
||||
|
||||
const QString parentCategoryIconPath = QString("Editor/Icons/PropertyEditor/Browse_on.png");
|
||||
const QString categoryIconPath = QString("Editor/Icons/PropertyEditor/Browse.png");
|
||||
const QString parentCategoryIconPath = QString("Icons/PropertyEditor/Browse_on.png");
|
||||
const QString categoryIconPath = QString("Icons/PropertyEditor/Browse.png");
|
||||
|
||||
QTreeWidgetItem* allCategory = new QTreeWidgetItem(this);
|
||||
allCategory->setText(0, "All");
|
||||
|
||||
@@ -94,7 +94,7 @@ namespace AZ
|
||||
{
|
||||
if (AzFramework::StringFunc::Equal(extensionString.c_str(), potentialExtension.c_str()))
|
||||
{
|
||||
return AzToolsFramework::AssetBrowser::SourceFileDetails("Editor/Icons/AssetBrowser/FBX_16.png");
|
||||
return AzToolsFramework::AssetBrowser::SourceFileDetails("Icons/AssetBrowser/FBX_16.png");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
<RCC>
|
||||
<qresource prefix="/Icons">
|
||||
<file alias="Browse.png">../../../../Editor/Icons/PropertyEditor/Browse.png</file>
|
||||
<file alias="Browse_On.png">../../../../Editor/Icons/PropertyEditor/Browse_on.png</file>
|
||||
<file alias="DeleteRule.png">../../../../Editor/Icons/PropertyEditor/remove.png</file>
|
||||
<file alias="DeleteGroup.png">../../../../Editor/Icons/PropertyEditor/remove.png</file>
|
||||
<file alias="Error.png">../../../../Editor/Icons/PropertyEditor/error_icon.png</file>
|
||||
<file alias="RefreshGroup.png">../../../../Editor/Icons/PropertyEditor/reset_icon.png</file>
|
||||
<file alias="MeshSelectorBrowse.png">../../../../Editor/Icons/AssetImporter/mesh.png</file>
|
||||
<file alias="MeshSelectorBrowse_On.png">../../../../Editor/Icons/AssetImporter/mesh_on.png</file>
|
||||
<file alias="MeshTreeIcon.png">../../../../Editor/Icons/AssetImporter/mesh_on.png</file>
|
||||
<file alias="GroupTreeIcon.png">../../../../Editor/Icons/AssetImporter/group_icon.png</file>
|
||||
<file alias="CheckMark_Checked.png">../../../../Editor/Icons/checkmark_checked.png</file>
|
||||
<file alias="CheckMark_Hover.png">../../../../Editor/Icons/checkmark_checked_hover.png</file>
|
||||
<file alias="CheckMark_Unchecked_Hover.png">../../../../Editor/Icons/checkmark_unchecked_hover.png</file>
|
||||
<file alias="Browse.png">../../../../Assets/Editor/Icons/PropertyEditor/Browse.png</file>
|
||||
<file alias="Browse_On.png">../../../../Assets/Editor/Icons/PropertyEditor/Browse_on.png</file>
|
||||
<file alias="DeleteRule.png">../../../../Assets/Editor/Icons/PropertyEditor/remove.png</file>
|
||||
<file alias="DeleteGroup.png">../../../../Assets/Editor/Icons/PropertyEditor/remove.png</file>
|
||||
<file alias="Error.png">../../../../Assets/Editor/Icons/PropertyEditor/error_icon.png</file>
|
||||
<file alias="RefreshGroup.png">../../../../Assets/Editor/Icons/PropertyEditor/reset_icon.png</file>
|
||||
<file alias="MeshSelectorBrowse.png">../../../../Assets/Editor/Icons/AssetImporter/mesh.png</file>
|
||||
<file alias="MeshSelectorBrowse_On.png">../../../../Assets/Editor/Icons/AssetImporter/mesh_on.png</file>
|
||||
<file alias="MeshTreeIcon.png">../../../../Assets/Editor/Icons/AssetImporter/mesh_on.png</file>
|
||||
<file alias="GroupTreeIcon.png">../../../../Assets/Editor/Icons/AssetImporter/group_icon.png</file>
|
||||
<file alias="CheckMark_Checked.png">../../../../Assets/Editor/Icons/checkmark_checked.png</file>
|
||||
<file alias="CheckMark_Hover.png">../../../../Assets/Editor/Icons/checkmark_checked_hover.png</file>
|
||||
<file alias="CheckMark_Unchecked_Hover.png">../../../../Assets/Editor/Icons/checkmark_unchecked_hover.png</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
||||
@@ -175,7 +175,7 @@ CDockTitleBarWidget::CDockTitleBarWidget(QDockWidget* dockWidget)
|
||||
m_layout->addLayout(m_buttonLayout, 0);
|
||||
|
||||
m_floatButton = new CDockWidgetTitleButton(dockWidget);
|
||||
m_floatButton->setIcon(QIcon("Editor/Icons/float.png"));
|
||||
m_floatButton->setIcon(QIcon("Icons/float.png"));
|
||||
m_floatButton->setVisible(opt.floatable);
|
||||
m_floatButton->setToolTip("Toggle Floating");
|
||||
connect(m_floatButton, SIGNAL(clicked()), SLOT(OnFloatButtonPressed()));
|
||||
@@ -185,7 +185,7 @@ CDockTitleBarWidget::CDockTitleBarWidget(QDockWidget* dockWidget)
|
||||
// close.png is a standard icon that looks similar to one in Fusion theme but
|
||||
// uses alpha so it can be used on dark theme as well.
|
||||
// style()->standardIcon(QStyle::SP_TitleBarCloseButton, &opt, dockWidget)
|
||||
QIcon closeIcon("Editor/Icons/close.png");
|
||||
QIcon closeIcon("Icons/close.png");
|
||||
m_closeButton->setIcon(closeIcon);
|
||||
m_closeButton->setVisible(opt.closable);
|
||||
m_closeButton->setToolTip("Close");
|
||||
|
||||
@@ -80,7 +80,7 @@ void PropertyRowLocalFrameBase::reset(QPropertyTree* tree)
|
||||
|
||||
void PropertyRowLocalFrameBase::redraw(const PropertyDrawContext& context)
|
||||
{
|
||||
static QIcon gizmo("Editor/Icons/animation/gizmo_location.png");
|
||||
static QIcon gizmo("Icons/animation/gizmo_location.png");
|
||||
gizmo.paint(context.painter, context.widgetRect.adjusted(1, 1, 1, 1), Qt::AlignRight);
|
||||
}
|
||||
|
||||
|
||||
@@ -292,7 +292,7 @@ const QIcon& PropertyRowResourceSelector::buttonIcon(const QPropertyTree* tree,
|
||||
}
|
||||
case BUTTON_CREATE:
|
||||
{
|
||||
static QIcon addIcon("Editor/Icons/animation/add.png");
|
||||
static QIcon addIcon("Icons/animation/add.png");
|
||||
;
|
||||
return addIcon;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user