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

Merged main in

Browse Source
This commit is contained in:
Aristo7
2021-05-04 10:13:50 -05:00
parent 03c219bd2d 70bd3ea0ff
commit 4c47d7b587
427 changed files with 9465 additions and 26529 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/EMotionFX/Code/Source/Integration/Components/ActorComponent.cpp
-9
View File
@@ -24,7 +24,6 @@
#include <AzFramework/Visibility/BoundsBus.h>
#include <LmbrCentral/Animation/AttachmentComponentBus.h>
#include <LmbrCentral/Rendering/MeshComponentBus.h>
#include <Integration/Components/ActorComponent.h>
#include <Integration/Rendering/RenderBackendManager.h>
@@ -414,9 +413,6 @@ namespace EMotionFX
CheckAttachToEntity();
// Send general mesh creation notification to interested parties.
LmbrCentral::MeshComponentNotificationBus::Event(entityId, &LmbrCentral::MeshComponentNotifications::OnMeshCreated, m_configuration.m_actorAsset);
Physics::RagdollConfiguration ragdollConfiguration;
[[maybe_unused]] bool ragdollConfigValid = GetRagdollConfiguration(ragdollConfiguration);
AZ_Assert(ragdollConfigValid, "Ragdoll Configuration is not valid");
@@ -460,11 +456,6 @@ namespace EMotionFX
m_attachmentTargetActor = nullptr;
// Send general mesh destruction notification to interested parties.
LmbrCentral::MeshComponentNotificationBus::Event(
GetEntityId(),
&LmbrCentral::MeshComponentNotifications::OnMeshDestroyed);
ActorComponentNotificationBus::Event(
GetEntityId(),
&ActorComponentNotificationBus::Events::OnActorInstanceDestroyed,
Gems/EMotionFX/Code/Source/Integration/Components/AnimAudioComponent.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
#include <Integration/Components/AnimAudioComponent.h>
#include <LmbrCentral/Audio/AudioProxyComponentBus.h>
#include <LmbrCentral/Rendering/MeshComponentBus.h> // for SkeletalHierarchyRequestBus
#include <LmbrCentral/Animation/SkeletalHierarchyRequestBus.h>
#include <MathConversion.h>
Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorActorComponent.cpp
-15
View File
@@ -26,8 +26,6 @@
#include <AzToolsFramework/Entity/EditorEntityInfoBus.h>
#include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>
#include <LmbrCentral/Rendering/MeshComponentBus.h>
#include <Integration/Editor/Components/EditorActorComponent.h>
#include <Integration/AnimGraphComponentBus.h>
#include <Integration/Rendering/RenderBackendManager.h>
@@ -255,11 +253,6 @@ namespace EMotionFX
{
if (m_actorInstance)
{
// Send general mesh destruction notification to interested parties.
LmbrCentral::MeshComponentNotificationBus::Event(
GetEntityId(),
&LmbrCentral::MeshComponentNotifications::OnMeshDestroyed);
ActorComponentNotificationBus::Event(
GetEntityId(),
&ActorComponentNotificationBus::Events::OnActorInstanceDestroyed,
@@ -848,11 +841,6 @@ namespace EMotionFX
if (m_actorInstance)
{
// Send general mesh destruction notification to interested parties.
LmbrCentral::MeshComponentNotificationBus::Event(
GetEntityId(),
&LmbrCentral::MeshComponentNotifications::OnMeshDestroyed);
ActorComponentNotificationBus::Event(
GetEntityId(),
&ActorComponentNotificationBus::Events::OnActorInstanceDestroyed,
@@ -941,9 +929,6 @@ namespace EMotionFX
{
LmbrCentral::AttachmentComponentRequestBus::Event(attachment, &LmbrCentral::AttachmentComponentRequestBus::Events::Reattach, true);
}
// Send general mesh creation notification to interested parties.
LmbrCentral::MeshComponentNotificationBus::Event(GetEntityId(), &LmbrCentral::MeshComponentNotifications::OnMeshCreated, m_actorAsset);
}
} //namespace Integration
} // namespace EMotionFX