diff options
| author | EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> | 2021-09-13 18:19:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-13 13:19:34 -0400 |
| commit | 3c00dcb30f33b763e215aebfa8ebdf96a8c3ee4d (patch) | |
| tree | c397a7442330e580a827854f1421e8ce97a8dbdb /ZAPD/ZDisplayList.cpp | |
| parent | 4d051c0fa036d245027a211bc7fd6a4afdce207f (diff) | |
Texture Animation extraction from objects (#180)
* Initial files
* Add resource header, first go at ExtractFromXML
* Now prints plenty to terminal, but not to file
* Main array now declared in file
* Erroring, but need to checkout master to test
* Not erroring any more, hooray
* TextureScrollingParams working, missing pointer
* Scrolling works
* Cycling params should work completely now
* Type 2 works, type 4 crashes
* Fixed iterator bound, works for Type 4 too now
* Correct a couple more EnvColor things
* Add null checks to declarations
* Switch to Seg2Offset, make TextureAnimationEntry an ordinary struct, delete some obsolete functions
* Remove Unknown (throws exception at construction instead)
* Move GetResourceType down
* Begin rewrite of SetAnimatedMaterialList
* Remove old structs in SetAnimatedMaterialList
* Fix infinite loop
* Tested and working for MM, objects and scenes
* Add warnings for undeclared textures (MM OK)
* Make `__PRETTY_FUNCTION__` work on GCC/Clang, at least
* Remove address from GetDefault name, add fancy errors
* Format (also added some extensive documentation last time)
* More formatting
* Fiddle with errors a bit more
* Fix pointer offsets and alignment
* Format, add comment to SetAnimatedMaterialList
* Add to docs
* Review
* Add [[maybe_unused]]
* uint to get rid of warnings
* makefile
* Fix most warnings
* Add default to shut GCC up
* Format
Diffstat (limited to 'ZAPD/ZDisplayList.cpp')
| -rw-r--r-- | ZAPD/ZDisplayList.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ZAPD/ZDisplayList.cpp b/ZAPD/ZDisplayList.cpp index 2f2e2d7..d8f278f 100644 --- a/ZAPD/ZDisplayList.cpp +++ b/ZAPD/ZDisplayList.cpp @@ -2037,10 +2037,10 @@ void ZDisplayList::TextureGenCheck(std::string prefix) } } -bool ZDisplayList::TextureGenCheck(ZFile* parent, [[maybe_unused]] std::string prefix, int32_t texWidth, - int32_t texHeight, uint32_t texAddr, uint32_t texSeg, - F3DZEXTexFormats texFmt, F3DZEXTexSizes texSiz, bool texLoaded, - bool texIsPalette, ZDisplayList* self) +bool ZDisplayList::TextureGenCheck(ZFile* parent, [[maybe_unused]] std::string prefix, + int32_t texWidth, int32_t texHeight, uint32_t texAddr, + uint32_t texSeg, F3DZEXTexFormats texFmt, F3DZEXTexSizes texSiz, + bool texLoaded, bool texIsPalette, ZDisplayList* self) { int32_t segmentNumber = GETSEGNUM(texSeg); |