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

changing add NUS button from invisible to read only when NUS component already present

Browse Source
This commit is contained in:
greerdv
2021-05-06 22:15:00 +01:00
parent 45cbe4767f
commit ad6479967f
2 changed files with 10 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.cpp
+5 -31
View File
@@ -45,23 +45,6 @@ namespace AzToolsFramework
{
namespace Components
{
void AddNonUniformScaleButton::Reflect(AZ::ReflectContext* context)
{
if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
{
serializeContext->Class<AddNonUniformScaleButton>()->
Version(1);
if (AZ::EditContext* ptrEdit = serializeContext->GetEditContext())
{
ptrEdit->Class<AddNonUniformScaleButton>("AddNonUniformScaleButton", "")->
UIElement(AZ::Edit::UIHandlers::Button, "", "Add non-uniform scale component")->
Attribute(AZ::Edit::Attributes::ButtonText, "Add non-uniform scale")
;
}
}
}
namespace Internal
{
const AZ::u32 ParentEntityCRC = AZ_CRC("Parent Entity", 0x5b1b276c);
@@ -1242,16 +1225,9 @@ namespace AzToolsFramework
return nullptr;
}
AZ::Crc32 TransformComponent::AddNonUniformScaleButtonVisibility()
bool TransformComponent::IsAddNonUniformScaleButtonReadOnly()
{
// if there is a non-uniform scale component already, hide altogether
if (FindPresentOrPendingComponent(EditorNonUniformScaleComponent::TYPEINFO_Uuid()))
{
return AZ::Edit::PropertyVisibility::Hide;
}
// otherwise, just show children
return AZ::Edit::PropertyVisibility::ShowChildrenOnly;
return FindPresentOrPendingComponent(EditorNonUniformScaleComponent::TYPEINFO_Uuid()) != nullptr;
}
AZ::Crc32 TransformComponent::OnAddNonUniformScaleButtonPressed()
@@ -1290,8 +1266,6 @@ namespace AzToolsFramework
void TransformComponent::Reflect(AZ::ReflectContext* context)
{
AddNonUniformScaleButton::Reflect(context);
// reflect data for script, serialization, editing..
if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
{
@@ -1329,9 +1303,9 @@ namespace AzToolsFramework
DataElement(AZ::Edit::UIHandlers::Default, &TransformComponent::m_editorTransform, "Values", "")->
Attribute(AZ::Edit::Attributes::ChangeNotify, &TransformComponent::TransformChanged)->
Attribute(AZ::Edit::Attributes::AutoExpand, true)->
DataElement(AZ::Edit::UIHandlers::Default, &TransformComponent::m_addNonUniformScaleButton, "", "")->
Attribute(AZ::Edit::Attributes::AutoExpand, true)->
Attribute(AZ::Edit::Attributes::Visibility, &TransformComponent::AddNonUniformScaleButtonVisibility)->
DataElement(AZ::Edit::UIHandlers::Button, &TransformComponent::m_addNonUniformScaleButton, "", "")->
Attribute(AZ::Edit::Attributes::ButtonText, "Add non-uniform scale")->
Attribute(AZ::Edit::Attributes::ReadOnly, &TransformComponent::IsAddNonUniformScaleButtonReadOnly)->
Attribute(AZ::Edit::Attributes::ChangeNotify, &TransformComponent::OnAddNonUniformScaleButtonPressed)->
DataElement(AZ::Edit::UIHandlers::ComboBox, &TransformComponent::m_parentActivationTransformMode,
"Parent activation", "Configures relative transform behavior when parent activates.")->
Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.h
+5 -11
View File
@@ -32,15 +32,6 @@ namespace AzToolsFramework
{
namespace Components
{
// this is a workaround for a bug which causes the button to appear with incorrect placement if added directly
// to the transform component
class AddNonUniformScaleButton
{
public:
AZ_TYPE_INFO(AddNonUniformScaleButton, "{92ECB8B6-DD25-4FC0-A5EE-4CEBAF51A780}")
static void Reflect(AZ::ReflectContext* context);
};
/// Manages transform data as separate vector fields for editing purposes.
/// The TransformComponent is referenced by other components in the same entity, it is not an asset.
class TransformComponent
@@ -239,7 +230,7 @@ namespace AzToolsFramework
void CheckApplyCachedWorldTransform(const AZ::Transform& parentWorld);
AZ::Component* FindPresentOrPendingComponent(AZ::Uuid componentUuid);
AZ::Crc32 AddNonUniformScaleButtonVisibility();
bool IsAddNonUniformScaleButtonReadOnly();
AZ::Crc32 OnAddNonUniformScaleButtonPressed();
// Drives transform behavior when parent activates. See AZ::TransformConfig::ParentActivationTransformMode for details.
@@ -273,7 +264,10 @@ namespace AzToolsFramework
bool m_localTransformDirty = true;
bool m_worldTransformDirty = true;
bool m_isStatic = false;
AddNonUniformScaleButton m_addNonUniformScaleButton;
// This is a workaround for a bug which causes the button to appear with incorrect placement if a UI
// element is used rather than a data element.
bool m_addNonUniformScaleButton = false;
// Deprecated
AZ::InterpolationMode m_interpolatePosition;