mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-09-10 12:05:20 -04:00
Code Issues Packages 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
142 changed files with 5922 additions and 14735 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/ZAPD/ZAPD/ZVector.cpp
+42 -52
View File
@@ -10,84 +10,64 @@ REGISTER_ZFILENODE(Vector, ZVector);
ZVector::ZVector(ZFile* nParent) : ZResource(nParent)
{
scalars = std::vector<ZScalar*>();
this->scalarType = ZSCALAR_NONE;
this->dimensions = 0;
}
ZVector::~ZVector()
{
ClearScalars();
}
void ZVector::ClearScalars()
{
for (auto s : scalars)
delete s;
scalars.clear();
}
void ZVector::ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector<uint8_t>& nRawData,
const uint32_t nRawDataIndex, const std::string& nRelPath)
{
ZResource::ExtractFromXML(reader, nRawData, nRawDataIndex, nRelPath);
scalarType = ZScalarType::ZSCALAR_NONE;
dimensions = 0;
RegisterRequiredAttribute("Type");
RegisterRequiredAttribute("Dimensions");
}
void ZVector::ParseXML(tinyxml2::XMLElement* reader)
{
ZResource::ParseXML(reader);
std::string type = reader->Attribute("Type");
this->scalarType = ZScalar::MapOutputTypeToScalarType(type);
this->scalarType = ZScalar::MapOutputTypeToScalarType(registeredAttributes.at("Type").value);
std::string dimensions = reader->Attribute("Dimensions");
this->dimensions = strtol(dimensions.c_str(), NULL, 16);
this->dimensions = StringHelper::StrToL(registeredAttributes.at("Dimensions").value, 16);
}
void ZVector::ParseRawData()
{
int32_t currentRawDataIndex = this->rawDataIndex;
int32_t currentRawDataIndex = rawDataIndex;
// TODO: this shouldn't be necessary.
scalars.clear();
ClearScalars();
for (uint32_t i = 0; i < this->dimensions; i++)
for (uint32_t i = 0; i < dimensions; i++)
{
ZScalar* scalar = new ZScalar(this->scalarType, this->parent);
scalar->rawDataIndex = currentRawDataIndex;
scalar->rawData = this->rawData;
scalar->ParseRawData();
currentRawDataIndex += scalar->GetRawDataSize();
ZScalar scalar(scalarType, parent);
scalar.rawDataIndex = currentRawDataIndex;
scalar.rawData = rawData;
scalar.ParseRawData();
currentRawDataIndex += scalar.GetRawDataSize();
this->scalars.push_back(scalar);
scalars.push_back(scalar);
}
// Ensure the scalars vector has the same number of elements as the vector dimension.
assert(this->scalars.size() == this->dimensions);
assert(scalars.size() == dimensions);
}
size_t ZVector::GetRawDataSize()
size_t ZVector::GetRawDataSize() const
{
size_t size = 0;
for (size_t i = 0; i < this->scalars.size(); i++)
size += this->scalars[i]->GetRawDataSize();
size += this->scalars[i].GetRawDataSize();
return size;
}
bool ZVector::DoesSupportArray()
bool ZVector::DoesSupportArray() const
{
return true;
}
std::string ZVector::GetSourceTypeName()
std::string ZVector::GetSourceTypeName() const
{
if (dimensions == 3 && scalarType == ZSCALAR_F32)
if (dimensions == 3 && scalarType == ZScalarType::ZSCALAR_F32)
return "Vec3f";
else if (dimensions == 3 && scalarType == ZSCALAR_S16)
else if (dimensions == 3 && scalarType == ZScalarType::ZSCALAR_S16)
return "Vec3s";
else if (dimensions == 3 && scalarType == ZSCALAR_S32)
else if (dimensions == 3 && scalarType == ZScalarType::ZSCALAR_S32)
return "Vec3i";
else
{
@@ -95,33 +75,43 @@ std::string ZVector::GetSourceTypeName()
"Encountered unsupported vector type: %d dimensions, %s type", dimensions,
ZScalar::MapScalarTypeToOutputType(scalarType).c_str());
if (Globals::Instance->verbosity >= VERBOSITY_DEBUG)
if (Globals::Instance->verbosity >= VerbosityLevel::VERBOSITY_DEBUG)
printf("%s\n", output.c_str());
throw std::runtime_error(output);
}
}
std::string ZVector::GetSourceValue()
std::string ZVector::GetBodySourceCode() const
{
std::vector<std::string> strings = std::vector<std::string>();
std::string body = "";
for (size_t i = 0; i < this->scalars.size(); i++)
strings.push_back(scalars[i]->GetSourceValue());
body += StringHelper::Sprintf("%6s, ", scalars[i].GetBodySourceCode().c_str());
return "{ " + StringHelper::Implode(strings, ", ") + " }";
return "{ " + body + "}";
}
std::string ZVector::GetSourceOutputCode(const std::string& prefix)
{
if (parent != nullptr)
parent->AddDeclaration(rawDataIndex, DeclarationAlignment::None, GetRawDataSize(),
GetSourceTypeName(), GetName(), GetSourceValue());
GetSourceTypeName(), GetName(), GetBodySourceCode());
return "";
}
ZResourceType ZVector::GetResourceType()
ZResourceType ZVector::GetResourceType() const
{
return ZResourceType::Vector;
}
}
void ZVector::SetScalarType(ZScalarType type)
{
scalarType = type;
}
void ZVector::SetDimensions(uint32_t dim)
{
dimensions = dim;
}