mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2024-12-23 08:38:52 -05:00
f31a841789
* git subrepo clone --force --branch=rebase2 C:/ZeldaStuff/ZAPDTR ZAPDTR/ subrepo: subdir: "ZAPDTR" merged: "6aa54a551" upstream: origin: "C:/ZeldaStuff/ZAPDTR" branch: "rebase2" commit: "6aa54a551" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * git subrepo clone --force --branch=rebase2 C:/ZeldaStuff/ZAPDTR ZAPDTR/ subrepo: subdir: "ZAPDTR" merged: "88b012240" upstream: origin: "C:/ZeldaStuff/ZAPDTR" branch: "rebase2" commit: "88b012240" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Update (its broken) * fix the enum * git subrepo push --remote=C:/ZeldaStuff/ZAPDTR/ ZAPDTR subrepo: subdir: "ZAPDTR" merged: "b7b6e1c82" upstream: origin: "C:/ZeldaStuff/ZAPDTR/" branch: "rebase2" commit: "b7b6e1c82" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * New names for LUS actions * git subrepo push --remote=C:/ZeldaStuff/ZAPDTR/ ZAPDTR subrepo: subdir: "ZAPDTR" merged: "c5cfebeee" upstream: origin: "C:/ZeldaStuff/ZAPDTR/" branch: "rebase2" commit: "c5cfebeee" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * git subrepo clone (merge) --force --branch=rebase2 C:/ZeldaStuff/ZAPDTR ZAPDTR/ subrepo: subdir: "ZAPDTR" merged: "d5f4769b8" upstream: origin: "C:/ZeldaStuff/ZAPDTR" branch: "rebase2" commit: "d5f4769b8" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Fix missing commands in the exporter. * Cleanups. * git subrepo pull --force --remote=https://github.com/harbourmasters/ZAPDTR --branch=master ZAPDTR subrepo: subdir: "ZAPDTR" merged: "d4c35b90a" upstream: origin: "https://github.com/harbourmasters/ZAPDTR" branch: "master" commit: "d4c35b90a" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Add unordered_map include to fix MacOS * fix string_view * Update Main.cpp * fix string view * So close I can almost taste it * So close * Fix missed git marker. * Fix surface types and * Update ZFile.cpp * Delete Jenkinsfile --------- Co-authored-by: Christopher Leggett <chris@leggett.dev> Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
154 lines
3.6 KiB
C++
154 lines
3.6 KiB
C++
#include "ZArray.h"
|
|
|
|
#include <cassert>
|
|
|
|
#include "Globals.h"
|
|
#include "Utils/StringHelper.h"
|
|
#include "WarningHandler.h"
|
|
#include "ZFile.h"
|
|
|
|
REGISTER_ZFILENODE(Array, ZArray);
|
|
|
|
ZArray::ZArray(ZFile* nParent) : ZResource(nParent)
|
|
{
|
|
canHaveInner = true;
|
|
genOTRDef = true;
|
|
RegisterRequiredAttribute("Count");
|
|
}
|
|
|
|
ZArray::~ZArray()
|
|
{
|
|
for (auto res : resList)
|
|
delete res;
|
|
}
|
|
|
|
void ZArray::ParseXML(tinyxml2::XMLElement* reader)
|
|
{
|
|
ZResource::ParseXML(reader);
|
|
|
|
arrayCnt = reader->IntAttribute("Count", 0);
|
|
if (arrayCnt <= 0)
|
|
{
|
|
HANDLE_ERROR_RESOURCE(WarningType::InvalidAttributeValue, parent, this, rawDataIndex,
|
|
"invalid value found for 'Count' attribute", "");
|
|
}
|
|
|
|
tinyxml2::XMLElement* child = reader->FirstChildElement();
|
|
if (child == nullptr)
|
|
{
|
|
HANDLE_ERROR_RESOURCE(WarningType::InvalidXML, parent, this, rawDataIndex,
|
|
"<Array> needs one sub-element", "");
|
|
}
|
|
|
|
childName = child->Name();
|
|
|
|
auto nodeMap = ZFile::GetNodeMap();
|
|
size_t childIndex = rawDataIndex;
|
|
resList.reserve(arrayCnt);
|
|
for (size_t i = 0; i < arrayCnt; i++)
|
|
{
|
|
ZResource* res = nodeMap->at(childName)(parent);
|
|
if (!res->DoesSupportArray())
|
|
{
|
|
std::string errorHeader = StringHelper::Sprintf(
|
|
"resource <%s> does not support being wrapped in an <Array>", childName.c_str());
|
|
HANDLE_ERROR_RESOURCE(WarningType::InvalidXML, parent, this, rawDataIndex, errorHeader,
|
|
"");
|
|
}
|
|
res->parent = parent;
|
|
res->SetInnerNode(true);
|
|
res->ExtractFromXML(child, childIndex);
|
|
|
|
childIndex += res->GetRawDataSize();
|
|
resList.push_back(res);
|
|
}
|
|
}
|
|
|
|
Declaration* ZArray::DeclareVar(const std::string& prefix, const std::string& bodyStr)
|
|
{
|
|
std::string auxName = name;
|
|
|
|
if (name == "")
|
|
auxName = GetDefaultName(prefix);
|
|
|
|
ZResource* res = resList.at(0);
|
|
Declaration* decl;
|
|
if (res->IsExternalResource())
|
|
{
|
|
auto filepath = Globals::Instance->outputPath / name;
|
|
std::string includePath = StringHelper::Sprintf("%s.%s.inc", filepath.c_str(),
|
|
res->GetExternalExtension().c_str());
|
|
decl = parent->AddDeclarationIncludeArray(rawDataIndex, includePath, GetRawDataSize(),
|
|
GetSourceTypeName(), name, arrayCnt);
|
|
decl->text = bodyStr;
|
|
decl->isExternal = true;
|
|
}
|
|
else
|
|
{
|
|
decl =
|
|
parent->AddDeclarationArray(rawDataIndex, GetDeclarationAlignment(), GetRawDataSize(),
|
|
GetSourceTypeName(), name, arrayCnt, bodyStr);
|
|
}
|
|
|
|
decl->staticConf = staticConf;
|
|
return decl;
|
|
}
|
|
|
|
std::string ZArray::GetBodySourceCode() const
|
|
{
|
|
std::string output;
|
|
|
|
for (size_t i = 0; i < arrayCnt; i++)
|
|
{
|
|
const auto& res = resList[i];
|
|
output += "\t";
|
|
|
|
switch (res->GetResourceType())
|
|
{
|
|
case ZResourceType::Pointer:
|
|
case ZResourceType::Scalar:
|
|
case ZResourceType::Vertex:
|
|
case ZResourceType::CollisionPoly:
|
|
case ZResourceType::SurfaceType:
|
|
output += resList.at(i)->GetBodySourceCode();
|
|
break;
|
|
|
|
default:
|
|
output += StringHelper::Sprintf("{ %s }", resList.at(i)->GetBodySourceCode().c_str());
|
|
break;
|
|
}
|
|
|
|
if (i < arrayCnt - 1 || res->IsExternalResource())
|
|
output += ",\n";
|
|
}
|
|
|
|
return output;
|
|
}
|
|
|
|
size_t ZArray::GetRawDataSize() const
|
|
{
|
|
size_t size = 0;
|
|
for (const auto res : resList)
|
|
size += res->GetRawDataSize();
|
|
return size;
|
|
}
|
|
|
|
std::string ZArray::GetSourceTypeName() const
|
|
{
|
|
return resList.at(0)->GetSourceTypeName();
|
|
}
|
|
|
|
ZResourceType ZArray::GetResourceType() const
|
|
{
|
|
return ZResourceType::Array;
|
|
}
|
|
|
|
DeclarationAlignment ZArray::GetDeclarationAlignment() const
|
|
{
|
|
if (resList.size() == 0)
|
|
{
|
|
return DeclarationAlignment::Align4;
|
|
}
|
|
return resList.at(0)->GetDeclarationAlignment();
|
|
}
|