Removed hardcoded skeleton types in actor draw code.#2979
Removed hardcoded skeleton types in actor draw code.#2979garrettjoecox merged 7 commits intoHarbourMasters:developfrom
Conversation
a0fd424 to
6439e35
Compare
|
To add more context, this PR is necessary to fix some issues when Custom assets are used over some NPC/Objects that would try to link themselves |
|
Considering the scope of the changes in this PR, do we need to organize a testing effort for this? I assume it's good to test this without replaced models as well considering it touches a lot of the vanilla skeleton code as well? Seems like it's also out of date currently though, so it'll need to be updated to latest develop before any testing can be done. |
briaguya0
left a comment
There was a problem hiding this comment.
LGTM. left one comment and one question, but nothing that should stop merging. 
| void SkelAnime_DrawOpa(PlayState* play, void** skeleton, Vec3s* jointTable, | ||
| OverrideLimbDrawOpa overrideLimbDraw, PostLimbDrawOpa postLimbDraw, void* arg); | ||
| void SkelAnime_DrawFlexOpa(PlayState* play, void** skeleton, Vec3s* jointTable, s32 dListCount, |
There was a problem hiding this comment.
could these be moved out of functions.h now that SkelAnime_DrawSkeletonOpa exists/is being used everywhere? it seems that would mean we shouldn't need to reference those outside of z_skelanime.c anymore.
| if (newSkel != nullptr) { | ||
| skel.skelAnime->skeleton = newSkel->skeletonData.skeletonHeader.segment; | ||
| uintptr_t skelPtr = (uintptr_t)newSkel->GetPointer(); | ||
| memcpy(&skel.skelAnime->skeletonHeader, &skelPtr, sizeof(uintptr_t)); // Dumb thing that needs to be done because cast is not cooperating |
There was a problem hiding this comment.
cast is not cooperating
curious as to what that means
There was a problem hiding this comment.
It's been a good while so I don't remember the specifics, but I believe trying to write that value like normal resulted in some compile-time error.
This allows custom models to use whatever skeleton type they wish regardless of what the original actor used.
Build Artifacts