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

Integrating github/staging through commit ab87ed9

Browse Source
This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/EMotionFX/Code/Source/Integration/Components/ActorComponent.cpp
-1
View File
@@ -129,7 +129,6 @@ namespace EMotionFX
if (behaviorContext)
{
behaviorContext->EBus<ActorComponentRequestBus>("ActorComponentRequestBus")
->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::Preview)
->Event("GetJointIndexByName", &ActorComponentRequestBus::Events::GetJointIndexByName)
->Event("GetJointTransform", &ActorComponentRequestBus::Events::GetJointTransform)
->Event("AttachToEntity", &ActorComponentRequestBus::Events::AttachToEntity)
Gems/EMotionFX/Code/Source/Integration/Components/AnimAudioComponent.cpp
-1
View File
@@ -509,7 +509,6 @@ namespace EMotionFX
if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
{
behaviorContext->EBus<EMotionFX::Integration::AnimAudioComponentRequestBus>("AnimAudioComponentRequestBus")
->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::Preview)
->Attribute(AZ::Script::Attributes::Category, "Animation")
->Event("AddTriggerEvent", &AnimAudioComponentRequestBus::Events::AddTriggerEvent)
->Event("ClearTriggerEvents", &AnimAudioComponentRequestBus::Events::ClearTriggerEvents)
Gems/EMotionFX/Code/Source/Integration/Components/AnimGraphComponent.cpp
-3
View File
@@ -144,7 +144,6 @@ namespace EMotionFX
behaviorContext->Constant("InvalidParameterIndex", BehaviorConstant(static_cast<AZ::u32>(MCORE_INVALIDINDEX32)));
behaviorContext->EBus<AnimGraphComponentRequestBus>("AnimGraphComponentRequestBus")
->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::Preview)
// General API
->Event("FindParameterIndex", &AnimGraphComponentRequestBus::Events::FindParameterIndex)
->Event("FindParameterName", &AnimGraphComponentRequestBus::Events::FindParameterName)
@@ -192,7 +191,6 @@ namespace EMotionFX
;
behaviorContext->EBus<AnimGraphComponentNetworkRequestBus>("AnimGraphComponentNetworkRequestBus")
->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::Preview)
->Attribute(AZ::Script::Attributes::Category, "Animation")
->Event("IsAssetReady", &AnimGraphComponentNetworkRequestBus::Events::IsAssetReady)
->Event("HasSnapshot", &AnimGraphComponentNetworkRequestBus::Events::HasSnapshot)
@@ -451,7 +449,6 @@ namespace EMotionFX
AnimGraphInstancePostCreate();
// Apply parameter defaults.
EMotionFX::AnimGraph* animGraph = cfg.m_animGraphAsset.Get()->GetAnimGraph();
for (AZ::ScriptProperty* parameter : cfg.m_parameterDefaults.m_parameters)
{
const char* paramName = parameter->m_name.c_str();
Gems/EMotionFX/Code/Source/Integration/Components/SimpleMotionComponent.cpp
-1
View File
@@ -84,7 +84,6 @@ namespace EMotionFX
if (behaviorContext)
{
behaviorContext->EBus<SimpleMotionComponentRequestBus>("SimpleMotionComponentRequestBus")
->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::Preview)
->Event("LoopMotion", &SimpleMotionComponentRequestBus::Events::LoopMotion)
->Event("GetLoopMotion", &SimpleMotionComponentRequestBus::Events::GetLoopMotion)
->Attribute("Hidden", AZ::Edit::Attributes::PropertyHidden)