diff --git a/src/recording.c b/src/recording.c index d669813..4e98b3c 100644 --- a/src/recording.c +++ b/src/recording.c @@ -1180,7 +1180,7 @@ uint32_t b3RecInternCompound( b3Recording* rec, const b3CompoundData* compound ) memcpy( bytes, compound, (size_t)byteCount ); // Null the tree node pointer in the copy so the canonical bytes are pointer-free. // b3ConvertBytesToCompound fixes it back on load via nodeOffset. - ( (b3CompoundData*)bytes )->tree.nodes = NULL; + b3ConvertCompoundToBytes( (b3CompoundData*)bytes ); uint64_t h = b3Hash64NonZero( bytes, byteCount ); return b3InternGeometry( &rec->registry, b3_geometryCompound, h, bytes, byteCount ); } diff --git a/src/recording_replay.c b/src/recording_replay.c index 9c0247c..a016351 100644 --- a/src/recording_replay.c +++ b/src/recording_replay.c @@ -2620,7 +2620,12 @@ static void b3RecSeedKeyframeRegistry( b3RecPlayer* player ) { memcpy( copy, slot->bytes, (size_t)slot->byteCount ); } - uint64_t h = b3Hash64NonZero( slot->bytes, slot->byteCount ); + if ( slot->kind == b3_geometryCompound ) + { + // Null the pointers in the compound + b3ConvertCompoundToBytes( (b3CompoundData*)copy ); + } + uint64_t h = b3Hash64NonZero( copy, slot->byteCount ); uint32_t id = b3AppendGeometry( reg, slot->kind, h, copy, slot->byteCount ); // Seeding in order without dedup keeps id == slot index. B3_ASSERT( id == (uint32_t)i ); diff --git a/test/test_recording.c b/test/test_recording.c index 0f0e3a6..0fef532 100644 --- a/test/test_recording.c +++ b/test/test_recording.c @@ -1645,6 +1645,10 @@ static int AllOps( void ) b3RecPlayer* player = b3CreatePlayer( recData, recSize, 1 ); ENSURE( player != NULL ); + // Capture keyframes while every geometry kind is live. The default interval is longer + // than this recording. + b3RecPlayer_SetKeyframePolicy( player, b3RecPlayer_GetKeyframeBudget( player ), 4 ); + b3RecPlayerInfo info = b3RecPlayer_GetInfo( player ); b3Vec3 recExtents = b3Sub( info.bounds.upperBound, info.bounds.lowerBound ); ENSURE( recExtents.x > 0.0f && recExtents.y > 0.0f );