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

ATOM-15439 Implement basic local socket and server for IPC in material editor and other tools

Browse Source 
This replaces grid hub usage in the material editor. It allows material editor and other tools to intercommunicate on the local host.  This will allow enforcing that there is only one instance of the material editor running.  Opening a second instance will forward command line options to the first instance running a local server.

https://jira.agscollab.com/browse/ATOM-15439
https://jira.agscollab.com/browse/ATOM-13742
This commit is contained in:
guthadam
2021-05-02 17:08:21 -05:00
parent 781415755d
commit fae33e9235
18 changed files with 406 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialSystemComponent.cpp
+4 -31
View File
@@ -93,7 +93,6 @@ namespace AZ
void EditorMaterialSystemComponent::Activate()
{
AzFramework::TargetManagerClient::Bus::Handler::BusConnect();
EditorMaterialSystemComponentRequestBus::Handler::BusConnect();
AzFramework::ApplicationLifecycleEvents::Bus::Handler::BusConnect();
AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler::BusConnect();
@@ -105,7 +104,6 @@ namespace AZ
void EditorMaterialSystemComponent::Deactivate()
{
AzFramework::TargetManagerClient::Bus::Handler::BusDisconnect();
EditorMaterialSystemComponentRequestBus::Handler::BusDisconnect();
AzFramework::ApplicationLifecycleEvents::Bus::Handler::BusDisconnect();
AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler::BusDisconnect();
@@ -123,36 +121,11 @@ namespace AZ
void EditorMaterialSystemComponent::OpenInMaterialEditor(const AZStd::string& sourcePath)
{
if (m_materialEditorTarget.IsValid())
{
AzFramework::TmMsg openDocumentMsg(AZ_CRC("OpenInMaterialEditor", 0x9f92aac8));
openDocumentMsg.AddCustomBlob(sourcePath.c_str(), sourcePath.size() + 1);
AzFramework::TargetManager::Bus::Broadcast(&AzFramework::TargetManager::SendTmMessage, m_materialEditorTarget, openDocumentMsg);
}
else
{
AZ_TracePrintf("MaterialComponent", "Launching Material Editor");
AZ_TracePrintf("MaterialComponent", "Launching Material Editor");
QStringList arguments;
arguments.append(sourcePath.c_str());
AtomToolsFramework::LaunchTool("MaterialEditor", ".exe", arguments);
}
}
void EditorMaterialSystemComponent::TargetJoinedNetwork(AzFramework::TargetInfo info)
{
if (AZ::StringFunc::Equal(info.GetDisplayName(), "MaterialEditor"))
{
m_materialEditorTarget = info;
}
}
void EditorMaterialSystemComponent::TargetLeftNetwork(AzFramework::TargetInfo info)
{
if (AZ::StringFunc::Equal(info.GetDisplayName(), "MaterialEditor"))
{
m_materialEditorTarget = {};
}
QStringList arguments;
arguments.append(sourcePath.c_str());
AtomToolsFramework::LaunchTool("MaterialEditor", ".exe", arguments);
}
void EditorMaterialSystemComponent::OnApplicationAboutToStop()