Skip to content

bugfix(htree): Handle null parent pivots and correct animation data indexing #444

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
seer-by-sentry wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −2
Open

bugfix(htree): Handle null parent pivots and correct animation data indexing #444

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions Core/Libraries/Source/WWVegas/WW3D2/htree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,10 +643,15 @@ void HTreeClass::Anim_Update_Without_Interpolation(const Matrix3D & root,HRawAni
endpivot=pivot+(NumPivots-1);
lastAnimPivot = &Pivot[num_anim_pivots];

for (int piv_idx=1; pivot < endpivot; pivot++,nodeMotion++) {
for (int piv_idx=1; pivot < endpivot; pivot++) {

// base pose
assert(pivot->Parent != nullptr);
if (pivot->Parent == nullptr)
{
if (pivot < lastAnimPivot)
nodeMotion++;
continue;
}
Matrix3D::Multiply(pivot->Parent->Transform, pivot->BaseTransform, &(pivot->Transform));

// Don't update this pivot if the HTree doesn't have animation data for it...
Expand Down Expand Up @@ -683,6 +688,8 @@ void HTreeClass::Anim_Update_Without_Interpolation(const Matrix3D & root,HRawAni
pivot->IsVisible=(nodeMotion->Vis->Get_Bit(iframe) == 1);
else
pivot->IsVisible=1;

nodeMotion++;
}

if (pivot->Is_Captured())
Expand Down
Loading