Fixing issues with shader management console startup

Updating test scripts Synchronizing SMC and ME application classes Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-08-03 17:07:03 -05:00
parent 24740b3f86
commit f269d222b7
5 changed files with 38 additions and 37 deletions
@@ -87,14 +87,12 @@ namespace AtomToolsFramework

        if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
        {
-            auto targetName = GetBuildTargetName();
-
            // this will put these methods into the 'azlmbr.AtomTools.general' module
-            auto addGeneral = [targetName](AZ::BehaviorContext::GlobalMethodBuilder methodBuilder)
+            auto addGeneral = [](AZ::BehaviorContext::GlobalMethodBuilder methodBuilder)
            {
                methodBuilder->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
                    ->Attribute(AZ::Script::Attributes::Category, "Editor")
-                    ->Attribute(AZ::Script::Attributes::Module, targetName);
+                    ->Attribute(AZ::Script::Attributes::Module, "atomtools.general");
            };
            // The reflection here is based on patterns in CryEditPythonHandler::Reflect
            addGeneral(behaviorContext->Method(
@@ -9,7 +9,6 @@
 #include <AzCore/IO/Path/Path.h>
 #include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzCore/Utils/Utils.h>
-#include <AzFramework/Asset/AssetSystemComponent.h>
 #include <AzFramework/IO/LocalFileIO.h>
 #include <AzFramework/Network/AssetProcessorConnection.h>
 #include <AzFramework/StringFunc/StringFunc.h>
@@ -28,11 +27,11 @@

 #include <AtomToolsFramework/Util/Util.h>

-#include <Atom/Document/MaterialDocumentSystemRequestBus.h>
 #include <Atom/RPI.Edit/Common/AssetUtils.h>
 #include <Atom/RPI.Public/RPISystemInterface.h>

 #include <Atom/Document/MaterialDocumentModule.h>
+#include <Atom/Document/MaterialDocumentSystemRequestBus.h>
 #include <Atom/Viewport/MaterialViewportModule.h>
 #include <Atom/Window/MaterialEditorWindowFactoryRequestBus.h>
 #include <Atom/Window/MaterialEditorWindowModule.h>
@@ -73,15 +72,14 @@ namespace MaterialEditor
    {
        QApplication::setApplicationName("O3DE Material Editor");

+        // The settings registry has been created at this point, so add the CMake target
        AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddBuildSystemTargetSpecialization(
            *AZ::SettingsRegistry::Get(), GetBuildTargetName());
    }

    MaterialEditorApplication::~MaterialEditorApplication()
    {
-        AzToolsFramework::AssetDatabase::AssetDatabaseRequestsBus::Handler::BusDisconnect();
        MaterialEditorWindowNotificationBus::Handler::BusDisconnect();
-        AzToolsFramework::EditorPythonConsoleNotificationBus::Handler::BusDisconnect();
    }

    void MaterialEditorApplication::CreateStaticModules(AZStd::vector<AZ::Module*>& outModules)
@@ -122,8 +120,8 @@ namespace MaterialEditor
                &MaterialEditor::MaterialEditorWindowRequestBus::Handler::ActivateWindow);
        }

-        // Process command line options for opening one or more material documents on startup
-        size_t openDocumentCount = commandLine.GetNumMiscValues();
+        // Process command line options for opening one or more documents on startup
+        size_t openDocumentCount = m_commandLine.GetNumMiscValues();
        for (size_t openDocumentIndex = 0; openDocumentIndex < openDocumentCount; ++openDocumentIndex)
        {
            const AZStd::string openDocumentPath = commandLine.GetMiscValue(openDocumentIndex);
@@ -114,11 +114,11 @@ def SetCameraPitch(pitch):
    azlmbr.render.ArcBallControllerRequestBus(azlmbr.bus.Broadcast, 'SetPitch', pitch)

 def IdleFrames(numFrames):
-    azlmbr.materialeditor.general.idle_wait_frames(numFrames)
+    azlmbr.atomtools.general.idle_wait_frames(numFrames)

 def CaptureScreenshot(screenshotOutputPath):
    print("Capturing screenshot to " + screenshotOutputPath + " ...")
-    return ScreenshotHelper(azlmbr.materialeditor.general.idle_wait_frames).capture_screenshot_blocking(screenshotOutputPath)
+    return ScreenshotHelper(azlmbr.atomtools.general.idle_wait_frames).capture_screenshot_blocking(screenshotOutputPath)

 def ResizeViewport(width, height):
    # This locks the size of the render target to the desired resolution
@@ -25,26 +25,27 @@
 #include <AzToolsFramework/UI/UICore/QTreeViewStateSaver.hxx>
 #include <AzToolsFramework/UI/UICore/QWidgetSavedState.h>

-#include <Atom/RPI.Edit/Common/AssetUtils.h>
-#include <Atom/RPI.Public/RPISystemInterface.h>
 #include <AtomToolsFramework/Util/Util.h>

-#include <ShaderManagementConsoleApplication.h>
-#include <ShaderManagementConsole_Traits_Platform.h>
+#include <Atom/RPI.Edit/Common/AssetUtils.h>
+#include <Atom/RPI.Public/RPISystemInterface.h>

 #include <Atom/Document/ShaderManagementConsoleDocumentModule.h>
 #include <Atom/Document/ShaderManagementConsoleDocumentSystemRequestBus.h>
 #include <Atom/Window/ShaderManagementConsoleWindowModule.h>
 #include <Atom/Window/ShaderManagementConsoleWindowRequestBus.h>

+#include <ShaderManagementConsoleApplication.h>
+#include <ShaderManagementConsole_Traits_Platform.h>
+
 AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // disable warnings spawned by QT
-#include <QFileInfo>
 #include <QMessageBox>
 #include <QObject>
 AZ_POP_DISABLE_WARNING

 namespace ShaderManagementConsole
 {
+    //! This function returns the build system target name of "ShaderManagementConsole
    AZStd::string ShaderManagementConsoleApplication::GetBuildTargetName() const
    {
 #if !defined(LY_CMAKE_TARGET)
@@ -74,6 +75,11 @@ namespace ShaderManagementConsole
            *AZ::SettingsRegistry::Get(), GetBuildTargetName());
    }

+    ShaderManagementConsoleApplication::~ShaderManagementConsoleApplication()
+    {
+        ShaderManagementConsoleWindowNotificationBus::Handler::BusDisconnect();
+    }
+
    void ShaderManagementConsoleApplication::CreateStaticModules(AZStd::vector<AZ::Module*>& outModules)
    {
        Base::CreateStaticModules(outModules);
@@ -84,8 +90,6 @@ namespace ShaderManagementConsole
    void ShaderManagementConsoleApplication::OnShaderManagementConsoleWindowClosing()
    {
        ExitMainLoop();
-        ShaderManagementConsoleWindowNotificationBus::Handler::BusDisconnect();
-        AzToolsFramework::EditorPythonConsoleNotificationBus::Handler::BusDisconnect();
    }

    void ShaderManagementConsoleApplication::Destroy()
@@ -104,27 +108,19 @@ namespace ShaderManagementConsole
        return AZStd::vector<AZStd::string>({ "passes/", "config/" });
    }

-    void ShaderManagementConsoleApplication::ProcessCommandLine()
+    void ShaderManagementConsoleApplication::ProcessCommandLine(const AZ::CommandLine& commandLine)
    {
-        // Process command line options for running one or more python scripts on startup
-        const AZStd::string runPythonScriptSwitchName = "runpython";
-        size_t runPythonScriptCount = m_commandLine.GetNumSwitchValues(runPythonScriptSwitchName);
-        for (size_t runPythonScriptIndex = 0; runPythonScriptIndex < runPythonScriptCount; ++runPythonScriptIndex)
-        {
-            const AZStd::string runPythonScriptPath = m_commandLine.GetSwitchValue(runPythonScriptSwitchName, runPythonScriptIndex);
-            AZStd::vector<AZStd::string_view> runPythonArgs;
-            AzToolsFramework::EditorPythonRunnerRequestBus::Broadcast(
-                &AzToolsFramework::EditorPythonRunnerRequestBus::Events::ExecuteByFilenameWithArgs, runPythonScriptPath, runPythonArgs);
-        }
-
        // Process command line options for opening one or more documents on startup
        size_t openDocumentCount = m_commandLine.GetNumMiscValues();
        for (size_t openDocumentIndex = 0; openDocumentIndex < openDocumentCount; ++openDocumentIndex)
        {
-            const AZStd::string openDocumentPath = m_commandLine.GetMiscValue(openDocumentIndex);
-            ShaderManagementConsoleDocumentSystemRequestBus::Broadcast(
-                &ShaderManagementConsoleDocumentSystemRequestBus::Events::OpenDocument, openDocumentPath);
+            const AZStd::string openDocumentPath = commandLine.GetMiscValue(openDocumentIndex);
+
+            AZ_Printf(GetBuildTargetName().c_str(), "Opening document: %s", openDocumentPath.c_str());
+            ShaderManagementConsoleDocumentSystemRequestBus::Broadcast(&ShaderManagementConsoleDocumentSystemRequestBus::Events::OpenDocument, openDocumentPath);
        }
+
+        Base::ProcessCommandLine(commandLine);
    }

    void ShaderManagementConsoleApplication::StartInternal()
@@ -136,4 +132,12 @@ namespace ShaderManagementConsole
        ShaderManagementConsole::ShaderManagementConsoleWindowRequestBus::Broadcast(
            &ShaderManagementConsole::ShaderManagementConsoleWindowRequestBus::Handler::CreateShaderManagementConsoleWindow);
    }
+
+    void ShaderManagementConsoleApplication::Stop()
+    {
+        ShaderManagementConsole::ShaderManagementConsoleWindowRequestBus::Broadcast(
+            &ShaderManagementConsole::ShaderManagementConsoleWindowRequestBus::Handler::DestroyShaderManagementConsoleWindow);
+
+        Base::Stop();
+    }
 } // namespace ShaderManagementConsole
@@ -26,12 +26,13 @@ namespace ShaderManagementConsole
        using Base = AtomToolsFramework::AtomToolsApplication;

        ShaderManagementConsoleApplication(int* argc, char*** argv);
-        virtual ~ShaderManagementConsoleApplication() = default;
+        virtual ~ShaderManagementConsoleApplication();

        //////////////////////////////////////////////////////////////////////////
        // AzFramework::Application
        void CreateStaticModules(AZStd::vector<AZ::Module*>& outModules) override;
        const char* GetCurrentConfigurationName() const override;
+        void Stop() override;

    private:
        //////////////////////////////////////////////////////////////////////////
@@ -44,9 +45,9 @@ namespace ShaderManagementConsole
        void Destroy() override;
        //////////////////////////////////////////////////////////////////////////

-        void ProcessCommandLine();
+        void ProcessCommandLine(const AZ::CommandLine& commandLine) override;
        void StartInternal() override;
        AZStd::string GetBuildTargetName() const override;
        AZStd::vector<AZStd::string> GetCriticalAssetFilters() const override;
-    };
+     };
 } // namespace ShaderManagementConsole