mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-13 18:30:35 +00:00
Code Issues Projects Releases Wiki Activity

ZAPD update: libpng, zroom improvements and others (#811)

Browse source 
* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "769f5702a"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "769f5702a"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* Add `libpng` to readme

* Remove `-ifp` since it doesn't exists anymore in ZAPD

* Remove extra print I added

* Add UNK_09 macro and other minor fixes

* Simplify PNG rules

* simplify gitignore

* Update README.md

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update dockerfile

* basic instructions for cygwin and mac

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "86160be69"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "86160be69"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* Change nanoseconds to seconds in extract_assets.py

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
Anghelo Carvajal 2021-05-30 11:09:59 -04:00 • committed by GitHub
parent 676ecf06c5
commit 515ebdce9d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
142 changed files with 5922 additions and 14735 deletions
Download patch file Download diff file Expand all files Collapse all files

43
tools/ZAPD/ZAPD/ZSymbol.cpp
View file

@ -6,58 +6,63 @@ REGISTER_ZFILENODE(Symbol, ZSymbol);
ZSymbol::ZSymbol(ZFile* nParent) : ZResource(nParent)
{
RegisterOptionalAttribute("Type");
RegisterOptionalAttribute("TypeSize");
RegisterOptionalAttribute("Count");
}
void ZSymbol::ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector<uint8_t>& nRawData,
const uint32_t nRawDataIndex, const std::string& nRelPath)
const uint32_t nRawDataIndex)
{
ZResource::ExtractFromXML(reader, nRawData, nRawDataIndex, nRelPath);
ZResource::ExtractFromXML(reader, nRawData, nRawDataIndex);
}
void ZSymbol::ParseXML(tinyxml2::XMLElement* reader)
{
ZResource::ParseXML(reader);
const char* typeXml = reader->Attribute("Type");
std::string typeXml = registeredAttributes.at("Type").value;
if (typeXml == nullptr)
if (typeXml == "")
{
fprintf(stderr,
"ZSymbol::ParseXML: Warning in '%s'.\n\t Missing 'Type' attribute in xml. "
"Defaulting to 'void*'.\n",
"ZSymbol::ParseXML: Warning in '%s'.\n"
"\t Missing 'Type' attribute in xml.\n"
"\t Defaulting to 'void*'.\n",
name.c_str());
type = "void*";
}
else
{
type = std::string(typeXml);
type = typeXml;
}
const char* typeSizeXml = reader->Attribute("TypeSize");
if (typeSizeXml == nullptr)
std::string typeSizeXml = registeredAttributes.at("TypeSize").value;
if (typeSizeXml == "")
{
fprintf(stderr,
"ZSymbol::ParseXML: Warning in '%s'.\n\t Missing 'TypeSize' attribute in xml. "
"Defaulting to '4'.\n",
"ZSymbol::ParseXML: Warning in '%s'.\n"
"\t Missing 'TypeSize' attribute in xml.\n"
"\t Defaulting to '4'.\n",
name.c_str());
typeSize = 4; // Size of a word.
}
else
{
typeSize = std::strtoul(typeSizeXml, nullptr, 0);
typeSize = StringHelper::StrToL(typeSizeXml, 0);
}
const char* countXml = reader->Attribute("Count");
if (countXml != nullptr)
if (registeredAttributes.at("Count").wasSet)
{
isArray = true;
if (!std::string(countXml).empty())
count = std::strtoul(countXml, nullptr, 0);
std::string countXml = registeredAttributes.at("Count").value;
if (countXml != "")
count = StringHelper::StrToL(countXml, 0);
}
}
size_t ZSymbol::GetRawDataSize()
size_t ZSymbol::GetRawDataSize() const
{
if (isArray)
return count * typeSize;
@ -80,12 +85,12 @@ std::string ZSymbol::GetSourceOutputHeader(const std::string& prefix)
return StringHelper::Sprintf("extern %s %s%s;\n", type.c_str(), prefix.c_str(), name.c_str());
}
std::string ZSymbol::GetSourceTypeName()
std::string ZSymbol::GetSourceTypeName() const
{
return type;
}
ZResourceType ZSymbol::GetResourceType()
ZResourceType ZSymbol::GetResourceType() const
{
return ZResourceType::Symbol;
}