Build fix.

Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
This commit is contained in:
AMZN-koppersr
2021-11-08 13:34:12 -08:00
parent c9f9a83c57
commit 976c6abb90
4 changed files with 20 additions and 12 deletions
@@ -532,21 +532,29 @@ namespace AzFramework
void Spawnable::Reflect(AZ::ReflectContext* context)
{
EntityAlias::Reflect(context);
if (auto* serializeContext = azrtti_cast<AZ::SerializeContext*>(context); serializeContext != nullptr)
{
serializeContext->Class<Spawnable::EntityAlias>()
->Version(1)
->Field("Spawnable", &Spawnable::EntityAlias::m_spawnable)
->Field("Tag", &Spawnable::EntityAlias::m_tag)
->Field("Source Index", &Spawnable::EntityAlias::m_sourceIndex)
->Field("Target Index", &Spawnable::EntityAlias::m_targetIndex)
->Field("Alias Type", &Spawnable::EntityAlias::m_aliasType)
->Field("Queue Load", &Spawnable::EntityAlias::m_queueLoad);
serializeContext->Class<Spawnable, AZ::Data::AssetData>()->Version(2)
->Field("Meta data", &Spawnable::m_metaData)
->Field("Entity aliases", &Spawnable::m_entityAliases)
->Field("Entities", &Spawnable::m_entities);
}
}
void Spawnable::EntityAlias::Reflect(AZ::ReflectContext* context)
{
if (auto* serializeContext = azrtti_cast<AZ::SerializeContext*>(context); serializeContext != nullptr)
{
serializeContext->Class<Spawnable::EntityAlias>()
->Version(1)
->Field("Spawnable", &EntityAlias::m_spawnable)
->Field("Tag", &EntityAlias::m_tag)
->Field("Source Index", &EntityAlias::m_sourceIndex)
->Field("Target Index", &EntityAlias::m_targetIndex)
->Field("Alias Type", &EntityAlias::m_aliasType)
->Field("Queue Load", &EntityAlias::m_queueLoad);
}
}
} // namespace AzFramework
@@ -62,6 +62,8 @@ namespace AzFramework
uint32_t m_targetIndex{ 0 }; //!< The index of the entity in the target spawnable that will be used to replace the original.
EntityAliasType m_aliasType{ EntityAliasType::Original }; //!< The kind of replacement.
bool m_queueLoad{ false }; //!< Whether or not to automatically queue the spawnable for loading.
static void Reflect(AZ::ReflectContext* context);
};
using EntityList = AZStd::vector<AZStd::unique_ptr<AZ::Entity>>;
@@ -97,7 +97,7 @@ namespace AzFramework
void SpawnableAssetHandler::ResolveEntityAliases(
Spawnable* spawnable,
const AZ::Data::Asset<AZ::Data::AssetData>& asset,
[[maybe_unused]] const AZ::Data::Asset<AZ::Data::AssetData>& asset,
AZStd::chrono::milliseconds streamingDeadline,
AZ::IO::IStreamerTypes::Priority streamingPriority,
const AZ::Data::AssetFilterCB& assetLoadFilterCB)
@@ -317,8 +317,6 @@ namespace AzFramework
AZ::Entity* previouslySpawnedEntity,
AZ::SerializeContext& serializeContext)
{
using ResultType = AZStd::pair<AZ::Entity*, uint32_t>;
AZ::Entity* clone = nullptr;
switch (alias.m_aliasType)
{