1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-14 11:00:41 +00:00

git subrepo pull --force tools/ZAPD (#653)

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "2e1174063"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "2e1174063"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"
This commit is contained in:
fig02 2021-01-22 16:25:08 -05:00 committed by GitHub
parent d739765031
commit 588de66d06
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
32 changed files with 405 additions and 65 deletions

View file

@ -25,8 +25,8 @@ struct ZLimbStandard : public ZResource
ZLimbStandard();
static ZLimbStandard* FromXML(tinyxml2::XMLElement* reader, std::vector<uint8_t> nRawData, int rawDataIndex, std::string nRelPath, ZFile* parent);
static ZLimbStandard* FromRawData(std::vector<uint8_t> nRawData, int rawDataIndex);
std::string GetSourceOutputCode(const std::string& prefix);
virtual int GetRawDataSize();
std::string GetSourceOutputCode(const std::string& prefix) override;
int GetRawDataSize() override;
};
struct ZLimbLOD : ZLimbStandard
@ -36,8 +36,8 @@ struct ZLimbLOD : ZLimbStandard
ZLimbLOD();
//static ZLimbLOD* FromXML(tinyxml2::XMLElement* reader, std::vector<uint8_t> nRawData, int rawDataIndex, std::string nRelPath, ZFile* parent);
static ZLimbLOD* FromRawData(std::vector<uint8_t> nRawData, int rawDataIndex);
std::string GetSourceOutputCode(const std::string& prefix);
virtual int GetRawDataSize();
std::string GetSourceOutputCode(const std::string& prefix) override;
int GetRawDataSize() override;
};
enum ZSkeletonType
@ -58,7 +58,8 @@ public:
ZSkeleton();
virtual void GenerateHLIntermediette(HLFileIntermediette& hlFile);
static ZSkeleton* FromXML(tinyxml2::XMLElement* reader, std::vector<uint8_t> nRawData, int rawDataIndex, std::string nRelPath, ZFile* nParent);
void Save(const std::string& outFolder);
void Save(const std::string& outFolder) override;
ZResourceType GetResourceType() override;
std::string GetSourceOutputCode(const std::string& prefix);
std::string GetSourceOutputCode(const std::string& prefix) override;
};