CR feedback

Signed-off-by: rhhong <rhhong@amazon.com>
This commit is contained in:
rhhong
2021-10-06 22:28:18 -07:00
parent 8897040315
commit 5fca7ffd86
10 changed files with 24 additions and 19 deletions
@@ -31,7 +31,6 @@ namespace EMotionFX
SetScheduler(MultiThreadScheduler::Create());
// reserve memory
m_actorAssets.reserve(32);
m_actorInstances.reserve(1024);
m_rootActorInstances.reserve(1024);
}
@@ -429,7 +428,7 @@ namespace EMotionFX
}
ActorManager::ActorAssetData ActorManager::GetActorAsset(size_t nr) const
ActorAssetData ActorManager::GetActorAsset(size_t nr) const
{
return m_actorAssets[nr];
}
@@ -42,7 +42,6 @@ namespace EMotionFX
friend class EMotionFXManager;
public:
using ActorAssetData = AZ::Data::Asset<Integration::ActorAsset>;
static ActorManager* Create();
/**
@@ -90,6 +90,7 @@ namespace EMStudio
AZStd::unique_ptr<ActorInfo> m_actorInfo;
AZStd::unique_ptr<NodeInfo> m_nodeInfo;
// Use this flag to defer the reinit function to main thread.
bool m_reinitRequested = false;
};
} // namespace EMStudio
@@ -98,7 +98,6 @@ namespace EMotionFX
// Use this to alter the actor asset.
virtual void SetActorAsset(AZ::Data::Asset<EMotionFX::Integration::ActorAsset> actorAsset) = 0;
// virtual AZ::Data::Asset<const EMotionFX::Integration::ActorAsset> GetAsset() const = 0;
static const size_t s_invalidJointIndex = std::numeric_limits<size_t>::max();
};
@@ -80,6 +80,8 @@ namespace EMotionFX
const char* GetBrowserIcon() const override;
};
} // namespace Integration
using ActorAssetData = AZ::Data::Asset<Integration::ActorAsset>;
} // namespace EMotionFX
namespace AZ