Remove ResourceSelectorHost and clean up/refactor related bits (#3050)
* 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:
@@ -841,9 +841,6 @@ namespace AzToolsFramework
|
||||
*/
|
||||
virtual AZStd::string GetComponentIconPath(const AZ::Uuid& /*componentType*/, AZ::Crc32 /*componentIconAttrib*/, AZ::Component* /*component*/) { return AZStd::string(); }
|
||||
|
||||
/// Resource Selector hook, returns a path for a resource.
|
||||
virtual AZStd::string SelectResource(const AZStd::string& /*resourceType*/, const AZStd::string& /*previousValue*/) { return AZStd::string(); }
|
||||
|
||||
/**
|
||||
* Calculate the navigation 2D radius in units of an agent given its Navigation Type Name
|
||||
* @param angentTypeName the name that identifies the agent navigation type
|
||||
|
||||
+10
-9
@@ -7,8 +7,8 @@
|
||||
*/
|
||||
|
||||
|
||||
#include "PropertyAudioCtrl.h"
|
||||
#include "PropertyQTConstants.h"
|
||||
#include <UI/PropertyEditor/PropertyAudioCtrl.h>
|
||||
#include <UI/PropertyEditor/PropertyQTConstants.h>
|
||||
|
||||
#include <QtWidgets/QLabel>
|
||||
#include <QtWidgets/QLineEdit>
|
||||
@@ -34,7 +34,7 @@ namespace AzToolsFramework
|
||||
: QWidget(parent)
|
||||
, m_browseEdit(nullptr)
|
||||
, m_mainLayout(nullptr)
|
||||
, m_propertyType(AudioPropertyType::Invalid)
|
||||
, m_propertyType(AudioPropertyType::NumTypes)
|
||||
{
|
||||
// create the gui
|
||||
m_mainLayout = new QHBoxLayout();
|
||||
@@ -96,7 +96,7 @@ namespace AzToolsFramework
|
||||
return;
|
||||
}
|
||||
|
||||
if (type != AudioPropertyType::Invalid)
|
||||
if (type != AudioPropertyType::NumTypes)
|
||||
{
|
||||
m_propertyType = type;
|
||||
}
|
||||
@@ -136,10 +136,11 @@ namespace AzToolsFramework
|
||||
|
||||
void AudioControlSelectorWidget::OnOpenAudioControlSelector()
|
||||
{
|
||||
AZStd::string resourceResult;
|
||||
AZStd::string resourceType(GetResourceSelectorNameFromType(m_propertyType));
|
||||
AZStd::string currentValue(m_controlName.toStdString().c_str());
|
||||
EditorRequests::Bus::BroadcastResult(resourceResult, &EditorRequests::Bus::Events::SelectResource, resourceType, currentValue);
|
||||
AZStd::string resourceResult;
|
||||
AudioControlSelectorRequestBus::EventResult(
|
||||
resourceResult, m_propertyType,
|
||||
&AudioControlSelectorRequestBus::Events::SelectResource, currentValue);
|
||||
SetControlName(QString(resourceResult.c_str()));
|
||||
}
|
||||
|
||||
@@ -167,12 +168,12 @@ namespace AzToolsFramework
|
||||
{
|
||||
case AudioPropertyType::Trigger:
|
||||
return { "AudioTrigger" };
|
||||
case AudioPropertyType::Rtpc:
|
||||
return { "AudioRTPC" };
|
||||
case AudioPropertyType::Switch:
|
||||
return { "AudioSwitch" };
|
||||
case AudioPropertyType::SwitchState:
|
||||
return { "AudioSwitchState" };
|
||||
case AudioPropertyType::Rtpc:
|
||||
return { "AudioRTPC" };
|
||||
case AudioPropertyType::Environment:
|
||||
return { "AudioEnvironment" };
|
||||
case AudioPropertyType::Preload:
|
||||
|
||||
+21
@@ -29,6 +29,27 @@ class QMimeData;
|
||||
|
||||
namespace AzToolsFramework
|
||||
{
|
||||
//=============================================================================
|
||||
// Audio Control Selector Request Bus
|
||||
// For connecting UI proper
|
||||
//=============================================================================
|
||||
class AudioControlSelectorRequests
|
||||
: public AZ::EBusTraits
|
||||
{
|
||||
public:
|
||||
// EBusTraits
|
||||
static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById;
|
||||
static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
|
||||
using BusIdType = AudioPropertyType;
|
||||
|
||||
virtual AZStd::string SelectResource(AZStd::string_view previousValue)
|
||||
{
|
||||
return previousValue;
|
||||
}
|
||||
};
|
||||
|
||||
using AudioControlSelectorRequestBus = AZ::EBus<AudioControlSelectorRequests>;
|
||||
|
||||
//=============================================================================
|
||||
// Audio Control Selector Widget
|
||||
//=============================================================================
|
||||
|
||||
+5
-5
@@ -18,15 +18,15 @@
|
||||
namespace AzToolsFramework
|
||||
{
|
||||
//=========================================================================
|
||||
enum class AudioPropertyType
|
||||
enum class AudioPropertyType : AZ::u32
|
||||
{
|
||||
Invalid = 0,
|
||||
Trigger,
|
||||
Trigger = 0,
|
||||
Rtpc,
|
||||
Switch,
|
||||
SwitchState,
|
||||
Rtpc,
|
||||
Environment,
|
||||
Preload,
|
||||
NumTypes,
|
||||
};
|
||||
|
||||
//=========================================================================
|
||||
@@ -40,7 +40,7 @@ namespace AzToolsFramework
|
||||
virtual ~CReflectedVarAudioControl() = default;
|
||||
|
||||
AZStd::string m_controlName;
|
||||
AudioPropertyType m_propertyType = AudioPropertyType::Invalid;
|
||||
AudioPropertyType m_propertyType = AudioPropertyType::NumTypes;
|
||||
|
||||
static void Reflect(AZ::ReflectContext* context)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user