mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-22 07:13:07 +01:00
Code Issues Releases Wiki Activity

Close #12290: Refactor of object_manager_unload_objects (#12291)

Browse Source
This commit is contained in:
frutiemax
2020-07-17 00:25:35 -04:00
committed by GitHub
parent 8aa8d77ca1
commit 77d02c5e2b
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/openrct2/EditorObjectSelectionSession.cpp
View File

@@ -319,8 +319,6 @@ void unload_unselected_objects()
{ {
int32_t numItems = static_cast<int32_t>(object_repository_get_items_count()); int32_t numItems = static_cast<int32_t>(object_repository_get_items_count());
const ObjectRepositoryItem* items = object_repository_get_items(); const ObjectRepositoryItem* items = object_repository_get_items();
size_t numObjectsToUnload = 0;
std::vector<rct_object_entry> objectsToUnload; std::vector<rct_object_entry> objectsToUnload;
for (int32_t i = 0; i < numItems; i++) for (int32_t i = 0; i < numItems; i++)
@@ -330,11 +328,10 @@ void unload_unselected_objects()
const rct_object_entry* entry = &items[i].ObjectEntry; const rct_object_entry* entry = &items[i].ObjectEntry;
remove_selected_objects_from_research(entry); remove_selected_objects_from_research(entry);
objectsToUnload[numObjectsToUnload++] = *entry; objectsToUnload.push_back(*entry);
} }
} }
object_manager_unload_objects(objectsToUnload);
object_manager_unload_objects(objectsToUnload, numObjectsToUnload);
} }
/** /**

11
src/openrct2/object/ObjectManager.cpp
View File

@@ -147,17 +147,16 @@ public:
log_verbose("%u / %u new objects loaded", numNewLoadedObjects, requiredObjects.size()); log_verbose("%u / %u new objects loaded", numNewLoadedObjects, requiredObjects.size());
} }
void UnloadObjects(const std::vector<rct_object_entry>& entries, size_t count) override void UnloadObjects(const std::vector<rct_object_entry>& entries) override
{ {
// TODO there are two performance issues here: // TODO there are two performance issues here:
// - FindObject for every entry which is a dictionary lookup // - FindObject for every entry which is a dictionary lookup
// - GetLoadedObjectIndex for every entry which enumerates _loadedList // - GetLoadedObjectIndex for every entry which enumerates _loadedList
size_t numObjectsUnloaded = 0; size_t numObjectsUnloaded = 0;
for (size_t i = 0; i < count; i++) for (const auto& entry : entries)
{ {
const rct_object_entry* entry = &entries[i]; const ObjectRepositoryItem* ori = _objectRepository.FindObject(&entry);
const ObjectRepositoryItem* ori = _objectRepository.FindObject(entry);
if (ori != nullptr) if (ori != nullptr)
{ {
Object* loadedObject = ori->LoadedObject; Object* loadedObject = ori->LoadedObject;
@@ -747,10 +746,10 @@ void* object_manager_load_object(const rct_object_entry* entry)
return static_cast<void*>(loadedObject); return static_cast<void*>(loadedObject);
} }
void object_manager_unload_objects(const std::vector<rct_object_entry>& entries, size_t count) void object_manager_unload_objects(const std::vector<rct_object_entry>& entries)
{ {
auto& objectManager = OpenRCT2::GetContext()->GetObjectManager(); auto& objectManager = OpenRCT2::GetContext()->GetObjectManager();
objectManager.UnloadObjects(entries, count); objectManager.UnloadObjects(entries);
} }
void object_manager_unload_all_objects() void object_manager_unload_all_objects()

4
src/openrct2/object/ObjectManager.h
View File

@@ -33,7 +33,7 @@ interface IObjectManager
virtual Object* LoadObject(const rct_object_entry* entry) abstract; virtual Object* LoadObject(const rct_object_entry* entry) abstract;
virtual void LoadObjects(const rct_object_entry* entries, size_t count) abstract; virtual void LoadObjects(const rct_object_entry* entries, size_t count) abstract;
virtual void LoadDefaultObjects() abstract; virtual void LoadDefaultObjects() abstract;
virtual void UnloadObjects(const std::vector<rct_object_entry>& entries, size_t count) abstract; virtual void UnloadObjects(const std::vector<rct_object_entry>& entries) abstract;
virtual void UnloadAll() abstract; virtual void UnloadAll() abstract;
virtual void ResetObjects() abstract; virtual void ResetObjects() abstract;
@@ -48,6 +48,6 @@ void* object_manager_get_loaded_object_by_index(size_t index);
void* object_manager_get_loaded_object(const rct_object_entry* entry); void* object_manager_get_loaded_object(const rct_object_entry* entry);
ObjectEntryIndex object_manager_get_loaded_object_entry_index(const void* loadedObject); ObjectEntryIndex object_manager_get_loaded_object_entry_index(const void* loadedObject);
void* object_manager_load_object(const rct_object_entry* entry); void* object_manager_load_object(const rct_object_entry* entry);
void object_manager_unload_objects(const std::vector<rct_object_entry>& entries, size_t count); void object_manager_unload_objects(const std::vector<rct_object_entry>& entries);
void object_manager_unload_all_objects(); void object_manager_unload_all_objects();
rct_string_id object_manager_get_source_game_string(const uint8_t sourceGame); rct_string_id object_manager_get_source_game_string(const uint8_t sourceGame);