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

Remove ResourceSelectorHost and clean up/refactor related bits (#3050)

Browse Source 
* Sever dependency on legacy resource selector host

Audio resource selectors (browse dialogs) no longer need to be
registered with the legacy IResourceSelectorHost system.  Set up a new
EBus specifically to handle browse button presses and directly invokes
the dialog.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Hook up legacy audio control selector to new EBus

Remaining use of legacy audio selectors (trackview) need to be able to
bypass ResourceSelectorHost now.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Removes ResourceSelectorHost and legacy selectors

This removes various Variable types that were tied to resource
selectors, such as GeomCache, Model, Animation, File.  Removes the
ResourceSelectorHost completely.  The two things that still appeared to
have selectors in TrackView are Audio Controls and Texture.  Fixed the
audio control selector to work via EBus and the Texture selector didn't
seem to work at all, but left it in as it was.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Make the default audio selector return old value

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Fix some signed/unsigned comparison warnings

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Remove deleted function from Editor Mock

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Change audio selector api to use string_view

Per feedback.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
This commit is contained in:
amzn-phist
2021-08-16 12:41:24 -05:00
committed by GitHub
parent b88a7faf64
commit d6b268e84e
37 changed files with 125 additions and 776 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AudioSystem/Code/Source/Editor/AudioResourceSelectors.cpp
+31 -74
View File
@@ -10,88 +10,45 @@
#include <AudioResourceSelectors.h>
#include <ATLControlsResourceDialog.h>
#include <AudioControlsEditorPlugin.h>
#include <Include/IResourceSelectorHost.h>
#include <QAudioControlEditorIcons.h>
#include <AzToolsFramework/API/ToolsApplicationAPI.h>
#include <UI/PropertyEditor/PropertyAudioCtrlTypes.h>
namespace AudioControls
{
//-------------------------------------------------------------------------------------------//
QString ShowSelectDialog(const SResourceSelectorContext& context, const QString& pPreviousValue, const EACEControlType controlType)
AudioControlSelectorHandler::AudioControlSelectorHandler()
{
AZ_Assert(CAudioControlsEditorPlugin::GetATLModel() != nullptr, "AudioResourceSelectors - ATL Model is null!");
AZStd::string levelName;
AzToolsFramework::EditorRequestBus::BroadcastResult(levelName, &AzToolsFramework::EditorRequests::GetLevelName);
ATLControlsDialog dialog(context.parentWidget, controlType);
dialog.SetScope(levelName);
return dialog.ChooseItem(pPreviousValue.toUtf8().constData());
}
//-------------------------------------------------------------------------------------------//
QString AudioTriggerSelector(const SResourceSelectorContext& context, const QString& pPreviousValue)
{
return ShowSelectDialog(context, pPreviousValue, eACET_TRIGGER);
}
//-------------------------------------------------------------------------------------------//
QString AudioSwitchSelector(const SResourceSelectorContext& context, const QString& pPreviousValue)
{
return ShowSelectDialog(context, pPreviousValue, eACET_SWITCH);
}
//-------------------------------------------------------------------------------------------//
QString AudioSwitchStateSelector(const SResourceSelectorContext& context, const QString& pPreviousValue)
{
return ShowSelectDialog(context, pPreviousValue, eACET_SWITCH_STATE);
}
//-------------------------------------------------------------------------------------------//
QString AudioRTPCSelector(const SResourceSelectorContext& context, const QString& pPreviousValue)
{
return ShowSelectDialog(context, pPreviousValue, eACET_RTPC);
}
//-------------------------------------------------------------------------------------------//
QString AudioEnvironmentSelector(const SResourceSelectorContext& context, const QString& pPreviousValue)
{
return ShowSelectDialog(context, pPreviousValue, eACET_ENVIRONMENT);
}
//-------------------------------------------------------------------------------------------//
QString AudioPreloadRequestSelector(const SResourceSelectorContext& context, const QString& pPreviousValue)
{
return ShowSelectDialog(context, pPreviousValue, eACET_PRELOAD);
}
//-------------------------------------------------------------------------------------------//
static SStaticResourceSelectorEntry audioTriggerSelector(
"AudioTrigger", AudioTriggerSelector, ":/Icons/Trigger_Icon.svg");
static SStaticResourceSelectorEntry audioSwitchSelector(
"AudioSwitch", AudioSwitchSelector, ":/Icons/Switch_Icon.svg");
static SStaticResourceSelectorEntry audioStateSelector(
"AudioSwitchState", AudioSwitchStateSelector, ":/Icons/Property_Icon.png");
static SStaticResourceSelectorEntry audioRtpcSelector(
"AudioRTPC", AudioRTPCSelector, ":/Icons/RTPC_Icon.svg");
static SStaticResourceSelectorEntry audioEnvironmentSelector(
"AudioEnvironment", AudioEnvironmentSelector, ":/Icons/Environment_Icon.svg");
static SStaticResourceSelectorEntry audioPreloadSelector(
"AudioPreloadRequest", AudioPreloadRequestSelector, ":/Icons/Bank_Icon.png");
//-------------------------------------------------------------------------------------------//
void RegisterAudioControlsResourceSelectors()
{
if (IResourceSelectorHost* host = GetIEditor()->GetResourceSelectorHost();
host != nullptr)
for (AZ::u32 type = 0; type < static_cast<AZ::u32>(AzToolsFramework::AudioPropertyType::NumTypes); ++type)
{
host->RegisterResourceSelector(&audioTriggerSelector);
host->RegisterResourceSelector(&audioSwitchSelector);
host->RegisterResourceSelector(&audioStateSelector);
host->RegisterResourceSelector(&audioRtpcSelector);
host->RegisterResourceSelector(&audioEnvironmentSelector);
host->RegisterResourceSelector(&audioPreloadSelector);
AzToolsFramework::AudioControlSelectorRequestBus::MultiHandler::BusConnect(
static_cast<AzToolsFramework::AudioPropertyType>(type));
}
}
AudioControlSelectorHandler::~AudioControlSelectorHandler()
{
AzToolsFramework::AudioControlSelectorRequestBus::MultiHandler::BusDisconnect();
}
AZStd::string AudioControlSelectorHandler::SelectResource(AZStd::string_view previousValue)
{
using namespace AzToolsFramework;
if (auto busId = AudioControlSelectorRequestBus::GetCurrentBusId();
busId != nullptr)
{
auto controlType = static_cast<EACEControlType>(*busId);
QWidget* parentWidget = nullptr;
AzToolsFramework::EditorRequestBus::BroadcastResult(parentWidget, &AzToolsFramework::EditorRequestBus::Events::GetMainWindow);
AZStd::string levelName;
AzToolsFramework::EditorRequestBus::BroadcastResult(levelName, &AzToolsFramework::EditorRequests::GetLevelName);
ATLControlsDialog dialog(parentWidget, controlType);
dialog.SetScope(levelName);
return dialog.ChooseItem(previousValue.data());
}
return previousValue;
}
} // namespace AudioControls