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

Prepping for PR

Browse Source
This commit is contained in:
sconel
2021-05-27 10:45:47 -07:00
parent 07ecb938e7
commit 824be567fc
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Spawning/SpawnNodeable.cpp
+4 -7
View File
@@ -22,10 +22,6 @@ namespace ScriptCanvas
{
namespace Spawning
{
SpawnNodeable::SpawnNodeable()
{
}
SpawnNodeable::SpawnNodeable(const SpawnNodeable& rhs)
{
m_spawnableAsset = rhs.m_spawnableAsset;
@@ -38,7 +34,6 @@ namespace ScriptCanvas
AZ::TickBus::Handler::BusConnect();
}
m_spawnTicket.IsValid();
m_spawnTicket = AzFramework::EntitySpawnTicket(m_spawnableAsset);
}
@@ -57,7 +52,7 @@ namespace ScriptCanvas
AZStd::vector<Data::EntityIDType> swappedSpawnedEntityList;
AZStd::vector<size_t> swappedSpawnBatchSizes;
{
AZStd::lock_guard<AZStd::recursive_mutex> lock(m_recursiveMutex);
AZStd::lock_guard<AZStd::recursive_mutex> lock(m_idBatchMutex);
swappedSpawnedEntityList.swap(m_spawnedEntityList);
swappedSpawnBatchSizes.swap(m_spawnBatchSizes);
@@ -99,6 +94,8 @@ namespace ScriptCanvas
m_spawnableAsset = AZ::Data::AssetManager::Instance().
FindOrCreateAsset<AzFramework::Spawnable>(rootAssetId, AZ::Data::AssetLoadBehavior::Default);
}
m_spawnableAsset.SetAutoLoadBehavior(AZ::Data::AssetLoadBehavior::PreLoad);
}
}
@@ -129,7 +126,7 @@ namespace ScriptCanvas
auto spawnCompleteCB = [this]([[maybe_unused]] AzFramework::EntitySpawnTicket& ticket,
AzFramework::SpawnableConstEntityContainerView view)
{
AZStd::lock_guard<AZStd::recursive_mutex> lock(m_recursiveMutex);
AZStd::lock_guard<AZStd::recursive_mutex> lock(m_idBatchMutex);
m_spawnedEntityList.reserve(m_spawnedEntityList.size() + view.size());
for (const AZ::Entity* entity : view)
{
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Spawning/SpawnNodeable.h
+2 -2
View File
@@ -34,7 +34,7 @@ namespace ScriptCanvas
{
SCRIPTCANVAS_NODE(SpawnNodeable);
public:
SpawnNodeable();
SpawnNodeable() = default;
SpawnNodeable(const SpawnNodeable& rhs);
void OnInitializeExecutionState() override;
@@ -50,7 +50,7 @@ namespace ScriptCanvas
AZStd::vector<Data::EntityIDType> m_spawnedEntityList;
AZStd::vector<size_t> m_spawnBatchSizes;
AZStd::recursive_mutex m_recursiveMutex;
AZStd::recursive_mutex m_idBatchMutex;
};
}
}