thirdpartymirrors/N64ModernRuntime
1
0
Fork 0
mirror of https://github.com/N64Recomp/N64ModernRuntime.git synced 2026-05-10 19:01:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Address feedback

Browse source
This commit is contained in:
dcvz 2024-05-22 03:52:57 +02:00
parent 59f29adc1c
commit 2060d30d8a
2 changed files with 26 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
librecomp/include/recomp_game.h
View file

@ -8,13 +8,10 @@
#include <ultramodern/ultramodern.hpp>
namespace recomp {
struct GameHandle {
std::u8string_view id;
};
struct GameEntry {
uint64_t rom_hash;
std::string internal_name;
std::u8string_view game_id;
std::u8string game_id;
std::span<const char> cache_data;
bool is_enabled;
@ -31,21 +28,21 @@ namespace recomp {
IncorrectVersion,
OtherError
};
GameHandle register_game(const recomp::GameEntry& entry);
void register_patch(const char* patch, std::size_t size);
bool register_game(const recomp::GameEntry& entry);
void register_patch(const char* patch, std::size_t size);
void check_all_stored_roms();
bool load_stored_rom(GameHandle game);
RomValidationError select_rom(const std::filesystem::path& rom_path, GameHandle game);
bool is_rom_valid(GameHandle game);
bool load_stored_rom(std::u8string& game_id);
RomValidationError select_rom(const std::filesystem::path& rom_path, std::u8string& game_id);
bool is_rom_valid(std::u8string& game_id);
bool is_rom_loaded();
void set_rom_contents(std::vector<uint8_t>&& new_rom);
void do_rom_read(uint8_t* rdram, gpr ram_address, uint32_t physical_addr, size_t num_bytes);
void do_rom_pio(uint8_t* rdram, gpr ram_address, uint32_t physical_addr);
void start(ultramodern::WindowHandle window_handle, const ultramodern::audio_callbacks_t& audio_callbacks, const ultramodern::input_callbacks_t& input_callbacks, const ultramodern::gfx_callbacks_t& gfx_callbacks);
void start_game(GameHandle game);
void start_game(std::u8string game_id);
void message_box(const char* message);
std::filesystem::path get_app_folder_path();
std::u8string_view current_game_id();
std::filesystem::path get_app_folder_path();
std::u8string current_game_id();
}
#endif

34
librecomp/src/recomp.cpp
View file

@ -40,16 +40,16 @@ std::mutex current_game_mutex;
// Global variables
std::vector<char> patch_data;
std::unordered_map<std::u8string_view, recomp::GameEntry> game_roms {};
std::unordered_map<std::u8string, recomp::GameEntry> game_roms {};
std::u8string recomp::GameEntry::stored_filename() const {
return std::u8string{game_id} + u8".z64";
return game_id + u8".z64";
}
recomp::GameHandle recomp::register_game(const recomp::GameEntry& entry) {
bool recomp::register_game(const recomp::GameEntry& entry) {
std::lock_guard<std::mutex> lock(game_roms_mutex);
game_roms.insert({ entry.game_id, entry });
return { entry.game_id };
return true;
}
void recomp::register_patch(const char* patch, std::size_t size) {
@ -129,10 +129,10 @@ bool check_stored_rom(const recomp::GameEntry& game_entry) {
return true;
}
static std::unordered_set<std::u8string_view> valid_game_roms;
static std::unordered_set<std::u8string> valid_game_roms;
bool recomp::is_rom_valid(recomp::GameHandle game) {
return valid_game_roms.contains(game.id);
bool recomp::is_rom_valid(std::u8string& game_id) {
return valid_game_roms.contains(game_id);
}
void recomp::check_all_stored_roms() {
@ -143,8 +143,8 @@ void recomp::check_all_stored_roms() {
}
}
bool recomp::load_stored_rom(recomp::GameHandle game) {
auto find_it = game_roms.find(game.id);
bool recomp::load_stored_rom(std::u8string& game_id) {
auto find_it = game_roms.find(game_id);
if (find_it == game_roms.end()) {
return false;
@ -217,8 +217,8 @@ void byteswap_data(std::vector<uint8_t>& rom_data, size_t index_xor) {
}
}
recomp::RomValidationError recomp::select_rom(const std::filesystem::path& rom_path, recomp::GameHandle game) {
auto find_it = game_roms.find(game.id);
recomp::RomValidationError recomp::select_rom(const std::filesystem::path& rom_path, std::u8string& game_id) {
auto find_it = game_roms.find(game_id);
if (find_it == game_roms.end()) {
return recomp::RomValidationError::OtherError;
@ -388,17 +388,17 @@ void init(uint8_t* rdram, recomp_context* ctx) {
MEM_W(osMemSize, 0) = 8 * 1024 * 1024; // 8MB
}
std::optional<recomp::GameHandle> current_game = std::nullopt;
std::optional<std::u8string> current_game = std::nullopt;
std::atomic<GameStatus> game_status = GameStatus::None;
std::u8string_view recomp::current_game_id() {
std::u8string recomp::current_game_id() {
std::lock_guard<std::mutex> lock(current_game_mutex);
return current_game.value().id;
return current_game.value();
};
void recomp::start_game(recomp::GameHandle game) {
void recomp::start_game(std::u8string game_id) {
std::lock_guard<std::mutex> lock(current_game_mutex);
current_game = game;
current_game = game_id;
game_status.store(GameStatus::Running);
}
@ -463,7 +463,7 @@ void recomp::start(ultramodern::WindowHandle window_handle, const ultramodern::a
recomp::message_box("Error opening stored ROM! Please restart this program.");
}
auto find_it = game_roms.find(current_game.value().id);
auto find_it = game_roms.find(current_game.value());
const recomp::GameEntry& game_entry = find_it->second;
ultramodern::load_shader_cache(game_entry.cache_data);