Removes no longer desired commented code. (#1105)
This commit is contained in:
parent
b924831eba
commit
0d9c390526
|
@ -82,19 +82,14 @@ namespace Ship {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
//Lock.lock();
|
|
||||||
std::shared_ptr<File> ToLoad = FileLoadQueue.front();
|
std::shared_ptr<File> ToLoad = FileLoadQueue.front();
|
||||||
FileLoadQueue.pop();
|
FileLoadQueue.pop();
|
||||||
//Lock.unlock();
|
|
||||||
|
|
||||||
OTR->LoadFile(ToLoad->path, true, ToLoad);
|
OTR->LoadFile(ToLoad->path, true, ToLoad);
|
||||||
//Lock.lock();
|
|
||||||
|
|
||||||
if (!ToLoad->bHasLoadError)
|
if (!ToLoad->bHasLoadError)
|
||||||
FileCache[ToLoad->path] = ToLoad->bIsLoaded && !ToLoad->bHasLoadError ? ToLoad : nullptr;
|
FileCache[ToLoad->path] = ToLoad->bIsLoaded && !ToLoad->bHasLoadError ? ToLoad : nullptr;
|
||||||
|
|
||||||
//Lock.unlock();
|
|
||||||
|
|
||||||
SPDLOG_DEBUG("Loaded File {} on ResourceMgr thread", ToLoad->path);
|
SPDLOG_DEBUG("Loaded File {} on ResourceMgr thread", ToLoad->path);
|
||||||
|
|
||||||
ToLoad->FileLoadNotifier.notify_all();
|
ToLoad->FileLoadNotifier.notify_all();
|
||||||
|
@ -117,10 +112,8 @@ namespace Ship {
|
||||||
}
|
}
|
||||||
|
|
||||||
std::shared_ptr<ResourcePromise> ToLoad = nullptr;
|
std::shared_ptr<ResourcePromise> ToLoad = nullptr;
|
||||||
//ResLock.lock();
|
|
||||||
ToLoad = ResourceLoadQueue.front();
|
ToLoad = ResourceLoadQueue.front();
|
||||||
ResourceLoadQueue.pop();
|
ResourceLoadQueue.pop();
|
||||||
//ResLock.unlock();
|
|
||||||
|
|
||||||
// Wait for the underlying File to complete loading
|
// Wait for the underlying File to complete loading
|
||||||
{
|
{
|
||||||
|
@ -148,9 +141,6 @@ namespace Ship {
|
||||||
|
|
||||||
SPDLOG_DEBUG("Loaded Resource {} on ResourceMgr thread", ToLoad->file->path);
|
SPDLOG_DEBUG("Loaded Resource {} on ResourceMgr thread", ToLoad->file->path);
|
||||||
|
|
||||||
// Disabled for now because it can cause random crashes
|
|
||||||
//FileCache[Res->File->path] = nullptr;
|
|
||||||
//FileCache.erase(FileCache.find(Res->File->path));
|
|
||||||
Res->file = nullptr;
|
Res->file = nullptr;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
@ -159,9 +149,6 @@ namespace Ship {
|
||||||
|
|
||||||
SPDLOG_ERROR("Resource load FAILED {} on ResourceMgr thread", ToLoad->file->path);
|
SPDLOG_ERROR("Resource load FAILED {} on ResourceMgr thread", ToLoad->file->path);
|
||||||
}
|
}
|
||||||
|
|
||||||
//ResLock.lock();
|
|
||||||
//ResLock.unlock();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue