Xargon/Supermodel
1
0
Fork 0
mirror of https://github.com/RetroDECK/Supermodel.git synced 2025-04-10 19:15:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated game loader to make use of latest changes to config tree: generic value types and eliminated pointers

Browse source
This commit is contained in:
Bart Trzynadlowski 2016-08-24 04:13:23 +00:00
parent c2f80cef6b
commit 4b184b05dc
2 changed files with 50 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
Src/Game.cpp
View file

@ -1,6 +1,7 @@
#include "Game.h" #include "Game.h"
#include "OSD/Logger.h" #include "OSD/Logger.h"
#include "Util/NewConfig.h" #include "Util/NewConfig.h"
#include "Util/ConfigBuilders.h"
#include "Util/ByteSwap.h" #include "Util/ByteSwap.h"
#include <algorithm> #include <algorithm>
@ -25,15 +26,15 @@ bool GameLoader::MissingAttrib(const GameLoader &loader, const Util::Config::Nod
return false; return false;
} }
GameLoader::File::Ptr_t GameLoader::File::Create(const GameLoader &loader, const Util::Config::Node &file_node) GameLoader::File::ptr_t GameLoader::File::Create(const GameLoader &loader, const Util::Config::Node &file_node)
{ {
if (GameLoader::MissingAttrib(loader, file_node, "name") | GameLoader::MissingAttrib(loader, file_node, "offset")) if (GameLoader::MissingAttrib(loader, file_node, "name") | GameLoader::MissingAttrib(loader, file_node, "offset"))
return Ptr_t(); return ptr_t();
Ptr_t file = std::make_shared<File>(); ptr_t file = std::make_shared<File>();
file->offset = file_node["offset"].ValueAsUnsigned(); file->offset = file_node["offset"].ValueAs<uint32_t>();
file->filename = Util::ToLower(file_node["name"].Value()); file->filename = Util::ToLower(file_node["name"].ValueAs<std::string>());
file->has_crc32 = file_node["crc32"].Exists(); file->has_crc32 = file_node["crc32"].Exists();
file->crc32 = file->has_crc32 ? file_node["crc32"].ValueAsUnsigned() : 0; file->crc32 = file->has_crc32 ? file_node["crc32"].ValueAs<uint32_t>() : 0;
return file; return file;
} }
@ -44,28 +45,28 @@ bool GameLoader::File::Matches(const std::string &filename_to_match, uint32_t cr
return Util::ToLower(filename_to_match) == filename; return Util::ToLower(filename_to_match) == filename;
} }
GameLoader::Region::Ptr_t GameLoader::Region::Create(const GameLoader &loader, const Util::Config::Node &region_node) GameLoader::Region::ptr_t GameLoader::Region::Create(const GameLoader &loader, const Util::Config::Node &region_node)
{ {
if (GameLoader::MissingAttrib(loader, region_node, "name") | MissingAttrib(loader, region_node, "stride") | GameLoader::MissingAttrib(loader, region_node, "chunk_size")) if (GameLoader::MissingAttrib(loader, region_node, "name") | MissingAttrib(loader, region_node, "stride") | GameLoader::MissingAttrib(loader, region_node, "chunk_size"))
return Ptr_t(); return ptr_t();
Ptr_t region = std::make_shared<Region>(); ptr_t region = std::make_shared<Region>();
region->region_name = region_node["name"].Value(); region->region_name = region_node["name"].Value<std::string>();
region->stride = region_node["stride"].ValueAsUnsigned(); region->stride = region_node["stride"].ValueAs<size_t>();
region->chunk_size = region_node["chunk_size"].ValueAsUnsigned(); region->chunk_size = region_node["chunk_size"].ValueAs<size_t>();
region->byte_swap = region_node["byte_swap"].ValueAsBoolWithDefault(false); region->byte_swap = region_node["byte_swap"].ValueAsDefault<bool>(false);
return region; return region;
} }
static void PopulateGameInfo(Game *game, const Util::Config::Node &game_node) static void PopulateGameInfo(Game *game, const Util::Config::Node &game_node)
{ {
game->name = game_node["name"].Value(); game->name = game_node["name"].ValueAs<std::string>();
game->title = game_node["identity/title"].Value(); game->title = game_node["identity/title"].ValueAsDefault<std::string>("Unknown");
game->version = game_node["identity/version"].Value(); game->version = game_node["identity/version"].ValueAsDefault<std::string>("");
game->manufacturer = game_node["identity/manufacturer"].Value(); game->manufacturer = game_node["identity/manufacturer"].ValueAsDefault<std::string>("Unknown");
game->year = game_node["identity/year"].ValueAsUnsigned(); game->year = game_node["identity/year"].ValueAsDefault<unsigned>(0);
game->stepping = game_node["hardware/stepping"].Value(); game->stepping = game_node["hardware/stepping"].ValueAsDefault<std::string>("");
game->mpeg_board = game_node["hardware/mpeg_board"].Value(); game->mpeg_board = game_node["hardware/mpeg_board"].ValueAsDefault<std::string>("");
game->encryption_key = game_node["hardware/encryption_key"].ValueAsUnsigned(); game->encryption_key = game_node["hardware/encryption_key"].ValueAsDefault<uint32_t>(0);
std::map<std::string, uint32_t> input_flags std::map<std::string, uint32_t> input_flags
{ {
{ "common", Game::INPUT_COMMON }, { "common", Game::INPUT_COMMON },
@ -92,20 +93,18 @@ static void PopulateGameInfo(Game *game, const Util::Config::Node &game_node)
{ "fishing", Game::INPUT_FISHING } { "fishing", Game::INPUT_FISHING }
}; };
for (auto &node: game_node["hardware/inputs"]) for (auto &node: game_node["hardware/inputs"])
//for (auto it = game_node["hardware/inputs"].begin(); it != game_node["hardware/inputs"].end(); ++it)
{ {
//auto &node = *it;
if (node.Key() == "input" && node["type"].Exists()) if (node.Key() == "input" && node["type"].Exists())
{ {
const std::string input_type = node["type"].Value(); const std::string input_type = node["type"].ValueAs<std::string>();
game->inputs |= input_flags[input_type]; game->inputs |= input_flags[input_type];
} }
} }
} }
bool GameLoader::ParseXML(const Util::Config::Node::ConstPtr_t &xml) bool GameLoader::ParseXML(const Util::Config::Node &xml)
{ {
for (auto it = xml->begin(); it != xml->end(); ++it) for (auto it = xml.begin(); it != xml.end(); ++it)
{ {
// Game node // Game node
auto &game_node = *it; auto &game_node = *it;
@ -117,7 +116,7 @@ bool GameLoader::ParseXML(const Util::Config::Node::ConstPtr_t &xml)
//ErrorLog("%s: Ignoring <game> tag with missing 'name' attribute.", m_xml_filename.c_str()); //ErrorLog("%s: Ignoring <game> tag with missing 'name' attribute.", m_xml_filename.c_str());
continue; continue;
} }
std::string game_name = game_node["name"].Value(); std::string game_name = game_node["name"].ValueAs<std::string>();
if (m_regions_by_game.find(game_name) != m_regions_by_game.end()) if (m_regions_by_game.find(game_name) != m_regions_by_game.end())
{ {
ErrorLog("%s: Ignoring redefinition of game '%s'.", m_xml_filename.c_str(), game_name.c_str()); ErrorLog("%s: Ignoring redefinition of game '%s'.", m_xml_filename.c_str(), game_name.c_str());
@ -138,7 +137,7 @@ bool GameLoader::ParseXML(const Util::Config::Node::ConstPtr_t &xml)
auto &region_node = *it; auto &region_node = *it;
if (region_node.Key() != "region") if (region_node.Key() != "region")
continue; continue;
Region::Ptr_t region = Region::Create(*this, region_node); Region::ptr_t region = Region::Create(*this, region_node);
if (!region) if (!region)
continue; continue;
if (regions_by_name.find(region->region_name) != regions_by_name.end()) if (regions_by_name.find(region->region_name) != regions_by_name.end())
@ -154,7 +153,7 @@ bool GameLoader::ParseXML(const Util::Config::Node::ConstPtr_t &xml)
auto &file_node = *it; auto &file_node = *it;
if (file_node.Key() != "file") if (file_node.Key() != "file")
continue; continue;
File::Ptr_t file = File::Create(*this, file_node); File::ptr_t file = File::Create(*this, file_node);
if (!file) if (!file)
continue; continue;
// Ensure file offset not defined multiple times. We allow the same // Ensure file offset not defined multiple times. We allow the same
@ -199,10 +198,10 @@ std::set<std::string> GameLoader::IdentifyGamesFileBelongsTo(const std::string &
auto &regions_by_name = v_game.second; auto &regions_by_name = v_game.second;
for (auto &v_region: regions_by_name) for (auto &v_region: regions_by_name)
{ {
Region::Ptr_t region = v_region.second; Region::ptr_t region = v_region.second;
for (auto &v_file: region->files_by_offset) for (auto &v_file: region->files_by_offset)
{ {
File::Ptr_t file = v_file.second; File::ptr_t file = v_file.second;
if (file->Matches(filename, crc32)) if (file->Matches(filename, crc32))
games.insert(game_name); games.insert(game_name);
} }
@ -211,7 +210,7 @@ std::set<std::string> GameLoader::IdentifyGamesFileBelongsTo(const std::string &
return games; return games;
} }
const unz_file_info *GameLoader::LookupZippedFile(const File::Ptr_t &file) const const unz_file_info *GameLoader::LookupZippedFile(const File::ptr_t &file) const
{ {
if (file->has_crc32) if (file->has_crc32)
{ {
@ -228,7 +227,7 @@ const unz_file_info *GameLoader::LookupZippedFile(const File::Ptr_t &file) const
return 0; return 0;
} }
bool GameLoader::ComputeRegionSize(uint32_t *region_size, const GameLoader::Region::Ptr_t &region) const bool GameLoader::ComputeRegionSize(uint32_t *region_size, const GameLoader::Region::ptr_t &region) const
{ {
// Files in region need not be loaded contiguously. To find region size, // Files in region need not be loaded contiguously. To find region size,
// use maximum end_addr = offset + stride * (num_chunks - 1) + chunk_size. // use maximum end_addr = offset + stride * (num_chunks - 1) + chunk_size.
@ -260,7 +259,7 @@ bool GameLoader::ComputeRegionSize(uint32_t *region_size, const GameLoader::Regi
return error; return error;
} }
bool GameLoader::LoadZippedFile(std::shared_ptr<uint8_t> *buffer, size_t *file_size, const GameLoader::File::Ptr_t &file) bool GameLoader::LoadZippedFile(std::shared_ptr<uint8_t> *buffer, size_t *file_size, const GameLoader::File::ptr_t &file)
{ {
unz_file_info info; unz_file_info info;
for (int err = unzGoToFirstFile(m_zf); err == UNZ_OK; err = unzGoToNextFile(m_zf)) for (int err = unzGoToFirstFile(m_zf); err == UNZ_OK; err = unzGoToNextFile(m_zf))
@ -299,7 +298,7 @@ bool GameLoader::LoadZippedFile(std::shared_ptr<uint8_t> *buffer, size_t *file_s
return true; return true;
} }
bool GameLoader::LoadRegion(Game::ROM *buffer, const GameLoader::Region::Ptr_t &region) bool GameLoader::LoadRegion(Game::ROM *buffer, const GameLoader::Region::ptr_t &region)
{ {
bool error = false; bool error = false;
for (auto &v_file: region->files_by_offset) for (auto &v_file: region->files_by_offset)
@ -342,7 +341,6 @@ bool GameLoader::LoadROMs(std::map<std::string, Game::ROM> *roms, const std::str
error |= true; error |= true;
else else
{ {
std::cout << region->region_name << " -> " << Util::Hex(region_size) << std::endl;
auto &buffer = (*roms)[region->region_name]; auto &buffer = (*roms)[region->region_name];
buffer.size = region_size; buffer.size = region_size;
buffer.data.reset(new uint8_t[region_size], std::default_delete<uint8_t[]>()); buffer.data.reset(new uint8_t[region_size], std::default_delete<uint8_t[]>());
@ -355,7 +353,9 @@ bool GameLoader::LoadROMs(std::map<std::string, Game::ROM> *roms, const std::str
bool GameLoader::LoadDefinitionXML(const std::string &filename) bool GameLoader::LoadDefinitionXML(const std::string &filename)
{ {
m_xml_filename = filename; m_xml_filename = filename;
Util::Config::Node::ConstPtr_t xml = std::const_pointer_cast<const Util::Config::Node>(Util::Config::FromXMLFile(filename)); Util::Config::Node xml("xml");
if (Util::Config::FromXMLFile(&xml, filename))
return true;
return ParseXML(xml); return ParseXML(xml);
} }
@ -426,5 +426,5 @@ bool GameLoader::Load(Game *game, const std::string &zipfilename)
GameLoader::GameLoader(const Util::Config::Node &config) GameLoader::GameLoader(const Util::Config::Node &config)
{ {
LoadDefinitionXML(config["GameXMLFile"].Value()); LoadDefinitionXML(config["GameXMLFile"].ValueAs<std::string>());
} }

24
Src/Game.h
View file

@ -13,7 +13,7 @@ struct Game
std::string title; std::string title;
std::string version; std::string version;
std::string manufacturer; std::string manufacturer;
int year = 0; unsigned year = 0;
std::string stepping; std::string stepping;
std::string mpeg_board; std::string mpeg_board;
uint32_t encryption_key = 0; uint32_t encryption_key = 0;
@ -67,32 +67,32 @@ private:
// Describes a file node in the game XML // Describes a file node in the game XML
struct File struct File
{ {
typedef std::shared_ptr<File> Ptr_t; typedef std::shared_ptr<File> ptr_t;
uint32_t offset; uint32_t offset;
std::string filename; std::string filename;
uint32_t crc32; uint32_t crc32;
bool has_crc32; bool has_crc32;
static Ptr_t Create(const GameLoader &loader, const Util::Config::Node &file_node); static ptr_t Create(const GameLoader &loader, const Util::Config::Node &file_node);
bool Matches(const std::string &filename, uint32_t crc32) const; bool Matches(const std::string &filename, uint32_t crc32) const;
}; };
// Describes a region node in the game XML // Describes a region node in the game XML
struct Region struct Region
{ {
typedef std::shared_ptr<Region> Ptr_t; typedef std::shared_ptr<Region> ptr_t;
std::string region_name; std::string region_name;
size_t stride; size_t stride;
size_t chunk_size; size_t chunk_size;
bool byte_swap; bool byte_swap;
typedef std::map<uint32_t, File::Ptr_t> FilesByOffset_t; typedef std::map<uint32_t, File::ptr_t> FilesByOffset_t;
FilesByOffset_t files_by_offset; FilesByOffset_t files_by_offset;
static Ptr_t Create(const GameLoader &loader, const Util::Config::Node &region_node); static ptr_t Create(const GameLoader &loader, const Util::Config::Node &region_node);
}; };
std::map<std::string, Game> m_game_info_by_game; // ROMs not loaded here std::map<std::string, Game> m_game_info_by_game; // ROMs not loaded here
// Parsed XML // Parsed XML
typedef std::map<std::string, Region::Ptr_t> RegionsByName_t; typedef std::map<std::string, Region::ptr_t> RegionsByName_t;
std::map<std::string, RegionsByName_t> m_regions_by_game; std::map<std::string, RegionsByName_t> m_regions_by_game;
std::string m_xml_filename; std::string m_xml_filename;
@ -104,12 +104,12 @@ private:
std::map<uint32_t, unz_file_info> m_zip_info_by_crc32; std::map<uint32_t, unz_file_info> m_zip_info_by_crc32;
static bool MissingAttrib(const GameLoader &loader, const Util::Config::Node &node, const std::string &attribute); static bool MissingAttrib(const GameLoader &loader, const Util::Config::Node &node, const std::string &attribute);
bool ParseXML(const Util::Config::Node::ConstPtr_t &xml); bool ParseXML(const Util::Config::Node &xml);
std::set<std::string> IdentifyGamesFileBelongsTo(const std::string &filename, uint32_t crc32) const; std::set<std::string> IdentifyGamesFileBelongsTo(const std::string &filename, uint32_t crc32) const;
const unz_file_info *LookupZippedFile(const File::Ptr_t &file) const; const unz_file_info *LookupZippedFile(const File::ptr_t &file) const;
bool ComputeRegionSize(uint32_t *region_size, const Region::Ptr_t &region) const; bool ComputeRegionSize(uint32_t *region_size, const Region::ptr_t &region) const;
bool LoadZippedFile(std::shared_ptr<uint8_t> *buffer, size_t *file_size, const GameLoader::File::Ptr_t &file); bool LoadZippedFile(std::shared_ptr<uint8_t> *buffer, size_t *file_size, const GameLoader::File::ptr_t &file);
bool LoadRegion(Game::ROM *buffer, const GameLoader::Region::Ptr_t &region); bool LoadRegion(Game::ROM *buffer, const GameLoader::Region::ptr_t &region);
bool LoadROMs(std::map<std::string, Game::ROM> *roms, const std::string &game_name); bool LoadROMs(std::map<std::string, Game::ROM> *roms, const std::string &game_name);
bool LoadDefinitionXML(const std::string &filename); bool LoadDefinitionXML(const std::string &filename);