diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2021-05-10 12:25:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-10 12:25:39 -0400 |
| commit | 769f5702a422d14bfb0a60a39319da4b4bf9ec1f (patch) | |
| tree | 11e12a20fb2880792722babdee0b5222ea86504f /ZAPD/ZAnimation.cpp | |
| parent | a357277e412b5e8f0f2f0578c7d7d213e8744c8d (diff) | |
ZRoom refactor (#124)
* Remove redundant methods
* first pass os cleaning
* More cleaning
* Fix compilation errors
* Fix dumb crashes
* Fix dumb issues
* Removing most uses of GenerateSourceCodePass1
* more cleanup
* Move segmentOffset to ZRoomCommand
* Half of ParseRawData
* somehow broken...
* fix broken stuff
* This may or may not be broken
* More cleaning
* Remove GenerateSourceCodePass2
* More cleanup and pointer removal
* Use PolygonType2 in SetMesh
* another small cleanup
* Merge PolygonDlist and PolygonDlist2
* More code merging
* GetDeclarationPtrName
* Remove most repeated externs and a bit of redundant code
* Dumb MM fixes
* small fix
(cherry picked from commit 0813fd69538491c5aceb00d79d19bf59fd082ca7)
* Another dumb fix
* Remove GenerateExterns
* Change DeclareReferences signature
* Refactor SetAnimatedTextureList
* const std::vector<uint8_t>&
* another small bunch of changes
* last parserawdata and declarereferences separation probably
* Move parserawdata
* Remove GenerateSourceCodePass1
* Use macros for commands
* Make ZRoomCommand inherit ZResource
* shrink scenes tluts
* ProcessTextureIntersections
* small output improvements
* Small changes
* run format
* SCENE_CMD -> SCENECMD
* fix merge errors
* run format
* fix some warnings
* update macros names
* Add again different commands for each game ni SCENE_CMD_ROOM_BEHAVIOR
* macro update
* More booleans
* Move declaration to its own file
* minor changes
* Update according to latest reviews in oot
* run format
* Yet another cutscene change
* Remove special scene/room segment code
* This is crashing and I don't know why
* remove includeFilePrefix
* fix merge issues
* always pass a parent to zresource
* move path to its own zclass and properly implement parserawdata in commands
* Fix GetDeclarationPtrName uses
* Some ZPath fixes (still broken tho)
* Fix ZPath declarations
* Fix weird problem
* Add `Path` to the docs
* run format
* clean syotes code
* A bunch of changes for MM
* run format
Diffstat (limited to 'ZAPD/ZAnimation.cpp')
| -rw-r--r-- | ZAPD/ZAnimation.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ZAPD/ZAnimation.cpp b/ZAPD/ZAnimation.cpp index 1270e86..749abd9 100644 --- a/ZAPD/ZAnimation.cpp +++ b/ZAPD/ZAnimation.cpp @@ -239,7 +239,7 @@ std::string TransformData::GetBody(const std::string& prefix) const unk_08); } -size_t TransformData::GetRawDataSize() +size_t TransformData::GetRawDataSize() const { return 0x0C; } @@ -369,9 +369,9 @@ void ZCurveAnimation::PreGenValues(const std::string& prefix) if (transformData != 0) { uint32_t transformDataOffset = Seg2Filespace(transformData, parent->baseAddress); - std::string transformDataStr = - StringHelper::Sprintf("%sCurveAnime_%s_%06X", prefix.c_str(), - TransformData::GetSourceTypeName().c_str(), transformDataOffset); + std::string transformDataStr = StringHelper::Sprintf( + "%sCurveAnime_%s_%06X", prefix.c_str(), + transformDataArr.at(0).GetSourceTypeName().c_str(), transformDataOffset); std::string entryStr = ""; uint16_t arrayItemCnt = transformDataArr.size(); @@ -387,9 +387,9 @@ void ZCurveAnimation::PreGenValues(const std::string& prefix) if (decl == nullptr) { parent->AddDeclarationArray(transformDataOffset, DeclarationAlignment::None, - arrayItemCnt * TransformData::GetRawDataSize(), - TransformData::GetSourceTypeName(), transformDataStr, - arrayItemCnt, entryStr); + arrayItemCnt * transformDataArr.at(0).GetRawDataSize(), + transformDataArr.at(0).GetSourceTypeName(), + transformDataStr, arrayItemCnt, entryStr); } else { @@ -461,9 +461,9 @@ std::string ZCurveAnimation::GetSourceOutputCode(const std::string& prefix) Declaration* decl = parent->GetDeclaration(transformDataOffset); if (decl == nullptr) { - transformDataStr = StringHelper::Sprintf("%sCurveAnime_%s_%06X", prefix.c_str(), - TransformData::GetSourceTypeName().c_str(), - transformDataOffset); + transformDataStr = StringHelper::Sprintf( + "%sCurveAnime_%s_%06X", prefix.c_str(), + transformDataArr.at(0).GetSourceTypeName().c_str(), transformDataOffset); } else { |