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

Vegetation

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
pappeste
2021-06-18 16:20:59 -07:00
committed by Esteban Papp
parent 4ca2222532
commit 9dc13db8ba
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Vegetation/Code/Source/AreaSystemComponent.cpp
+3 -3
View File
@@ -1010,7 +1010,7 @@ namespace Vegetation
if (m_debugData)
{
m_debugData->m_areaTaskQueueCount.store(m_vegetationThreadTasks.size(), AZStd::memory_order_relaxed);
m_debugData->m_areaTaskQueueCount.store(static_cast<AZStd::atomic_int::value_type>(m_vegetationThreadTasks.size()), AZStd::memory_order_relaxed);
}
}
@@ -1025,8 +1025,8 @@ namespace Vegetation
if (m_debugData)
{
m_debugData->m_areaTaskQueueCount.store(m_vegetationThreadTasks.size(), AZStd::memory_order_relaxed);
m_debugData->m_areaTaskActiveCount.store(tasks.size(), AZStd::memory_order_relaxed);
m_debugData->m_areaTaskQueueCount.store(static_cast<AZStd::atomic_int::value_type>(m_vegetationThreadTasks.size()), AZStd::memory_order_relaxed);
m_debugData->m_areaTaskActiveCount.store(static_cast<AZStd::atomic_int::value_type>(tasks.size()), AZStd::memory_order_relaxed);
}
}
Gems/Vegetation/Code/Source/Components/SpawnerComponent.cpp
+1 -1
View File
@@ -528,7 +528,7 @@ namespace Vegetation
AZ::u32 SpawnerComponent::GetProductCount() const
{
AZStd::lock_guard<decltype(m_claimInstanceMappingMutex)> claimInstanceMappingMutexLock(m_claimInstanceMappingMutex);
return m_claimInstanceMapping.size();
return static_cast<AZ::u32>(m_claimInstanceMapping.size());
}
void SpawnerComponent::OnCompositionChanged()
Gems/Vegetation/Code/Source/Debugger/DebugComponent.cpp
+8 -8
View File
@@ -599,8 +599,8 @@ namespace DebugUtility
timing.m_lowestTimeUs = AZ::GetMin<decltype(timing.m_lowestTimeUs)>(timeSpan, timing.m_lowestTimeUs);
timing.m_peakTimeUs = AZ::GetMax<decltype(timing.m_peakTimeUs)>(timeSpan, timing.m_peakTimeUs);
timing.m_totalUpdateTimeUs += timeSpan;
timing.m_numInstancesCreated += datum.m_numInstancesCreated;
timing.m_numClaimPointsRemaining += datum.m_numClaimPointsRemaining;
timing.m_numInstancesCreated += static_cast<AZ::u32>(datum.m_numInstancesCreated);
timing.m_numClaimPointsRemaining += static_cast<AZ::u32>(datum.m_numClaimPointsRemaining);
++timing.m_totalCount;
timing.m_averageTimeUs = timing.m_totalUpdateTimeUs / timing.m_totalCount;
@@ -615,8 +615,8 @@ namespace DebugUtility
timing.m_peakTimeUs = timeSpan;
timing.m_averageTimeUs = timeSpan;
timing.m_totalUpdateTimeUs = timeSpan;
timing.m_numInstancesCreated = datum.m_numInstancesCreated;
timing.m_numClaimPointsRemaining = datum.m_numClaimPointsRemaining;
timing.m_numInstancesCreated = static_cast<AZ::u32>(datum.m_numInstancesCreated);
timing.m_numClaimPointsRemaining = static_cast<AZ::u32>(datum.m_numClaimPointsRemaining);
timing.m_totalCount = 1;
mergeData(datum, timing);
@@ -876,7 +876,7 @@ void DebugComponent::PrepareNextReport()
{
AreaSectorTiming& areaSectorTiming = iterator->second;
areaSectorTiming.m_totalTime += AZStd::chrono::microseconds(sectorAreaData.m_end - sectorAreaData.m_start).count();
areaSectorTiming.m_numInstances += sectorAreaData.m_numInstancesCreated;
areaSectorTiming.m_numInstances += static_cast<AZ::u32>(sectorAreaData.m_numInstancesCreated);
for( const auto& reasonValue : sectorAreaData.m_numInstancesRejectedByFilters )
{
DebugComponentUtilities::IncrementFilterReason(areaSectorTiming.m_numInstancesRejectedByFilters, reasonValue.first, reasonValue.second);
@@ -887,7 +887,7 @@ void DebugComponent::PrepareNextReport()
{
AreaSectorTiming newAreaSectorTiming;
newAreaSectorTiming.m_totalTime = AZStd::chrono::microseconds(sectorAreaData.m_end - sectorAreaData.m_start).count();
newAreaSectorTiming.m_numInstances = sectorAreaData.m_numInstancesCreated;
newAreaSectorTiming.m_numInstances = static_cast<AZ::u32>(sectorAreaData.m_numInstancesCreated);
newAreaSectorTiming.m_numInstancesRejectedByFilters = sectorAreaData.m_numInstancesRejectedByFilters;
newAreaSectorTiming.m_filteredByMasks = sectorAreaData.m_filteredByMasks;
sectorTiming.m_perAreaData[areaId] = newAreaSectorTiming;
@@ -913,7 +913,7 @@ void DebugComponent::PrepareNextReport()
AreaSectorTiming& areaSectorTiming = iterator->second;
areaSectorTiming.m_totalTime += AZStd::chrono::microseconds(areaTracker.m_end - areaTracker.m_start).count();
areaSectorTiming.m_numInstances += areaTracker.m_numInstancesCreated;
areaSectorTiming.m_numInstances += static_cast<AZ::u32>(areaTracker.m_numInstancesCreated);
for (const auto& filterReasonEntry : areaTracker.m_numInstancesRejectedByFilters)
{
DebugComponentUtilities::IncrementFilterReason(areaSectorTiming.m_numInstancesRejectedByFilters, filterReasonEntry.first, filterReasonEntry.second);
@@ -925,7 +925,7 @@ void DebugComponent::PrepareNextReport()
{
AreaSectorTiming newAreaSectorTiming;
newAreaSectorTiming.m_totalTime = AZStd::chrono::microseconds(areaTracker.m_end - areaTracker.m_start).count();
newAreaSectorTiming.m_numInstances = areaTracker.m_numInstancesCreated;
newAreaSectorTiming.m_numInstances = static_cast<AZ::u32>(areaTracker.m_numInstancesCreated);
newAreaSectorTiming.m_numInstancesRejectedByFilters = areaTracker.m_numInstancesRejectedByFilters;
newAreaSectorTiming.m_filteredByMasks = areaTracker.m_filteredByMasks;
areaTiming.m_perSectorData[areaTracker.m_sectorId] = newAreaSectorTiming;
Gems/Vegetation/Code/Source/InstanceSystemComponent.cpp
+2 -2
View File
@@ -483,7 +483,7 @@ namespace Vegetation
AZStd::lock_guard<decltype(m_instanceMapMutex)> scopedLock(m_instanceMapMutex);
AZ_Assert(m_instanceMap.find(instanceData.m_instanceId) == m_instanceMap.end(), "InstanceId %llu is already in use!", instanceData.m_instanceId);
m_instanceMap[instanceData.m_instanceId] = AZStd::make_pair(instanceData.m_descriptorPtr, opaqueInstanceData);
m_instanceCount = m_instanceMap.size();
m_instanceCount = static_cast<AZStd::atomic_int::value_type>(m_instanceMap.size());
}
}
@@ -503,7 +503,7 @@ namespace Vegetation
opaqueInstanceData = instanceItr->second.second;
m_instanceMap.erase(instanceItr);
}
m_instanceCount = m_instanceMap.size();
m_instanceCount = static_cast<AZStd::atomic_int::value_type>(m_instanceMap.size());
}
if (opaqueInstanceData)