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/Maestro/Code/Source/Components/SequenceComponent.cpp
+1 -5
View File
@@ -122,7 +122,6 @@ namespace Maestro
if (AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
{
behaviorContext->EBus<SequenceComponentRequestBus>("SequenceComponentRequestBus")
->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::Preview)
->Event("Play", &SequenceComponentRequestBus::Events::Play)
->Event("PlayBetweenTimes", &SequenceComponentRequestBus::Events::PlayBetweenTimes)
->Event("Stop", &SequenceComponentRequestBus::Events::Stop)
@@ -135,11 +134,9 @@ namespace Maestro
->Event("GetCurrentPlayTime", &SequenceComponentRequestBus::Events::GetCurrentPlayTime)
->Event("GetPlaySpeed", &SequenceComponentRequestBus::Events::GetPlaySpeed)
;
behaviorContext->Class<SequenceComponent>()->RequestBus("SequenceComponentRequestBus")
->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::Preview);
behaviorContext->Class<SequenceComponent>()->RequestBus("SequenceComponentRequestBus");
behaviorContext->EBus<SequenceComponentNotificationBus>("SequenceComponentNotificationBus")->
Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::Preview)->
Handler<BehaviorSequenceComponentNotificationBusHandler>();
}
}
@@ -249,7 +246,6 @@ namespace Maestro
void SequenceComponent::GetAnimatedPropertyValue(AnimatedValue& returnValue, const AZ::EntityId& animatedEntityId, const AnimatablePropertyAddress& animatableAddress)
{
const Maestro::SequenceAgentEventBusId ebusId(GetEntityId(), animatedEntityId);
float retVal = .0f;
EBUS_EVENT_ID(ebusId, Maestro::SequenceAgentComponentRequestBus, GetAnimatedPropertyValue, returnValue, animatableAddress);
}