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

AtomToolsApplication working with SMC

Browse Source 
Signed-off-by: Dayo Lawal <lawalfua@amazon.com>
This commit is contained in:
Dayo Lawal
2021-07-21 16:47:06 -05:00
parent 002a4a4a21
commit c1998d8d3c
5 changed files with 12 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/Tools/AtomToolsFramework/Code/Source/Application/AtomToolsApplication.cpp
-3
View File
@@ -154,9 +154,6 @@ namespace AtomToolsFramework
AzToolsFramework::AssetDatabase::AssetDatabaseRequestsBus::Handler::BusDisconnect();
AZ::Debug::TraceMessageBus::Handler::BusDisconnect();
m_logFile = {};
m_startupLogSink = {};
AzFramework::AssetSystemRequestBus::Broadcast(&AzFramework::AssetSystem::AssetSystemRequests::StartDisconnectingAssetProcessor);
Application::Destroy();
}
Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.cpp
-5
View File
@@ -346,11 +346,6 @@ namespace MaterialEditor
AzFramework::Application::Stop();
}
void MaterialEditorApplication::QueryApplicationType(AZ::ApplicationTypeQuery& appType) const
{
appType.m_maskValue = AZ::ApplicationTypeQuery::Masks::Game;
}
void MaterialEditorApplication::OnTraceMessage([[maybe_unused]] AZStd::string_view message)
{
#if defined(AZ_ENABLE_TRACING)
Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.h
-5
View File
@@ -61,11 +61,6 @@ namespace MaterialEditor
void Destroy() override;
//////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////
// AZ::ComponentApplication overrides...
void QueryApplicationType(AZ::ApplicationTypeQuery& appType) const override;
//////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
// EditorPythonConsoleNotificationBus::Handler overrides...
void OnTraceMessage(AZStd::string_view message) override;
Gems/Atom/Tools/ShaderManagementConsole/Code/Source/ShaderManagementConsoleApplication.cpp
+10 -11
View File
@@ -98,7 +98,7 @@ namespace ShaderManagementConsole
ShaderManagementConsoleWindowNotificationBus::Handler::BusDisconnect();
AzToolsFramework::AssetDatabase::AssetDatabaseRequestsBus::Handler::BusDisconnect();
m_traceLogger.~TraceLogger();
AZ::Debug::TraceMessageBus::Handler::BusDisconnect();
AzFramework::AssetSystemRequestBus::Broadcast(&AzFramework::AssetSystem::AssetSystemRequests::StartDisconnectingAssetProcessor);
@@ -175,7 +175,7 @@ namespace ShaderManagementConsole
QString("Failed to compile the following critical assets:\n%1\n%2")
.arg(failedAssets.join(",\n"))
.arg("Make sure this is an Atom project."));
m_closing = true;
ExitMainLoop();
}
}
@@ -214,16 +214,9 @@ namespace ShaderManagementConsole
}
}
bool ShaderManagementConsoleApplication::LaunchDiscoveryService()
{
const QStringList arguments = { "-fail_silently" };
return AtomToolsFramework::LaunchTool("GridHub", AZ_TRAIT_SHADER_MANAGEMENT_CONSOLE_EXT, arguments);
}
void ShaderManagementConsoleApplication::StartInternal()
{
if (m_closing)
if (WasExitMainLoopRequested())
{
return;
}
@@ -276,7 +269,7 @@ namespace ShaderManagementConsole
TickSystem();
Application::Tick(deltaOverride);
if (m_closing)
if (WasExitMainLoopRequested())
{
m_timer.disconnect();
quit();
@@ -302,6 +295,12 @@ namespace ShaderManagementConsole
#endif
}
void ShaderManagementConsoleApplication::OnErrorMessage(AZStd::string_view message)
{
// Use AZ_TracePrintf instead of AZ_Error or AZ_Warning to avoid all the metadata noise
OnTraceMessage(message);
}
void ShaderManagementConsoleApplication::OnExceptionMessage([[maybe_unused]] AZStd::string_view message)
{
AZ_Error("Shader Management Console", false, "Python: " AZ_STRING_FORMAT, AZ_STRING_ARG(message));
Gems/Atom/Tools/ShaderManagementConsole/Code/Source/ShaderManagementConsoleApplication.h
+2 -30
View File
@@ -32,9 +32,6 @@ namespace ShaderManagementConsole
class ShaderManagementConsoleApplication
: public AtomToolsFramework::AtomToolsApplication
, private ShaderManagementConsoleWindowNotificationBus::Handler
, private AzFramework::AssetSystemStatusBus::Handler
, private AzToolsFramework::AssetDatabase::AssetDatabaseRequestsBus::Handler
, private AzToolsFramework::EditorPythonConsoleNotificationBus::Handler
{
public:
AZ_TYPE_INFO(ShaderManagementConsole::ShaderManagementConsoleApplication, "{30F90CA5-1253-49B5-8143-19CEE37E22BB}");
@@ -46,15 +43,9 @@ namespace ShaderManagementConsole
//////////////////////////////////////////////////////////////////////////
// AzFramework::Application
void CreateReflectionManager() override;
void Reflect(AZ::ReflectContext* context) override;
void RegisterCoreComponents() override;
AZ::ComponentTypeList GetRequiredSystemComponents() const override;
void CreateStaticModules(AZStd::vector<AZ::Module*>& outModules) override;
const char* GetCurrentConfigurationName() const override;
void StartCommon(AZ::Entity* systemEntity) override;
void Tick(float deltaOverride = -1.f) override;
void Stop() override;
private:
//////////////////////////////////////////////////////////////////////////
@@ -72,11 +63,6 @@ namespace ShaderManagementConsole
void Destroy() override;
//////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////
// AzFramework::ApplicationRequests::Bus overrides...
void QueryApplicationType(AZ::ApplicationTypeQuery& appType) const override;
//////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
// EditorPythonConsoleNotificationBus::Handler overrides...
void OnTraceMessage(AZStd::string_view message) override;
@@ -89,27 +75,13 @@ namespace ShaderManagementConsole
void AssetSystemAvailable() override;
//////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////
// AZ::UserSettingsOwnerRequestBus::Handler overrides...
void SaveSettings() override;
//////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////
// AZ::Debug::TraceMessageBus::Handler overrides...
bool OnPrintf(const char* window, const char* message) override;
//////////////////////////////////////////////////////////////////////////
void CompileCriticalAssets();
void CompileCriticalAssets() override;
void ProcessCommandLine();
void LoadSettings();
void UnloadSettings();
bool LaunchDiscoveryService();
void StartInternal();
static void PyIdleWaitFrames(uint32_t frames);
void StartInternal() override;
};
} // namespace ShaderManagementConsole