github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-19 04:50:05 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

SoH now uses the multithreaded resource manager. (#2467)

Browse source 
* SoH now uses the multithreaded resource manager.

* Fixes build errors on Linux and decreases audio heap size.

* Updates LUS.
This commit is contained in:
Kenix3 2023-02-15 01:02:09 -05:00 • committed by GitHub
commit 3a4a260e21
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
OTRExporter/OTRExporter/Main.cpp
View file

@ -22,6 +22,7 @@
#include <Utils/MemoryStream.h> #include <Utils/MemoryStream.h>
#include <Utils/BinaryWriter.h> #include <Utils/BinaryWriter.h>
#include <bit> #include <bit>
#include <mutex>
std::string otrFileName = "oot.otr"; std::string otrFileName = "oot.otr";
std::shared_ptr<Ship::Archive> otrArchive; std::shared_ptr<Ship::Archive> otrArchive;

2
libultraship

@ -1 +1 @@
Subproject commit d3e42d7f4e56bfad29aafc1b63a8d09f1d8d720a Subproject commit 1fc9f3795405f6263c3adb3ab8f7d5f0b24b6e75

2
soh/include/z64.h
View file

@ -35,7 +35,7 @@
#define _SOH64 #define _SOH64
#endif #endif
#define AUDIO_HEAP_SIZE 0x3800000 #define AUDIO_HEAP_SIZE 0x380000
#define SYSTEM_HEAP_SIZE (1024 * 1024 * 4) #define SYSTEM_HEAP_SIZE (1024 * 1024 * 4)
#ifdef __cplusplus #ifdef __cplusplus

13
soh/soh/OTRGlobals.cpp
View file

@ -6,6 +6,7 @@
#include <fstream> #include <fstream>
#include <ResourceMgr.h> #include <ResourceMgr.h>
#include <OtrFile.h>
#include <DisplayList.h> #include <DisplayList.h>
#include <Window.h> #include <Window.h>
#include <GameVersions.h> #include <GameVersions.h>
@ -878,7 +879,17 @@ std::shared_ptr<Ship::Resource> ResourceMgr_LoadResource(const char* path) {
} }
extern "C" char* ResourceMgr_LoadFileRaw(const char* resName) { extern "C" char* ResourceMgr_LoadFileRaw(const char* resName) {
return OTRGlobals::Instance->context->GetResourceManager()->LoadFile(resName)->Buffer.get(); // 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 file = OTRGlobals::Instance->context->GetResourceManager()->LoadFile(resName);
cachedRawFiles[resName] = file;
if (file == nullptr) {
return nullptr;
}
return file->Buffer.data();
} }
extern "C" char* ResourceMgr_LoadFileFromDisk(const char* filePath) { extern "C" char* ResourceMgr_LoadFileFromDisk(const char* filePath) {

2
soh/soh/resource/type/scenecommand/SetPathways.cpp
View file

@ -6,6 +6,6 @@ void* SetPathways::GetPointer() {
} }
size_t SetPathways::GetPointerSize() { size_t SetPathways::GetPointerSize() {
return paths.size() * sizeof(std::shared_ptr<Path>); return paths.size() * sizeof(std::shared_ptr<Ship::Path>);
} }
} // namespace Ship } // namespace Ship

2
soh/soh/resource/type/scenecommand/SetPathways.h
View file

@ -16,6 +16,6 @@ class SetPathways : public SceneCommand {
size_t GetPointerSize(); size_t GetPointerSize();
uint32_t numPaths; uint32_t numPaths;
std::vector<std::shared_ptr<Path>> paths; std::vector<std::shared_ptr<Ship::Path>> paths;
}; };
}; // namespace Ship }; // namespace Ship