diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMotionCtrl.cpp b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMotionCtrl.cpp index 69f5d9801a..1df31a2c1d 100644 --- a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMotionCtrl.cpp +++ b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMotionCtrl.cpp @@ -1,187 +1,64 @@ /* -* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates, or -* a third party where indicated. -* -* For complete copyright and license terms please see the LICENSE at the root of this -* distribution (the "License"). All use of this software is governed by the License, -* or, if provided, by the license below or the license accompanying this file. Do not -* remove or modify any license notices. This file is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* -*/ + * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates, or + * a third party where indicated. + * + * For complete copyright and license terms please see the LICENSE at the root of this + * distribution (the "License"). All use of this software is governed by the License, + * or, if provided, by the license below or the license accompanying this file. Do not + * remove or modify any license notices. This file is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * + */ #include "EditorDefs.h" #include "PropertyMotionCtrl.h" -// Qt -#include -#include -#include - // AzToolsFramework -#include #include +#include - -MotionPropertyCtrl::MotionPropertyCtrl(QWidget *pParent) - : QWidget(pParent) +QWidget* MotionPropertyWidgetHandler::CreateGUI(QWidget* pParent) { - m_motionLabel = new QLabel; - - m_pBrowseButton = new QToolButton; - m_pBrowseButton->setIcon(QIcon(":/reflectedPropertyCtrl/img/file_browse.png")); - m_pApplyButton = new QToolButton; - m_pApplyButton->setIcon(QIcon(":/reflectedPropertyCtrl/img/apply.png")); - - m_pApplyButton->setFocusPolicy(Qt::StrongFocus); - m_pBrowseButton->setFocusPolicy(Qt::StrongFocus); - - QHBoxLayout *pLayout = new QHBoxLayout(this); - pLayout->setContentsMargins(0, 0, 0, 0); - pLayout->addWidget(m_motionLabel, 1); - pLayout->addWidget(m_pBrowseButton); - pLayout->addWidget(m_pApplyButton); - - connect(m_pBrowseButton, &QAbstractButton::clicked, this, &MotionPropertyCtrl::OnBrowseClicked); - connect(m_pApplyButton, &QAbstractButton::clicked, this, &MotionPropertyCtrl::OnApplyClicked); -}; - -MotionPropertyCtrl::~MotionPropertyCtrl() -{ -} - - -void MotionPropertyCtrl::SetValue(const CReflectedVarMotion &motion) -{ - m_motion = motion; - SetLabelText(motion.m_motion); -} - -CReflectedVarMotion MotionPropertyCtrl::value() const -{ - return m_motion; -} - -void MotionPropertyCtrl::OnBrowseClicked() -{ - - static AZ::Data::AssetType emotionFXMotionAssetType("{00494B8E-7578-4BA2-8B28-272E90680787}"); // from MotionAsset.h in EMotionFX Gem - - // Request the AssetBrowser Dialog and set a type filter - AssetSelectionModel selection = AssetSelectionModel::AssetTypeSelection(emotionFXMotionAssetType); - selection.SetSelectedAssetId(m_motion.m_assetId); - AzToolsFramework::EditorRequests::Bus::Broadcast(&AzToolsFramework::EditorRequests::BrowseForAssets, selection); - if (selection.IsValid()) - { - auto product = azrtti_cast(selection.GetResult()); - if (product != nullptr) - { - m_motion.m_motion = product->GetRelativePath(); - m_motion.m_assetId = product->GetAssetId(); - SetLabelText(m_motion.m_motion); - emit ValueChanged(m_motion); - } - } -} - -// TODO: Might be able to delete this function -void MotionPropertyCtrl::OnApplyClicked() -{ -#if 0 - CUIEnumerations &roGeneralProxy = CUIEnumerations::GetUIEnumerationsInstance(); - QStringList cSelectedMotions; - size_t nTotalMotions(0); - size_t nCurrentMotion(0); - - QString combinedString = GetIEditor()->GetResourceSelectorHost()->GetGlobalSelection("motion"); - SplitString(combinedString, cSelectedMotions, ','); - - nTotalMotions = cSelectedMotions.size(); - for (nCurrentMotion = 0; nCurrentMotion < nTotalMotions; ++nCurrentMotion) - { - QString& rstrCurrentAnimAction = cSelectedMotions[nCurrentMotion]; - if (!rstrCurrentAnimAction.isEmpty()) - { - m_motion.m_motion = rstrCurrentAnimAction.toLatin1().data(); - SetLabelText(m_motion.m_motion); - emit ValueChanged(m_motion); - } - } -#endif -} - -QWidget* MotionPropertyCtrl::GetFirstInTabOrder() -{ - return m_pBrowseButton; -} -QWidget* MotionPropertyCtrl::GetLastInTabOrder() -{ - return m_pApplyButton; -} - -void MotionPropertyCtrl::UpdateTabOrder() -{ - setTabOrder(m_pBrowseButton, m_pApplyButton); -} - -void MotionPropertyCtrl::SetLabelText(const AZStd::string& motion) -{ - if (!motion.empty()) - { - AZStd::string filename; - if (AzFramework::StringFunc::Path::GetFileName(motion.c_str(), filename)) - { - m_motionLabel->setText(filename.c_str()); - } - else - { - m_motionLabel->setText(motion.c_str()); - } - } - else - { - m_motionLabel->setText(""); - } -} - - -QWidget* MotionPropertyWidgetHandler::CreateGUI(QWidget *pParent) -{ - MotionPropertyCtrl* newCtrl = aznew MotionPropertyCtrl(pParent); - connect(newCtrl, &MotionPropertyCtrl::ValueChanged, newCtrl, [newCtrl]() - { - EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, newCtrl); - }); + AzToolsFramework::PropertyAssetCtrl* newCtrl = aznew AzToolsFramework::PropertyAssetCtrl(pParent); + connect( + newCtrl, &AzToolsFramework::PropertyAssetCtrl::OnAssetIDChanged, this, [newCtrl]([[maybe_unused]] AZ::Data::AssetId newAssetId) { + EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, newCtrl); + AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast( + &AzToolsFramework::PropertyEditorGUIMessages::Bus::Handler::OnEditingFinished, newCtrl); + }); return newCtrl; } - -void MotionPropertyWidgetHandler::ConsumeAttribute(MotionPropertyCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) +void MotionPropertyWidgetHandler::ConsumeAttribute( + [[maybe_unused]] AzToolsFramework::PropertyAssetCtrl* GUI, [[maybe_unused]] AZ::u32 attrib, + [[maybe_unused]] AzToolsFramework::PropertyAttributeReader* attrValue, [[maybe_unused]] const char* debugName) { - Q_UNUSED(GUI); - Q_UNUSED(attrib); - Q_UNUSED(attrValue); - Q_UNUSED(debugName); } -void MotionPropertyWidgetHandler::WriteGUIValuesIntoProperty(size_t index, MotionPropertyCtrl* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node) +void MotionPropertyWidgetHandler::WriteGUIValuesIntoProperty( + [[maybe_unused]] size_t index, [[maybe_unused]] AzToolsFramework::PropertyAssetCtrl* GUI, property_t& instance, + [[maybe_unused]] AzToolsFramework::InstanceDataNode* node) { - Q_UNUSED(index); - Q_UNUSED(node); - CReflectedVarMotion val = GUI->value(); + CReflectedVarMotion val; + val.m_motion = GUI->GetCurrentAssetHint(); + val.m_assetId = GUI->GetSelectedAssetID(); instance = static_cast(val); } -bool MotionPropertyWidgetHandler::ReadValuesIntoGUI(size_t index, MotionPropertyCtrl* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node) +bool MotionPropertyWidgetHandler::ReadValuesIntoGUI( + [[maybe_unused]] size_t index, [[maybe_unused]] AzToolsFramework::PropertyAssetCtrl* GUI, const property_t& instance, + [[maybe_unused]] AzToolsFramework::InstanceDataNode* node) { - Q_UNUSED(index); - Q_UNUSED(node); - CReflectedVarMotion val = instance; - GUI->SetValue(val); + static const AZ::Data::AssetType emotionFXMotionAssetType( + "{00494B8E-7578-4BA2-8B28-272E90680787}"); // from MotionAsset.h in EMotionFX Gem + + GUI->blockSignals(true); + GUI->SetSelectedAssetID(instance.m_assetId); + GUI->SetCurrentAssetType(emotionFXMotionAssetType); + GUI->blockSignals(false); + return false; } - #include - diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMotionCtrl.h b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMotionCtrl.h index 568111b521..d04f1b3353 100644 --- a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMotionCtrl.h +++ b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMotionCtrl.h @@ -1,92 +1,67 @@ /* -* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or -* its licensors. -* -* For complete copyright and license terms please see the LICENSE at the root of this -* distribution (the "License"). All use of this software is governed by the License, -* or, if provided, by the license below or the license accompanying this file. Do not -* remove or modify any license notices. This file is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* -*/ + * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or + * its licensors. + * + * For complete copyright and license terms please see the LICENSE at the root of this + * distribution (the "License"). All use of this software is governed by the License, + * or, if provided, by the license below or the license accompanying this file. Do not + * remove or modify any license notices. This file is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * + */ -#ifndef CRYINCLUDE_EDITOR_UTILS_PROPERTYMOTIONCTRL_H -#define CRYINCLUDE_EDITOR_UTILS_PROPERTYMOTIONCTRL_H #pragma once #if !defined(Q_MOC_RUN) -#include -#include #include "ReflectedVar.h" -#include -#include +#include +#include +#include #include - +#include +#include #endif -class QToolButton; -class QLabel; -class QHBoxLayout; - -namespace AzToolsFramework -{ - class PropertyAssetCtrl; -} - -class MotionPropertyCtrl - : public QWidget +class MotionPropertyWidgetHandler : QObject, + public AzToolsFramework::PropertyHandler { Q_OBJECT -public: - AZ_CLASS_ALLOCATOR(MotionPropertyCtrl, AZ::SystemAllocator, 0); - MotionPropertyCtrl(QWidget* pParent = nullptr); - virtual ~MotionPropertyCtrl(); - - CReflectedVarMotion value() const; - - QWidget* GetFirstInTabOrder(); - QWidget* GetLastInTabOrder(); - void UpdateTabOrder(); - -signals: - void ValueChanged(CReflectedVarMotion value); - -public slots: - void SetValue(const CReflectedVarMotion& motion); - -protected slots: - void OnBrowseClicked(); - void OnApplyClicked(); - -private: - void SetLabelText(const AZStd::string& motion); - - QToolButton* m_pBrowseButton; - QToolButton* m_pApplyButton; - QLabel* m_motionLabel; - - CReflectedVarMotion m_motion; -}; - -class MotionPropertyWidgetHandler - : QObject - , public AzToolsFramework::PropertyHandler < CReflectedVarMotion, MotionPropertyCtrl > -{ public: AZ_CLASS_ALLOCATOR(MotionPropertyWidgetHandler, AZ::SystemAllocator, 0); - virtual AZ::u32 GetHandlerName(void) const override { return AZ_CRC("Motion", 0xf5fea1e8); } - virtual bool IsDefaultHandler() const override { return true; } - virtual QWidget* GetFirstInTabOrder(MotionPropertyCtrl* widget) override { return widget->GetFirstInTabOrder(); } - virtual QWidget* GetLastInTabOrder(MotionPropertyCtrl* widget) override { return widget->GetLastInTabOrder(); } - virtual void UpdateWidgetInternalTabbing(MotionPropertyCtrl* widget) override { widget->UpdateTabOrder(); } + virtual AZ::u32 GetHandlerName(void) const override + { + return AZ_CRC("Motion", 0xf5fea1e8); + } + + virtual bool IsDefaultHandler() const override + { + return true; + } + + virtual QWidget* GetFirstInTabOrder(AzToolsFramework::PropertyAssetCtrl* widget) override + { + return widget->GetFirstInTabOrder(); + } + + virtual QWidget* GetLastInTabOrder(AzToolsFramework::PropertyAssetCtrl* widget) override + { + return widget->GetLastInTabOrder(); + } + + virtual void UpdateWidgetInternalTabbing(AzToolsFramework::PropertyAssetCtrl* widget) override + { + widget->UpdateTabOrder(); + } virtual QWidget* CreateGUI(QWidget* pParent) override; - virtual void ConsumeAttribute(MotionPropertyCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override; - virtual void WriteGUIValuesIntoProperty(size_t index, MotionPropertyCtrl* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node) override; - virtual bool ReadValuesIntoGUI(size_t index, MotionPropertyCtrl* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node) override; + virtual void ConsumeAttribute( + AzToolsFramework::PropertyAssetCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, + const char* debugName) override; + virtual void WriteGUIValuesIntoProperty( + size_t index, AzToolsFramework::PropertyAssetCtrl* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node) override; + virtual bool ReadValuesIntoGUI( + size_t index, AzToolsFramework::PropertyAssetCtrl* GUI, const property_t& instance, + AzToolsFramework::InstanceDataNode* node) override; }; - - -#endif // CRYINCLUDE_EDITOR_UTILS_PROPERTYMOTIONCTRL_H