diff options
| author | Léo Lam <leo@leolam.fr> | 2021-03-20 10:17:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-20 05:17:39 -0400 |
| commit | 4751db5c9ee0a25a26379ca5b44efad72215d256 (patch) | |
| tree | ce49e6e23e352c93424343f75b2e10601457a9c3 /ZAPD/ZTexture.h | |
| parent | 963a282dc10036f367a2cb09bb5651aefc73d2a4 (diff) | |
Add a clang-format config and reformat all source files (#63)
* build: Add genbuildinfo as a dependency for ZAPD object files
* Add a clang-format config and reformat all source files
The existing code style is mostly preserved; this just makes formatting
more consistent and prevents lines from getting too long.
* Fix missing includes
Diffstat (limited to 'ZAPD/ZTexture.h')
| -rw-r--r-- | ZAPD/ZTexture.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ZAPD/ZTexture.h b/ZAPD/ZTexture.h index faf7d68..3b66d08 100644 --- a/ZAPD/ZTexture.h +++ b/ZAPD/ZTexture.h @@ -1,7 +1,7 @@ #pragma once -#include "ZResource.h" #include "HighLevel/HLTexture.h" +#include "ZResource.h" #include "tinyxml2.h" #include <vector> @@ -62,9 +62,12 @@ public: bool isPalette; - static ZTexture* BuildFromXML(tinyxml2::XMLElement* reader, std::string inFolder, bool readFile); - static ZTexture* ExtractFromXML(tinyxml2::XMLElement* reader, std::vector<uint8_t> nRawData, int rawDataIndex, std::string nRelPath); - static ZTexture* FromBinary(TextureType nType, std::vector<uint8_t> nRawData, int rawDataIndex, std::string nName, int nWidth, int nHeight); + static ZTexture* BuildFromXML(tinyxml2::XMLElement* reader, std::string inFolder, + bool readFile); + static ZTexture* ExtractFromXML(tinyxml2::XMLElement* reader, std::vector<uint8_t> nRawData, + int rawDataIndex, std::string nRelPath); + static ZTexture* FromBinary(TextureType nType, std::vector<uint8_t> nRawData, int rawDataIndex, + std::string nName, int nWidth, int nHeight); static ZTexture* FromPNG(std::string pngFilePath, TextureType texType); static ZTexture* FromHLTexture(HLTexture* hlTex); static TextureType GetTextureTypeFromString(std::string str); |