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

move the function setactorasset

Browse Source 
Signed-off-by: rhhong <rhhong@amazon.com>
This commit is contained in:
rhhong
2021-09-21 09:51:52 -07:00
parent b7900bf646
commit c463721b52
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/EMotionFX/Code/Source/Integration/Components/ActorComponent.h
+1 -2
View File
@@ -121,6 +121,7 @@ namespace EMotionFX
void SetRenderCharacter(bool enable) override;
bool GetRenderActorVisible() const override;
SkinningMethod GetSkinningMethod() const override;
void SetActorAsset(AZ::Data::Asset<ActorAsset> actorAsset) override;
//////////////////////////////////////////////////////////////////////////
// ActorComponentNotificationBus::Handler
@@ -178,8 +179,6 @@ namespace EMotionFX
void OnAssetReloaded(AZ::Data::Asset<AZ::Data::AssetData> asset) override;
bool IsPhysicsSceneSimulationFinishEventConnected() const;
void SetActorAsset(AZ::Data::Asset<ActorAsset> actorAsset);
AZ::Data::Asset<ActorAsset> GetActorAsset() const { return m_configuration.m_actorAsset; }
private:
Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorActorComponent.h
+1 -2
View File
@@ -60,6 +60,7 @@ namespace EMotionFX
bool GetRenderActorVisible() const override;
size_t GetNumJoints() const override;
SkinningMethod GetSkinningMethod() const override;
void SetActorAsset(AZ::Data::Asset<ActorAsset> actorAsset) override;
// EditorActorComponentRequestBus overrides ...
const AZ::Data::AssetId& GetActorAssetId() override;
@@ -79,8 +80,6 @@ namespace EMotionFX
void OnAssetReady(AZ::Data::Asset<AZ::Data::AssetData> asset) override;
void OnAssetReloaded(AZ::Data::Asset<AZ::Data::AssetData> asset) override;
void SetActorAsset(AZ::Data::Asset<ActorAsset> actorAsset);
// BoundsRequestBus overrides ...
AZ::Aabb GetWorldBounds() override;
AZ::Aabb GetLocalBounds() override;