Fixes 02 (#31)

Fixes for #29 and #30
This commit is contained in:
Erin Catto 2026-07-02 00:34:04 -07:00 • committed by GitHub
commit 29bf523ce7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 113 additions and 91 deletions

View file

@ -194,6 +194,12 @@ target_include_directories(samples PRIVATE
# benchmark/determinism helpers the samples lean on.
target_link_libraries(samples PRIVATE gfx shared imgui implot sokol nfd)
# MSVC auto-links winmm via a #pragma comment in main.cpp. MinGW ignores that
# pragma, so link the timeBeginPeriod/timeEndPeriod library explicitly.
if (MINGW)
target_link_libraries(samples PRIVATE winmm)
endif()
set_target_properties(samples PROPERTIES
CXX_STANDARD 20
CXX_STANDARD_REQUIRED ON

View file

@ -78,28 +78,12 @@ public:
m_height = 0;
m_tree = {};
m_aabbMinX = nullptr;
m_aabbMinY = nullptr;
m_aabbMinZ = nullptr;
m_aabbMaxX = nullptr;
m_aabbMaxY = nullptr;
m_aabbMaxZ = nullptr;
CreateTree();
}
~TreeBenchmark() override
{
b3DynamicTree_Destroy( &m_tree );
#ifdef _WIN32
_aligned_free( m_aabbMinX );
_aligned_free( m_aabbMinY );
_aligned_free( m_aabbMinZ );
_aligned_free( m_aabbMaxX );
_aligned_free( m_aabbMaxY );
_aligned_free( m_aabbMaxZ );
#endif
}
// Breath-first search to compute node depth values start with 0 at the root.
@ -155,15 +139,6 @@ public:
m_proxies.clear();
#ifdef _WIN32
_aligned_free( m_aabbMinX );
_aligned_free( m_aabbMinY );
_aligned_free( m_aabbMinZ );
_aligned_free( m_aabbMaxX );
_aligned_free( m_aabbMaxY );
_aligned_free( m_aabbMaxZ );
#endif
m_tree = b3DynamicTree_Create( 512 );
char filePath[64] = {};
@ -242,29 +217,6 @@ public:
// }
}
#ifdef _WIN32
int proxyCount = m_proxies.size();
m_aabbMinX = (float*)_aligned_malloc( proxyCount * sizeof( float ), 32 );
m_aabbMinY = (float*)_aligned_malloc( proxyCount * sizeof( float ), 32 );
m_aabbMinZ = (float*)_aligned_malloc( proxyCount * sizeof( float ), 32 );
m_aabbMaxX = (float*)_aligned_malloc( proxyCount * sizeof( float ), 32 );
m_aabbMaxY = (float*)_aligned_malloc( proxyCount * sizeof( float ), 32 );
m_aabbMaxZ = (float*)_aligned_malloc( proxyCount * sizeof( float ), 32 );
for ( int i = 0; i < proxyCount; ++i )
{
b3Vec3 lb = m_proxies[i].aabb.lowerBound;
b3Vec3 ub = m_proxies[i].aabb.upperBound;
m_aabbMinX[i] = lb.x;
m_aabbMinY[i] = lb.y;
m_aabbMinZ[i] = lb.z;
m_aabbMaxX[i] = ub.x;
m_aabbMaxY[i] = ub.y;
m_aabbMaxZ[i] = ub.z;
}
#endif
printf( "max index = %d\n", maxAreaIndex );
// constexpr int n = m_isDebug ? 1000 : INT_MAX;
@ -299,15 +251,6 @@ public:
m_proxies.clear();
#ifdef _WIN32
_aligned_free( m_aabbMinX );
_aligned_free( m_aabbMinY );
_aligned_free( m_aabbMinZ );
_aligned_free( m_aabbMaxX );
_aligned_free( m_aabbMaxY );
_aligned_free( m_aabbMaxZ );
#endif
{
//bool zUp = true;
m_tree = b3DynamicTree_Load( m_saveFileName, m_loadScale );
@ -344,29 +287,6 @@ public:
m_proxies[node->userData] = proxy;
}
#ifdef _WIN32
int proxyCount = m_proxies.size();
m_aabbMinX = (float*)_aligned_malloc( proxyCount * sizeof( float ), 32 );
m_aabbMinY = (float*)_aligned_malloc( proxyCount * sizeof( float ), 32 );
m_aabbMinZ = (float*)_aligned_malloc( proxyCount * sizeof( float ), 32 );
m_aabbMaxX = (float*)_aligned_malloc( proxyCount * sizeof( float ), 32 );
m_aabbMaxY = (float*)_aligned_malloc( proxyCount * sizeof( float ), 32 );
m_aabbMaxZ = (float*)_aligned_malloc( proxyCount * sizeof( float ), 32 );
for ( int i = 0; i < proxyCount; ++i )
{
b3Vec3 lb = m_proxies[i].aabb.lowerBound;
b3Vec3 ub = m_proxies[i].aabb.upperBound;
m_aabbMinX[i] = lb.x;
m_aabbMinY[i] = lb.y;
m_aabbMinZ[i] = lb.z;
m_aabbMaxX[i] = ub.x;
m_aabbMaxY[i] = ub.y;
m_aabbMaxZ[i] = ub.z;
}
#endif
printf( "max index = %d\n", maxAreaIndex );
// constexpr int n = m_isDebug ? 1000 : INT_MAX;
@ -676,13 +596,6 @@ public:
FileConfig m_config[m_fileCount];
int m_fileIndex;
float* m_aabbMinX;
float* m_aabbMinY;
float* m_aabbMinZ;
float* m_aabbMaxX;
float* m_aabbMaxY;
float* m_aabbMaxZ;
std::unordered_map<uint64_t, Proxy> m_proxies;
std::vector<uint16_t> m_depths;
b3DynamicTree m_tree;