From e7cf10aea8e50e38f79128e5ab5395b72e54b843 Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Thu, 29 Dec 2022 21:51:57 +0100 Subject: [PATCH] Minor tweaks --- Source/Engine/Core/ObjectsRemovalService.cpp | 16 ++++++++-------- Source/Engine/Core/ObjectsRemovalService.h | 1 - 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Source/Engine/Core/ObjectsRemovalService.cpp b/Source/Engine/Core/ObjectsRemovalService.cpp index f3ef498ef..7d79a9523 100644 --- a/Source/Engine/Core/ObjectsRemovalService.cpp +++ b/Source/Engine/Core/ObjectsRemovalService.cpp @@ -22,11 +22,10 @@ namespace ObjectsRemovalServiceImpl using namespace ObjectsRemovalServiceImpl; -class ObjectsRemovalServiceService : public EngineService +class ObjectsRemoval : public EngineService { public: - - ObjectsRemovalServiceService() + ObjectsRemoval() : EngineService(TEXT("Objects Removal Service"), -1000) { } @@ -36,7 +35,7 @@ public: void Dispose() override; }; -ObjectsRemovalServiceService ObjectsRemovalServiceServiceInstance; +ObjectsRemoval ObjectsRemovalInstance; bool ObjectsRemovalService::IsInPool(Object* obj) { @@ -63,7 +62,6 @@ bool ObjectsRemovalService::HasNewItemsForFlush() NewItemsLocker.Lock(); const bool result = NewItemsPool.HasItems(); NewItemsLocker.Unlock(); - return result; } @@ -95,6 +93,8 @@ void ObjectsRemovalService::Add(Object* obj, float timeToLive, bool useGameTime) void ObjectsRemovalService::Flush(float dt, float gameDelta) { + PROFILE_CPU(); + // Add new items { ScopeLock lock(NewItemsLocker); @@ -173,14 +173,14 @@ void ObjectsRemovalService::Flush(float dt, float gameDelta) } } -bool ObjectsRemovalServiceService::Init() +bool ObjectsRemoval::Init() { LastUpdate = DateTime::NowUTC(); LastUpdateGameTime = 0; return false; } -void ObjectsRemovalServiceService::LateUpdate() +void ObjectsRemoval::LateUpdate() { PROFILE_CPU(); @@ -194,7 +194,7 @@ void ObjectsRemovalServiceService::LateUpdate() LastUpdate = now; } -void ObjectsRemovalServiceService::Dispose() +void ObjectsRemoval::Dispose() { // Collect new objects ObjectsRemovalService::Flush(); diff --git a/Source/Engine/Core/ObjectsRemovalService.h b/Source/Engine/Core/ObjectsRemovalService.h index 92a5bd1af..e9120a6dd 100644 --- a/Source/Engine/Core/ObjectsRemovalService.h +++ b/Source/Engine/Core/ObjectsRemovalService.h @@ -10,7 +10,6 @@ class FLAXENGINE_API ObjectsRemovalService { public: - /// /// Determines whether object has been registered in the pool for the removing. ///