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

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

16
tools/ZAPD/ZAPD/ZTexture.h
View file

@ -29,7 +29,7 @@ protected:
uint8_t* bmpRgb;
uint8_t* bmpRgba;
virtual void ParseXML(tinyxml2::XMLElement* reader);
void ParseXML(tinyxml2::XMLElement* reader) override;
void FixRawData();
void PrepareBitmap();
void PrepareBitmapRGBA16();
@ -52,9 +52,9 @@ protected:
void PrepareRawDataPalette4(std::string palPath);
void PrepareRawDataPalette8(std::string palPath);
float GetPixelMultiplyer();
bool IsExternalResource();
ZResourceType GetResourceType();
void CalcHash();
bool IsExternalResource() override;
ZResourceType GetResourceType() override;
void CalcHash() override;
public:
ZTexture();
@ -72,8 +72,8 @@ public:
std::string GetSourceOutputCode(const std::string& prefix) override;
std::string GetSourceOutputHeader(const std::string& prefix) override;
std::vector<uint8_t> GetRawData();
int GetRawDataSize();
std::vector<uint8_t> GetRawData() override;
int GetRawDataSize() override;
std::string GetIMFmtFromType();
std::string GetIMSizFromType();
int GetWidth();
@ -81,6 +81,6 @@ public:
void SetWidth(int nWidth);
void SetHeight(int nHeight);
TextureType GetTextureType();
void Save(const std::string& outFolder);
std::string GetExternalExtension();
void Save(const std::string& outFolder) override;
std::string GetExternalExtension() override;
};