Merge branch 'development' of https://github.com/o3de/o3de into feat/add-cursor-wrap-mode-viewport

2022-01-21 07:16:44 -08:00
parent fabb2b186c 32e2ba754b
commit ed5354fcae
1538 changed files with 24583 additions and 16847 deletions
@@ -12,6 +12,7 @@
 #include <AtomToolsFramework/Window/AtomToolsMainWindowFactoryRequestBus.h>
 #include <AtomToolsFramework/Window/AtomToolsMainWindowRequestBus.h>

+#include <AzCore/Component/ComponentApplicationLifecycle.h>
 #include <AzCore/IO/Path/Path.h>
 #include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzCore/Utils/Utils.h>
@@ -129,10 +130,13 @@ namespace AtomToolsFramework
                    ->Attribute(AZ::Script::Attributes::Category, "Editor")
                    ->Attribute(AZ::Script::Attributes::Module, "atomtools.general");
            };
-            // The reflection here is based on patterns in CryEditPythonHandler::Reflect
+
            addGeneral(behaviorContext->Method(
                "idle_wait_frames", &AtomToolsApplication::PyIdleWaitFrames, nullptr,
                "Waits idling for a frames. Primarily used for auto-testing."));
+            addGeneral(behaviorContext->Method(
+                "exit", &AtomToolsApplication::PyExit, nullptr,
+                "Exit application. Primarily used for auto-testing."));
        }
    }

@@ -154,6 +158,7 @@ namespace AtomToolsFramework
            components.end(),
            {
                azrtti_typeid<AzToolsFramework::AssetBrowser::AssetBrowserComponent>(),
+                azrtti_typeid<AzToolsFramework::AssetSystem::AssetSystemComponent>(),
                azrtti_typeid<AzToolsFramework::Thumbnailer::ThumbnailerComponent>(),
                azrtti_typeid<AzToolsFramework::Components::PropertyManagerComponent>(),
                azrtti_typeid<AzToolsFramework::PerforceComponent>(),
@@ -170,7 +175,6 @@ namespace AtomToolsFramework

    void AtomToolsApplication::StartCommon(AZ::Entity* systemEntity)
    {
-        AzFramework::AssetSystemStatusBus::Handler::BusConnect();
        AzToolsFramework::EditorPythonConsoleNotificationBus::Handler::BusConnect();

        Base::StartCommon(systemEntity);
@@ -178,10 +182,15 @@ namespace AtomToolsFramework
        const bool clearLogFile = GetSettingOrDefault("/O3DE/AtomToolsFramework/Application/ClearLogOnStart", false);
        m_traceLogger.OpenLogFile(GetBuildTargetName() + ".log", clearLogFile);

+        ConnectToAssetProcessor();
+
        AzToolsFramework::AssetDatabase::AssetDatabaseRequestsBus::Handler::BusConnect();
        AzToolsFramework::AssetBrowser::AssetDatabaseLocationNotificationBus::Broadcast(
            &AzToolsFramework::AssetBrowser::AssetDatabaseLocationNotifications::OnDatabaseInitialized);

+        AzToolsFramework::SourceControlConnectionRequestBus::Broadcast(
+            &AzToolsFramework::SourceControlConnectionRequests::EnableSourceControl, true);
+
        if (!AZ::RPI::RPISystemInterface::Get()->IsInitialized())
        {
            AZ::RPI::RPISystemInterface::Get()->InitializeSystemAssets();
@@ -235,7 +244,7 @@ namespace AtomToolsFramework
        return AZStd::vector<AZStd::string>({});
    }

-    void AtomToolsApplication::AssetSystemAvailable()
+    void AtomToolsApplication::ConnectToAssetProcessor()
    {
        bool connectedToAssetProcessor = false;

@@ -244,18 +253,19 @@ namespace AtomToolsFramework
        // and able to negotiate a connection when running a debug build
        // and to negotiate a connection

-        auto targetName = GetBuildTargetName();
+        const auto targetName = GetBuildTargetName();

        AzFramework::AssetSystem::ConnectionSettings connectionSettings;
        AzFramework::AssetSystem::ReadConnectionSettingsFromSettingsRegistry(connectionSettings);
        connectionSettings.m_connectionDirection =
            AzFramework::AssetSystem::ConnectionSettings::ConnectionDirection::ConnectToAssetProcessor;
-        connectionSettings.m_connectionIdentifier = GetBuildTargetName();
+        connectionSettings.m_connectionIdentifier = targetName;
        connectionSettings.m_loggingCallback = [targetName]([[maybe_unused]] AZStd::string_view logData)
        {
            AZ_UNUSED(targetName);  // Prevent unused warning in release builds
            AZ_TracePrintf(targetName.c_str(), "%.*s", aznumeric_cast<int>(logData.size()), logData.data());
        };
+
        AzFramework::AssetSystemRequestBus::BroadcastResult(
            connectedToAssetProcessor, &AzFramework::AssetSystemRequestBus::Events::EstablishAssetProcessorConnection, connectionSettings);

@@ -263,8 +273,6 @@ namespace AtomToolsFramework
        {
            CompileCriticalAssets();
        }
-
-        AzFramework::AssetSystemStatusBus::Handler::BusDisconnect();
    }

    void AtomToolsApplication::CompileCriticalAssets()
@@ -295,10 +303,25 @@ namespace AtomToolsFramework
            QMessageBox::critical(
                activeWindow(), QString("Failed to compile critical assets"),
                QString("Failed to compile the following critical assets:\n%1\n%2")
-                    .arg(failedAssets.join(",\n"))
-                    .arg("Make sure this is an Atom project."));
+                .arg(failedAssets.join(",\n"))
+                .arg("Make sure this is an Atom project."));
            ExitMainLoop();
        }
+
+        AZ::ComponentApplicationLifecycle::SignalEvent(*m_settingsRegistry, "CriticalAssetsCompiled", R"({})");
+
+        // Reload the assetcatalog.xml at this point again
+        // Start Monitoring Asset changes over the network and load the AssetCatalog
+        auto LoadCatalog = [settingsRegistry = m_settingsRegistry.get()](AZ::Data::AssetCatalogRequests* assetCatalogRequests)
+        {
+            if (AZ::IO::FixedMaxPath assetCatalogPath;
+                settingsRegistry->Get(assetCatalogPath.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_CacheRootFolder))
+            {
+                assetCatalogPath /= "assetcatalog.xml";
+                assetCatalogRequests->LoadCatalog(assetCatalogPath.c_str());
+            }
+        };
+        AZ::Data::AssetCatalogRequestBus::Broadcast(AZStd::move(LoadCatalog));
    }

    void AtomToolsApplication::SaveSettings()
@@ -549,4 +572,9 @@ namespace AtomToolsFramework
        Ticker ticker(&loop, frames);
        loop.exec();
    }
+
+    void AtomToolsApplication::PyExit()
+    {
+        AzFramework::ApplicationRequests::Bus::Broadcast(&AzFramework::ApplicationRequests::ExitMainLoop);
+    }
 } // namespace AtomToolsFramework
@@ -0,0 +1,224 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <AssetBrowser/ui_AtomToolsAssetBrowser.h>
+#include <AtomToolsFramework/AssetBrowser/AtomToolsAssetBrowser.h>
+#include <AzFramework/StringFunc/StringFunc.h>
+#include <AzQtComponents/Utilities/DesktopUtilities.h>
+#include <AzToolsFramework/AssetBrowser/AssetBrowserBus.h>
+#include <AzToolsFramework/AssetBrowser/AssetBrowserEntry.h>
+#include <AzToolsFramework/AssetBrowser/AssetBrowserFilterModel.h>
+#include <AzToolsFramework/AssetBrowser/AssetBrowserModel.h>
+#include <AzToolsFramework/AssetBrowser/AssetSelectionModel.h>
+#include <AzToolsFramework/AssetBrowser/Search/Filter.h>
+#include <AzToolsFramework/AssetBrowser/Views/AssetBrowserTreeView.h>
+
+AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // disable warnings spawned by QT
+#include <QAction>
+#include <QCursor>
+#include <QMenu>
+#include <QMessageBox>
+#include <QPushButton>
+AZ_POP_DISABLE_WARNING
+
+namespace AtomToolsFramework
+{
+    AtomToolsAssetBrowser::AtomToolsAssetBrowser(QWidget* parent)
+        : QWidget(parent)
+        , m_ui(new Ui::AtomToolsAssetBrowser)
+    {
+        using namespace AzToolsFramework::AssetBrowser;
+
+        m_ui->setupUi(this);
+
+        m_ui->m_searchWidget->Setup(true, true);
+        m_ui->m_searchWidget->setMinimumSize(QSize(150, 0));
+
+        m_ui->m_viewOptionButton->setIcon(QIcon(":/Icons/view.svg"));
+        m_ui->m_splitter->setSizes(QList<int>() << 400 << 200);
+        m_ui->m_splitter->setStretchFactor(0, 1);
+
+        // Get the asset browser model
+        AssetBrowserModel* assetBrowserModel = nullptr;
+        AssetBrowserComponentRequestBus::BroadcastResult(assetBrowserModel, &AssetBrowserComponentRequests::GetAssetBrowserModel);
+        AZ_Assert(assetBrowserModel, "Failed to get file browser model");
+
+        // Hook up the data set to the tree view
+        m_filterModel = aznew AssetBrowserFilterModel(this);
+        m_filterModel->setSourceModel(assetBrowserModel);
+        m_filterModel->SetFilter(CreateFilter());
+
+        m_ui->m_assetBrowserTreeViewWidget->setModel(m_filterModel);
+        m_ui->m_assetBrowserTreeViewWidget->SetShowSourceControlIcons(false);
+        m_ui->m_assetBrowserTreeViewWidget->setSelectionMode(QAbstractItemView::SelectionMode::ExtendedSelection);
+
+        // Maintains the tree expansion state between runs
+        m_ui->m_assetBrowserTreeViewWidget->SetName("AssetBrowserTreeView_main");
+
+        connect(m_filterModel, &AssetBrowserFilterModel::filterChanged, this, &AtomToolsAssetBrowser::UpdateFilter);
+        connect(m_ui->m_assetBrowserTreeViewWidget, &AssetBrowserTreeView::activated, this, &AtomToolsAssetBrowser::OpenSelectedEntries);
+        connect(m_ui->m_assetBrowserTreeViewWidget, &AssetBrowserTreeView::selectionChangedSignal, this, &AtomToolsAssetBrowser::UpdatePreview);
+        connect(m_ui->m_viewOptionButton, &QPushButton::clicked, this, &AtomToolsAssetBrowser::OpenOptionsMenu);
+        connect(
+            m_ui->m_searchWidget->GetFilter().data(), &AssetBrowserEntryFilter::updatedSignal, m_filterModel,
+            &AssetBrowserFilterModel::filterUpdatedSlot);
+    }
+
+    AtomToolsAssetBrowser::~AtomToolsAssetBrowser()
+    {
+        // Maintains the tree expansion state between runs
+        m_ui->m_assetBrowserTreeViewWidget->SaveState();
+        AZ::TickBus::Handler::BusDisconnect();
+    }
+
+    void AtomToolsAssetBrowser::SetFilterState(const AZStd::string& category, const AZStd::string& displayName, bool enabled)
+    {
+        m_ui->m_searchWidget->SetFilterState(category.c_str(), displayName.c_str(), enabled);
+    }
+
+    void AtomToolsAssetBrowser::SetOpenHandler(AZStd::function<void(const AZStd::string&)> openHandler)
+    {
+        m_openHandler = openHandler;
+    }
+
+    void AtomToolsAssetBrowser::SelectEntries(const AZStd::string& absolutePath)
+    {
+        if (!absolutePath.empty())
+        {
+            // Selecting a new asset in the browser is not guaranteed to happen immediately.
+            // The asset browser model notifications are sent before the model is updated.
+            // Instead of relying on the notifications, queue the selection and process it on tick until this change occurs.
+            m_pathToSelect = absolutePath;
+            AzFramework::StringFunc::Path::Normalize(m_pathToSelect);
+            AZ::TickBus::Handler::BusConnect();
+        }
+    }
+
+    void AtomToolsAssetBrowser::OpenSelectedEntries()
+    {
+        const AZStd::vector<AssetBrowserEntry*> entries = m_ui->m_assetBrowserTreeViewWidget->GetSelectedAssets();
+
+        const int multiSelectPromptThreshold = 10;
+        if (entries.size() >= multiSelectPromptThreshold)
+        {
+            QMessageBox::StandardButton result = QMessageBox::question(
+                QApplication::activeWindow(),
+                tr("Attemptng to open %1 files").arg(entries.size()),
+                tr("Would you like to open anyway?"),
+                QMessageBox::Yes | QMessageBox::No);
+            if (result == QMessageBox::No)
+            {
+                return;
+            }
+        }
+
+        for (const AssetBrowserEntry* entry : entries)
+        {
+            if (entry && entry->GetEntryType() != AssetBrowserEntry::AssetEntryType::Folder && m_openHandler)
+            {
+                m_openHandler(entry->GetFullPath().c_str());
+            }
+        }
+    }
+
+    void AtomToolsAssetBrowser::OpenOptionsMenu()
+    {
+        QMenu menu;
+        QAction* action = menu.addAction(tr("Show Asset Preview"), this, &AtomToolsAssetBrowser::TogglePreview);
+        action->setCheckable(true);
+        action->setChecked(m_ui->m_previewerFrame->isVisible());
+        menu.exec(QCursor::pos());
+    }
+
+    AzToolsFramework::AssetBrowser::FilterConstType AtomToolsAssetBrowser::CreateFilter() const
+    {
+        using namespace AzToolsFramework::AssetBrowser;
+
+        QSharedPointer<EntryTypeFilter> sourceFilter(new EntryTypeFilter);
+        sourceFilter->SetEntryType(AssetBrowserEntry::AssetEntryType::Source);
+
+        QSharedPointer<EntryTypeFilter> folderFilter(new EntryTypeFilter);
+        folderFilter->SetEntryType(AssetBrowserEntry::AssetEntryType::Folder);
+
+        QSharedPointer<CompositeFilter> sourceOrFolderFilter(new CompositeFilter(CompositeFilter::LogicOperatorType::OR));
+        sourceOrFolderFilter->AddFilter(sourceFilter);
+        sourceOrFolderFilter->AddFilter(folderFilter);
+
+        QSharedPointer<CompositeFilter> finalFilter(new CompositeFilter(CompositeFilter::LogicOperatorType::AND));
+        finalFilter->AddFilter(sourceOrFolderFilter);
+        finalFilter->AddFilter(m_ui->m_searchWidget->GetFilter());
+
+        return finalFilter;
+    }
+
+    void AtomToolsAssetBrowser::UpdateFilter()
+    {
+        const bool hasFilter = !m_ui->m_searchWidget->GetFilterString().isEmpty();
+        constexpr bool selectFirstFilteredIndex = true;
+        m_ui->m_assetBrowserTreeViewWidget->UpdateAfterFilter(hasFilter, selectFirstFilteredIndex);
+    }
+
+    void AtomToolsAssetBrowser::UpdatePreview()
+    {
+        const auto& selectedAssets = m_ui->m_assetBrowserTreeViewWidget->GetSelectedAssets();
+        if (!selectedAssets.empty())
+        {
+            m_ui->m_previewerFrame->Display(selectedAssets.front());
+        }
+        else
+        {
+            m_ui->m_previewerFrame->Clear();
+        }
+    }
+
+    void AtomToolsAssetBrowser::TogglePreview()
+    {
+        const bool isPreviewFrameVisible = m_ui->m_previewerFrame->isVisible();
+        m_ui->m_previewerFrame->setVisible(!isPreviewFrameVisible);
+        if (isPreviewFrameVisible)
+        {
+            m_browserState = m_ui->m_splitter->saveState();
+            m_ui->m_splitter->setSizes(QList({ 1, 0 }));
+        }
+        else
+        {
+            m_ui->m_splitter->restoreState(m_browserState);
+        }
+    }
+
+    void AtomToolsAssetBrowser::OnTick(float deltaTime, AZ::ScriptTimePoint time)
+    {
+        AZ_UNUSED(time);
+        AZ_UNUSED(deltaTime);
+
+        if (!m_pathToSelect.empty())
+        {
+            // Attempt to select the new path
+            AzToolsFramework::AssetBrowser::AssetBrowserViewRequestBus::Broadcast(
+                &AzToolsFramework::AssetBrowser::AssetBrowserViewRequestBus::Events::SelectFileAtPath, m_pathToSelect);
+
+            // Iterate over the selected entries to verify if the selection was made
+            for (const AssetBrowserEntry* entry : m_ui->m_assetBrowserTreeViewWidget->GetSelectedAssets())
+            {
+                if (entry)
+                {
+                    AZStd::string sourcePath = entry->GetFullPath();
+                    AzFramework::StringFunc::Path::Normalize(sourcePath);
+                    if (m_pathToSelect == sourcePath)
+                    {
+                        // Once the selection is confirmed, cancel the operation and disconnect
+                        AZ::TickBus::Handler::BusDisconnect();
+                        m_pathToSelect.clear();
+                    }
+                }
+            }
+        }
+    }
+} // namespace AtomToolsFramework
+
+#include <AtomToolsFramework/AssetBrowser/moc_AtomToolsAssetBrowser.cpp>
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file>Icons/view.svg</file>
+    </qresource>
+</RCC>
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>AtomToolsAssetBrowser</class>
+ <widget class="QWidget" name="AtomToolsAssetBrowser">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>691</width>
+    <height>554</height>
+   </rect>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>0</width>
+    <height>400</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>Asset Browser</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <item>
+    <layout class="QHBoxLayout" name="m_headerLayout">
+     <item alignment="Qt::AlignTop">
+      <widget class="AzToolsFramework::AssetBrowser::SearchWidget" name="m_searchWidget" native="true">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+      </widget>
+     </item>
+     <item alignment="Qt::AlignTop">
+      <widget class="QPushButton" name="m_viewOptionButton">
+       <property name="autoExclusive">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QSplitter" name="m_splitter">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="childrenCollapsible">
+      <bool>false</bool>
+     </property>
+     <widget class="QWidget" name="m_leftLayout" native="true">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="styleSheet">
+       <string notr="true">vertical-align: top</string>
+      </property>
+      <layout class="QVBoxLayout" name="verticalLayout_4">
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="AzToolsFramework::AssetBrowser::AssetBrowserTreeView" name="m_assetBrowserTreeViewWidget">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+           <horstretch>1</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="dragDropMode">
+          <enum>QAbstractItemView::DragOnly</enum>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="previewWidgetWrapper">
+      <layout class="QVBoxLayout" name="m_rightLayout">
+       <item>
+        <widget class="AzToolsFramework::AssetBrowser::PreviewerFrame" name="m_previewerFrame">
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="frameShape">
+          <enum>QFrame::StyledPanel</enum>
+         </property>
+         <property name="frameShadow">
+          <enum>QFrame::Raised</enum>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>AzToolsFramework::AssetBrowser::SearchWidget</class>
+   <extends>QWidget</extends>
+   <header>AzToolsFramework/AssetBrowser/Search/SearchWidget.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>AzToolsFramework::AssetBrowser::AssetBrowserTreeView</class>
+   <extends>QTreeView</extends>
+   <header>AzToolsFramework/AssetBrowser/Views/AssetBrowserTreeView.h</header>
+  </customwidget>
+  <customwidget>
+   <class>AzToolsFramework::AssetBrowser::PreviewerFrame</class>
+   <extends>QFrame</extends>
+   <header>AzToolsFramework/AssetBrowser/Previewer/PreviewerFrame.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icons / System / View</title>
+    <g id="Icons-/-System-/-View" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <rect id="Icon-Background" x="0" y="0" width="24" height="24"></rect>
+        <path d="M11.9842667,6 C14.2018891,6 17.5404669,8 22,12 C17.5404669,16 14.2018891,18 11.9842667,18 C9.76664426,18 6.43855537,16 2,12 C6.43855537,8 9.76664426,6 11.9842667,6 Z M12,7.5 C9.51471863,7.5 7.5,9.51471863 7.5,12 C7.5,14.4852814 9.51471863,16.5 12,16.5 C14.4852814,16.5 16.5,14.4852814 16.5,12 C16.5,9.51471863 14.4852814,7.5 12,7.5 Z M12,9 C13.6568542,9 15,10.3431458 15,12 C15,13.6568542 13.6568542,15 12,15 C10.3431458,15 9,13.6568542 9,12 C9,10.3431458 10.3431458,9 12,9 Z" id="Combined-Shape" fill="#FFFFFF"></path>
+    </g>
+</svg>
@@ -30,7 +30,7 @@ namespace AtomToolsFramework
            {
                ec->Class<AtomToolsFrameworkSystemComponent>("AtomToolsFrameworkSystemComponent", "")
                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                    ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("System", 0xc94d118b))
+                    ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("System"))
                    ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                    ;
            }
@@ -39,12 +39,12 @@ namespace AtomToolsFramework

    void AtomToolsFrameworkSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
    {
-        provided.push_back(AZ_CRC("AtomToolsFrameworkSystemService"));
+        provided.push_back(AZ_CRC_CE("AtomToolsFrameworkSystemService"));
    }

    void AtomToolsFrameworkSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
    {
-        incompatible.push_back(AZ_CRC("AtomToolsFrameworkSystemService"));
+        incompatible.push_back(AZ_CRC_CE("AtomToolsFrameworkSystemService"));
    }

    void AtomToolsFrameworkSystemComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <AtomToolsFramework/Document/AtomToolsDocumentApplication.h>
+#include <AtomToolsFramework/Document/AtomToolsDocumentSystemRequestBus.h>
+
+namespace AtomToolsFramework
+{
+    AtomToolsDocumentApplication::AtomToolsDocumentApplication(int* argc, char*** argv)
+        : Base(argc, argv)
+    {
+    }
+
+    void AtomToolsDocumentApplication::ProcessCommandLine(const AZ::CommandLine& commandLine)
+    {
+        // Process command line options for opening documents on startup
+        size_t openDocumentCount = commandLine.GetNumMiscValues();
+        for (size_t openDocumentIndex = 0; openDocumentIndex < openDocumentCount; ++openDocumentIndex)
+        {
+            const AZStd::string openDocumentPath = commandLine.GetMiscValue(openDocumentIndex);
+
+            AZ_Printf(GetBuildTargetName().c_str(), "Opening document: %s", openDocumentPath.c_str());
+            AtomToolsDocumentSystemRequestBus::Broadcast(&AtomToolsDocumentSystemRequestBus::Events::OpenDocument, openDocumentPath);
+        }
+
+        Base::ProcessCommandLine(commandLine);
+    }
+} // namespace AtomToolsFramework
@@ -414,6 +414,8 @@ namespace AtomToolsFramework
        m_actionPreviousTab->setEnabled(m_tabWidget->count() > 1);
        m_actionNextTab->setEnabled(m_tabWidget->count() > 1);

+        m_assetBrowser->SelectEntries(absolutePath);
+
        activateWindow();
        raise();

@@ -69,6 +69,7 @@ namespace AtomToolsFramework
                ->Event("SaveDocumentAsCopy", &AtomToolsDocumentSystemRequestBus::Events::SaveDocumentAsCopy)
                ->Event("SaveDocumentAsChild", &AtomToolsDocumentSystemRequestBus::Events::SaveDocumentAsChild)
                ->Event("SaveAllDocuments", &AtomToolsDocumentSystemRequestBus::Events::SaveAllDocuments)
+                ->Event("GetDocumentCount", &AtomToolsDocumentSystemRequestBus::Events::GetDocumentCount)
                ;

            behaviorContext->EBus<AtomToolsDocumentRequestBus>("AtomToolsDocumentRequestBus")
@@ -457,6 +458,11 @@ namespace AtomToolsFramework
        return result;
    }

+    AZ::u32 AtomToolsDocumentSystemComponent::GetDocumentCount() const
+    {
+        return aznumeric_cast<AZ::u32>(m_documentMap.size());
+    }
+
    AZ::Uuid AtomToolsDocumentSystemComponent::OpenDocumentImpl(AZStd::string_view sourcePath, bool checkIfAlreadyOpen)
    {
        AZStd::string requestedPath = sourcePath;
@@ -74,6 +74,7 @@ namespace AtomToolsFramework
        bool SaveDocumentAsCopy(const AZ::Uuid& documentId, AZStd::string_view targetPath) override;
        bool SaveDocumentAsChild(const AZ::Uuid& documentId, AZStd::string_view targetPath) override;
        bool SaveAllDocuments() override;
+        AZ::u32 GetDocumentCount() const override;
        ////////////////////////////////////////////////////////////////////////

        AZ::Uuid OpenDocumentImpl(AZStd::string_view sourcePath, bool checkIfAlreadyOpen);
@@ -160,7 +160,7 @@ namespace AtomToolsFramework
                ApplyRangeEditDataAttributes<float>();
                break;
            case DynamicPropertyType::Color:
-                AddEditDataAttribute(AZ_CRC("ColorEditorConfiguration", 0xc8b9510e), AZ::RPI::ColorUtils::GetLinearRgbEditorConfig());
+                AddEditDataAttribute(AZ_CRC_CE("ColorEditorConfiguration"), AZ::RPI::ColorUtils::GetRgbEditorConfig());
                break;
            case DynamicPropertyType::Enum:
                m_editData.m_elementId = AZ::Edit::UIHandlers::ComboBox;
@@ -14,7 +14,7 @@
 #include <AtomToolsFramework/Inspector/InspectorGroupHeaderWidget.h>
 #include <AtomToolsFramework/Inspector/InspectorGroupWidget.h>
 #include <AtomToolsFramework/Inspector/InspectorWidget.h>
-#include <Source/Inspector/ui_InspectorWidget.h>
+#include <Inspector/ui_InspectorWidget.h>

 namespace AtomToolsFramework
 {
@@ -168,13 +168,13 @@ namespace AtomToolsFramework
        return duplicateFileInfo;
    }

-    bool LaunchTool(const QString& baseName, const QString& extension, const QStringList& arguments)
+    bool LaunchTool(const QString& baseName, const QStringList& arguments)
    {
        AZ::IO::FixedMaxPath engineRoot = AZ::Utils::GetEnginePath();
        AZ_Assert(!engineRoot.empty(), "Cannot query Engine Path");

-        AZ::IO::FixedMaxPath launchPath = AZ::IO::FixedMaxPath(AZ::Utils::GetExecutableDirectory())
-            / (baseName + extension).toUtf8().constData();
+        AZ::IO::FixedMaxPath launchPath =
+            AZ::IO::FixedMaxPath(AZ::Utils::GetExecutableDirectory()) / (baseName + AZ_TRAIT_OS_EXECUTABLE_EXTENSION).toUtf8().constData();

        return QProcess::startDetached(launchPath.c_str(), arguments, engineRoot.c_str());
    }
@@ -68,6 +68,7 @@ namespace AtomToolsFramework
        {
            return false;
        }
+        const AzFramework::ViewportId newId = m_viewportContext->GetId();

        SetControllerList(AZStd::make_shared<AzFramework::ViewportControllerList>());

@@ -78,14 +79,14 @@ namespace AtomToolsFramework
        m_viewportInteractionImpl = AZStd::make_unique<ViewportInteractionImpl>(m_defaultCamera);
        m_viewportInteractionImpl->m_deviceScalingFactorFn = [this] { return aznumeric_cast<float>(devicePixelRatioF()); };
        m_viewportInteractionImpl->m_screenSizeFn = [this] { return AzFramework::ScreenSize(width(), height()); };
-        m_viewportInteractionImpl->Connect(id);
+        m_viewportInteractionImpl->Connect(newId);

        AzToolsFramework::ViewportInteraction::ViewportMouseCursorRequestBus::Handler::BusConnect(GetId());
        AzFramework::InputChannelEventListener::Connect();
        AZ::TickBus::Handler::BusConnect();
        AzFramework::WindowRequestBus::Handler::BusConnect(params.windowHandle);

-        m_inputChannelMapper = new AzToolsFramework::QtEventToAzInputMapper(this, id);
+        m_inputChannelMapper = new AzToolsFramework::QtEventToAzInputMapper(this, newId);

        // Forward input events to our controller list.
        QObject::connect(m_inputChannelMapper, &AzToolsFramework::QtEventToAzInputMapper::InputChannelUpdated, this,
@@ -8,6 +8,7 @@

 #include <AtomToolsFramework/Window/AtomToolsMainWindow.h>
 #include <AzToolsFramework/API/EditorPythonRunnerRequestsBus.h>
+#include <AzToolsFramework/PythonTerminal/ScriptTermDialog.h>

 #include <QFileDialog>
 #include <QMenu>
@@ -40,6 +41,11 @@ namespace AtomToolsFramework
        centralWidget->setLayout(centralWidgetLayout);
        setCentralWidget(centralWidget);

+        m_assetBrowser = new AtomToolsFramework::AtomToolsAssetBrowser(this);
+        AddDockWidget("Asset Browser", m_assetBrowser, Qt::BottomDockWidgetArea, Qt::Horizontal);
+        AddDockWidget("Python Terminal", new AzToolsFramework::CScriptTermDialog, Qt::BottomDockWidgetArea, Qt::Horizontal);
+        SetDockWidgetVisible("Python Terminal", false);
+
        AtomToolsMainWindowRequestBus::Handler::BusConnect();
    }