mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-12-26 01:58:51 -05:00
Code Issues Projects Releases Wiki Activity

Swap Load/UnloadResources calls to non-async within threaded helper functions to prevent debug stutter on transition.

Browse Source
This commit is contained in:
Malkierian 2024-12-18 00:15:38 -07:00
parent bf504d7de4
commit e2788fa1e8
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libultraship

@ -1 +1 @@
Subproject commit b7e715e60a2773a8b3b40698b4cc10a12bffdcfe Subproject commit 9eb44f6e5b5bc0c81377231e99297a5f772525ae

14
soh/soh/ResourceManagerHelpers.cpp
View File

@ -551,11 +551,11 @@ std::array<std::unordered_set<std::string>, SCENE_TESTROOM + 1> sceneObjects;
void LoadSceneResourcesProcess(int16_t sceneNum) { void LoadSceneResourcesProcess(int16_t sceneNum) {
auto play = gPlayState; auto play = gPlayState;
for (auto objectName : sceneObjects[sceneNum]) { for (auto objectName : sceneObjects[sceneNum]) {
if (!sceneObjects[play->sceneNum].contains(objectName)) { //if (!sceneObjects[play->sceneNum].contains(objectName)) {
OTRGlobals::Instance->context->GetResourceManager()->LoadResourcesAsync("alt/objects/" + objectName + "/*"); OTRGlobals::Instance->context->GetResourceManager()->LoadResources("alt/objects/" + objectName + "/*");
} //}
} }
OTRGlobals::Instance->context->GetResourceManager()->LoadResourcesAsync(GetScenePathMask(sceneNum)); OTRGlobals::Instance->context->GetResourceManager()->LoadResources(GetScenePathMask(sceneNum));
} }
// Iterate over scene object/actor commands if not already done so, and load the scene and object assets // Iterate over scene object/actor commands if not already done so, and load the scene and object assets
@ -603,10 +603,10 @@ static int lastSkyboxLoad = -1;
void LoadSkyBoxProcess(TimeOfDay timeIndex, bool fileSelect) { void LoadSkyBoxProcess(TimeOfDay timeIndex, bool fileSelect) {
std::string mask = fmt::format("alt/textures/vr_fine{}*", static_cast<uint8_t>(timeIndex)); std::string mask = fmt::format("alt/textures/vr_fine{}*", static_cast<uint8_t>(timeIndex));
Ship::Context::GetInstance()->GetResourceManager()->LoadResourcesAsync(mask); Ship::Context::GetInstance()->GetResourceManager()->LoadResources(mask);
if (!fileSelect) { if (!fileSelect) {
std::string mask = fmt::format("alt/textures/vr_cloud{}*", static_cast<uint8_t>(timeIndex)); std::string mask = fmt::format("alt/textures/vr_cloud{}*", static_cast<uint8_t>(timeIndex));
Ship::Context::GetInstance()->GetResourceManager()->LoadResourcesAsync(mask); Ship::Context::GetInstance()->GetResourceManager()->LoadResources(mask);
} }
lastSkyboxLoad = timeIndex; lastSkyboxLoad = timeIndex;
} }
@ -737,7 +737,7 @@ extern "C" void ResourceMgr_CheckLoadSkybox(bool fileSelect) {
} }
extern "C" void ResourceMgr_Init() { extern "C" void ResourceMgr_Init() {
helperThreads = std::make_shared<BS::thread_pool>(); helperThreads = std::make_shared<BS::thread_pool>(1);
for (int16_t sceneNum = 0; sceneNum <= SCENE_OUTSIDE_GANONS_CASTLE; sceneNum++) { for (int16_t sceneNum = 0; sceneNum <= SCENE_OUTSIDE_GANONS_CASTLE; sceneNum++) {
if (sceneObjects[sceneNum].empty()) { if (sceneObjects[sceneNum].empty()) {
SOH::SceneCommandID cmdCode; SOH::SceneCommandID cmdCode;