Skip to content
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

Jump to bottom

Fix node height handling in dynamic_tree.c #844

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+2 −8
Open

Fix node height handling in dynamic_tree.c #844

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
10 changes: 2 additions & 8 deletions src/dynamic_tree.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,7 +846,7 @@ float b2DynamicTree_GetAreaRatio( const b2DynamicTree* tree )
for ( int32_t i = 0; i < tree->nodeCapacity; ++i )
{
const b2TreeNode* node = tree->nodes + i;
if ( node->height < 0 || b2IsLeaf( node ) || i == tree->root )
if ( b2IsLeaf( node ) || i == tree->root )
{
// Free node in pool
continue;
Expand Down Expand Up @@ -1008,7 +1008,7 @@ int32_t b2DynamicTree_GetMaxBalance( const b2DynamicTree* tree )

int child1 = node->child1;
int child2 = node->child2;
int balance = b2AbsInt( tree->nodes[child2].height - tree->nodes[child1].height );
int balance = b2AbsInt( (int)tree->nodes[child2].height - (int)tree->nodes[child1].height );
maxBalance = b2MaxInt( maxBalance, balance );
}

Expand All @@ -1023,12 +1023,6 @@ void b2DynamicTree_RebuildBottomUp( b2DynamicTree* tree )
// Build array of leaves. Free the rest.
for ( int i = 0; i < tree->nodeCapacity; ++i )
{
if ( tree->nodes[i].height < 0 )
{
// free node in pool
continue;
}

if ( b2IsLeaf( tree->nodes + i ) )
{
tree->nodes[i].parent = B2_NULL_INDEX;
Expand Down