fix: use cache on LoadFileRaw #2489
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 4 commits
February 16, 2023 12:17
this makes it so explosions don't use the dpad texture
dcvz
reviewed
Feb 16, 2023
| @@ -888,6 +888,12 @@ extern "C" char* ResourceMgr_LoadFileRaw(const char* resName) { | |||
| // TODO: This should not exist. Anywhere we are loading textures with this function should be Resources instead. | |||
| // We are not currently packing our otr archive with certain textures as resources with otr headers. | |||
| static std::unordered_map<std::string, std::shared_ptr<Ship::OtrFile>> cachedRawFiles; | |||
|
|
|||
| auto cacheFind = cachedRawFiles.find(resName); | |||
There was a problem hiding this comment.
Why does using a cache fix this?
There was a problem hiding this comment.
i don't know yet, @Kenix3 is going to do some investigation later. I found that the texture would pop in and out and glitch out if it was never added to the cache by just commenting out what we had before
// static std::unordered_map<std::string, std::shared_ptr<Ship::OtrFile>> cachedRawFiles;
auto file = OTRGlobals::Instance->context->GetResourceManager()->LoadFile(resName);
// cachedRawFiles[resName] = file;
if (file == nullptr) {
return nullptr;
}
return file->Buffer.data();I still don't know why putting it in the cache and never using it from there leads to the texture popping up in unexpected places, but if nothing else this PR updates the logic in this method to be what it should have been in the first place.
Kenix3
approved these changes
Feb 16, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
this makes it so explosions don't use the dpad texture
fixes #2484
Build Artifacts