Optimizations (#161)
- cache body sim indices and split out fat aabb - deferred restitution - the manifold point normal velocity is only computed for restitution or hit events, otherwise it is zero
This commit is contained in:
parent
f555ee4208
commit
9e5a4cde86
49 changed files with 3395 additions and 864 deletions
|
|
@ -8,6 +8,10 @@
|
|||
|
||||
#include "box3d/box3d.h"
|
||||
|
||||
#include <ctype.h>
|
||||
#include <iterator>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <vector>
|
||||
|
||||
class Crash : public Sample
|
||||
|
|
@ -132,65 +136,164 @@ public:
|
|||
|
||||
static int sampleMultiplePrismatic = RegisterSample( "Issues", "Multiple Prismatic", MultiplePrismatic::Create );
|
||||
|
||||
// bad hull SM_Waterfall_MED_Wide_01
|
||||
static const b3Vec3 waterfallPoints[] = {
|
||||
{ 0.100183107, -498.925385, -1275.39966 }, { 0.100183107, -498.925415, 0.125000000 },
|
||||
{ 0.100183107, 486.343750, 0.125000000 }, { 0.100183107, 486.343719, -1275.39966 },
|
||||
{ -395.117462, 486.343781, -1462.43750 }, { -395.117462, 486.343750, -96.7426758 },
|
||||
{ -395.117462, -498.925415, -96.7424469 }, { -395.117462, -498.925446, -1462.52612 },
|
||||
{ -186.979691, 486.294891, -1462.47949 }, { -298.250000, 486.294891, 0.125000000 },
|
||||
{ -395.121216, 486.294891, -1462.52612 }, { -186.984360, -498.913361, -1462.48413 },
|
||||
{ -298.250000, -498.913361, 0.125000000 },
|
||||
};
|
||||
|
||||
static const b3Vec3 quadPoints[] = {
|
||||
{ 100.000000, -142.292389, 130.826111 }, { 99.5354385, -71.3011093, 130.826111 },
|
||||
{ 99.5930862, -80.1112213, -100.000000 }, { 100.000000, -142.292389, -100.000000 },
|
||||
{ 99.5930862, -80.1112213, 130.826111 },
|
||||
};
|
||||
|
||||
static const b3Vec3 thinBoxPoints[] = {
|
||||
{ -11.3861933, -24.2451687, -12.0037909 }, { -11.3889809, -24.2466526, -11.9013014 },
|
||||
{ -11.3804407, -24.3151531, -12.0046492 }, { -11.3832273, -24.3166409, -11.9021587 },
|
||||
{ -14.4396200, -24.3636723, -12.1324549 }, { -14.4432650, -24.3655701, -12.0299988 },
|
||||
{ -14.4356947, -24.4337788, -12.1336164 }, { -14.4393377, -24.4356804, -12.0311594 },
|
||||
};
|
||||
|
||||
// Inline point sets are scaled from centimeters. A null point array is a file in data/hulls.
|
||||
struct HullSource
|
||||
{
|
||||
const char* name;
|
||||
const b3Vec3* points;
|
||||
int count;
|
||||
float scale;
|
||||
};
|
||||
|
||||
static const HullSource hullSources[] = {
|
||||
{ "waterfall", waterfallPoints, (int)std::size( waterfallPoints ), 0.01f },
|
||||
{ "quad", quadPoints, (int)std::size( quadPoints ), 0.01f },
|
||||
{ "thin box", thinBoxPoints, (int)std::size( thinBoxPoints ), 0.01f },
|
||||
{ "axe.txt", nullptr, 0, 1.0f },
|
||||
};
|
||||
|
||||
static constexpr int hullSourceCount = (int)std::size( hullSources );
|
||||
|
||||
// Reads x, y, z triples separated by commas or whitespace. A C source repro is
|
||||
// also accepted: only the first initializer list is parsed, so counts and other
|
||||
// numbers in the surrounding code are ignored.
|
||||
static bool LoadHullPoints( const char* path, std::vector<b3Vec3>* points )
|
||||
{
|
||||
points->clear();
|
||||
|
||||
FILE* file = fopen( path, "rb" );
|
||||
if ( file == nullptr )
|
||||
{
|
||||
fprintf( stderr, "Failed to open '%s'\n", path );
|
||||
return false;
|
||||
}
|
||||
|
||||
fseek( file, 0, SEEK_END );
|
||||
long size = ftell( file );
|
||||
fseek( file, 0, SEEK_SET );
|
||||
if ( size < 0 )
|
||||
{
|
||||
fprintf( stderr, "Failed to read '%s'\n", path );
|
||||
fclose( file );
|
||||
return false;
|
||||
}
|
||||
|
||||
std::vector<char> text( size + 1 );
|
||||
size_t readCount = fread( text.data(), 1, size, file );
|
||||
fclose( file );
|
||||
text[readCount] = '\0';
|
||||
|
||||
char* begin = text.data();
|
||||
char* end = begin + readCount;
|
||||
for ( char* c = begin; *c != '\0'; ++c )
|
||||
{
|
||||
if ( *c != '{' )
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
char* prev = c - 1;
|
||||
while ( prev >= begin && isspace( (unsigned char)*prev ) )
|
||||
{
|
||||
--prev;
|
||||
}
|
||||
|
||||
if ( prev < begin || *prev != '=' )
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
begin = c + 1;
|
||||
int depth = 1;
|
||||
for ( end = begin; *end != '\0'; ++end )
|
||||
{
|
||||
if ( *end == '{' )
|
||||
{
|
||||
depth += 1;
|
||||
}
|
||||
else if ( *end == '}' && --depth == 0 )
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
*end = '\0';
|
||||
|
||||
std::vector<float> values;
|
||||
char* cursor = begin;
|
||||
while ( *cursor != '\0' )
|
||||
{
|
||||
char* stop;
|
||||
float value = strtof( cursor, &stop );
|
||||
if ( stop == cursor )
|
||||
{
|
||||
cursor += 1;
|
||||
continue;
|
||||
}
|
||||
|
||||
values.push_back( value );
|
||||
cursor = stop;
|
||||
}
|
||||
|
||||
if ( values.size() % 3 != 0 )
|
||||
{
|
||||
fprintf( stderr, "'%s' has %d values, not a multiple of 3\n", path, (int)values.size() );
|
||||
}
|
||||
|
||||
int count = (int)values.size() / 3;
|
||||
points->resize( count );
|
||||
for ( int i = 0; i < count; ++i )
|
||||
{
|
||||
( *points )[i] = { values[3 * i], values[3 * i + 1], values[3 * i + 2] };
|
||||
}
|
||||
|
||||
return count > 0;
|
||||
}
|
||||
|
||||
class HullCrash : public Sample
|
||||
{
|
||||
public:
|
||||
explicit HullCrash( SampleContext* context )
|
||||
: Sample( context )
|
||||
{
|
||||
m_hull = nullptr;
|
||||
m_sourceIndex = 3;
|
||||
m_maxVertexCount = B3_MAX_HULL_VERTICES;
|
||||
|
||||
LoadPoints();
|
||||
CreateHull();
|
||||
|
||||
if ( m_context->restart == false )
|
||||
{
|
||||
m_camera->SetView( 0.0f, 15.0f, 5.0f, b3Pos_zero );
|
||||
FrameView();
|
||||
}
|
||||
|
||||
m_hull = nullptr;
|
||||
|
||||
#if 0
|
||||
// bad hull SM_Waterfall_MED_Wide_01
|
||||
b3Vec3 points[] = {
|
||||
{ 0.100183107, -498.925385, -1275.39966 }, { 0.100183107, -498.925415, 0.125000000 },
|
||||
{ 0.100183107, 486.343750, 0.125000000 }, { 0.100183107, 486.343719, -1275.39966 },
|
||||
{ -395.117462, 486.343781, -1462.43750 }, { -395.117462, 486.343750, -96.7426758 },
|
||||
{ -395.117462, -498.925415, -96.7424469 }, { -395.117462, -498.925446, -1462.52612 },
|
||||
{ -186.979691, 486.294891, -1462.47949 }, { -298.250000, 486.294891, 0.125000000 },
|
||||
{ -395.121216, 486.294891, -1462.52612 }, { -186.984360, -498.913361, -1462.48413 },
|
||||
{ -298.250000, -498.913361, 0.125000000 },
|
||||
};
|
||||
|
||||
#elif 1
|
||||
b3Vec3 points[] = {
|
||||
{ 100.000000, -142.292389, 130.826111 }, { 99.5354385, -71.3011093, 130.826111 },
|
||||
{ 99.5930862, -80.1112213, -100.000000 }, { 100.000000, -142.292389, -100.000000 },
|
||||
{ 99.5930862, -80.1112213, 130.826111 },
|
||||
};
|
||||
#else
|
||||
b3Vec3 points[] = {
|
||||
{ -11.3861933, -24.2451687, -12.0037909 }, { -11.3889809, -24.2466526, -11.9013014 },
|
||||
{ -11.3804407, -24.3151531, -12.0046492 }, { -11.3832273, -24.3166409, -11.9021587 },
|
||||
{ -14.4396200, -24.3636723, -12.1324549 }, { -14.4432650, -24.3655701, -12.0299988 },
|
||||
{ -14.4356947, -24.4337788, -12.1336164 }, { -14.4393377, -24.4356804, -12.0311594 },
|
||||
};
|
||||
#endif
|
||||
|
||||
static_assert( sizeof( points ) / sizeof( points[0] ) < m_capacity, "bad" );
|
||||
|
||||
m_count = sizeof( points ) / sizeof( points[0] );
|
||||
for ( int i = 0; i < m_count; ++i )
|
||||
{
|
||||
m_points[i] = 0.01f * points[i];
|
||||
}
|
||||
|
||||
// This shift shouldn't be necessary but I'm doing it so the hull
|
||||
// appears on the screen.
|
||||
// for ( int i = 0; i < m_count; ++i )
|
||||
//{
|
||||
// m_points[i] -= m_points[0];
|
||||
// m_points[i] *= 0.01f;
|
||||
//}
|
||||
|
||||
m_hull = b3CreateHull( m_points, m_count, m_count );
|
||||
|
||||
(void)m_hull;
|
||||
}
|
||||
|
||||
~HullCrash() override
|
||||
|
|
@ -201,6 +304,94 @@ public:
|
|||
}
|
||||
}
|
||||
|
||||
void LoadPoints()
|
||||
{
|
||||
const HullSource& source = hullSources[m_sourceIndex];
|
||||
if ( source.points != nullptr )
|
||||
{
|
||||
m_points.assign( source.points, source.points + source.count );
|
||||
}
|
||||
else
|
||||
{
|
||||
char path[64];
|
||||
snprintf( path, sizeof( path ), "data/hulls/%s", source.name );
|
||||
LoadHullPoints( path, &m_points );
|
||||
}
|
||||
|
||||
for ( b3Vec3& point : m_points )
|
||||
{
|
||||
point = source.scale * point;
|
||||
}
|
||||
|
||||
// The reported failure used the point count as the limit
|
||||
m_maxVertexCount = b3ClampInt( (int)m_points.size(), 4, B3_MAX_HULL_VERTICES );
|
||||
}
|
||||
|
||||
void CreateHull()
|
||||
{
|
||||
if ( m_hull != nullptr )
|
||||
{
|
||||
b3DestroyHull( m_hull );
|
||||
m_hull = nullptr;
|
||||
}
|
||||
|
||||
int count = (int)m_points.size();
|
||||
if ( count >= 4 )
|
||||
{
|
||||
m_hull = b3CreateHull( m_points.data(), count, m_maxVertexCount );
|
||||
}
|
||||
}
|
||||
|
||||
void FrameView()
|
||||
{
|
||||
if ( m_points.empty() )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
b3AABB bounds = b3MakeAABB( m_points.data(), (int)m_points.size(), 0.0f );
|
||||
float radius = b3Length( b3AABB_Extents( bounds ) );
|
||||
m_camera->SetView( 0.0f, 15.0f, b3MaxFloat( 3.0f * radius, 1.0f ), b3ToPos( b3AABB_Center( bounds ) ) );
|
||||
}
|
||||
|
||||
bool DrawControls() override
|
||||
{
|
||||
DrawTextLine( "points = %d", (int)m_points.size() );
|
||||
|
||||
if ( m_hull != nullptr )
|
||||
{
|
||||
DrawTextLine( "hull: vertices = %d, edges = %d, faces = %d", m_hull->vertexCount, m_hull->edgeCount / 2,
|
||||
m_hull->faceCount );
|
||||
}
|
||||
else
|
||||
{
|
||||
DrawTextLine( "hull creation failed" );
|
||||
}
|
||||
|
||||
if ( ImGui::BeginCombo( "Source", hullSources[m_sourceIndex].name ) )
|
||||
{
|
||||
for ( int i = 0; i < hullSourceCount; ++i )
|
||||
{
|
||||
if ( ImGui::Selectable( hullSources[i].name, i == m_sourceIndex ) )
|
||||
{
|
||||
m_sourceIndex = i;
|
||||
LoadPoints();
|
||||
CreateHull();
|
||||
FrameView();
|
||||
}
|
||||
}
|
||||
|
||||
ImGui::EndCombo();
|
||||
}
|
||||
|
||||
if ( ImGui::SliderInt( "Max Vertices", &m_maxVertexCount, 4, B3_MAX_HULL_VERTICES ) )
|
||||
{
|
||||
CreateHull();
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void Render() override
|
||||
{
|
||||
if ( m_hull != nullptr )
|
||||
|
|
@ -209,9 +400,9 @@ public:
|
|||
}
|
||||
else
|
||||
{
|
||||
for ( int i = 0; i < m_count; ++i )
|
||||
for ( const b3Vec3& point : m_points )
|
||||
{
|
||||
DrawPoint( b3ToPos( m_points[i] ), 5.0f, MakeColor( b3_colorWhite ) );
|
||||
DrawPoint( b3ToPos( point ), 5.0f, MakeColor( b3_colorWhite ) );
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -225,10 +416,10 @@ public:
|
|||
return new HullCrash( sampleContext );
|
||||
}
|
||||
|
||||
static constexpr int m_capacity = 64;
|
||||
std::vector<b3Vec3> m_points;
|
||||
b3HullData* m_hull;
|
||||
b3Vec3 m_points[m_capacity];
|
||||
int m_count;
|
||||
int m_sourceIndex;
|
||||
int m_maxVertexCount;
|
||||
};
|
||||
|
||||
static int sampleHullCrash = RegisterSample( "Issues", "Hull Crash", HullCrash::Create );
|
||||
|
|
@ -1146,6 +1337,7 @@ public:
|
|||
|
||||
static int sampleWheelStack = RegisterSample( "Issues", "GMod Wheel Stack", WheelStack::Create );
|
||||
|
||||
// There was a problem where this bouncing box could gain energy. This has been fixed by the deferred restitution update.
|
||||
class RestitutionOvershoot : public Sample
|
||||
{
|
||||
public:
|
||||
|
|
@ -1176,6 +1368,7 @@ public:
|
|||
b3BodyDef boxDef = b3DefaultBodyDef();
|
||||
boxDef.type = b3_dynamicBody;
|
||||
boxDef.position = { 0.0f, m_dropHeight, 0.0f };
|
||||
boxDef.safetyFactor = 0.1f;
|
||||
m_boxBody = b3CreateBody( m_worldId, &boxDef );
|
||||
|
||||
b3ShapeDef boxShape = b3DefaultShapeDef();
|
||||
|
|
@ -1186,6 +1379,9 @@ public:
|
|||
m_maxBounceY = 0.0f;
|
||||
m_bounced = false;
|
||||
m_failed = false;
|
||||
m_startEnergy = MeasureEnergy( m_worldId, &m_boxBody, 1 ).Total();
|
||||
m_maxEnergy = m_startEnergy;
|
||||
m_energyFailed = false;
|
||||
}
|
||||
|
||||
void Step() override
|
||||
|
|
@ -1221,9 +1417,29 @@ public:
|
|||
b3Pos markerPoint = { 0.0f, m_dropHeight + m_boxHalf, 0.0f };
|
||||
DrawPlane( b3Vec3_axisY, markerPoint, MakeColor( b3_colorYellow ) );
|
||||
|
||||
// Perfect restitution and no friction, so the total energy may only decrease. It is the honest
|
||||
// invariant here: the height check cannot tell a bounce that gained potential energy from one
|
||||
// that converted it into spin, and this drop does both.
|
||||
MechanicalEnergy energy = MeasureEnergy( m_worldId, &m_boxBody, 1 );
|
||||
float total = energy.Total();
|
||||
|
||||
if ( total > m_maxEnergy )
|
||||
{
|
||||
m_maxEnergy = total;
|
||||
}
|
||||
|
||||
if ( m_bounced && total > m_startEnergy * ( 1.0f + m_energyTolerance ) )
|
||||
{
|
||||
m_energyFailed = true;
|
||||
}
|
||||
|
||||
DrawTextLine( "drop height = %.2f m", m_dropHeight );
|
||||
DrawTextLine( "current y = %.2f m", m_currentY );
|
||||
DrawTextLine( "max bounce = %.2f m", m_maxBounceY );
|
||||
DrawTextLine( "kinetic = %.0f J linear + %.0f J angular", energy.linear, energy.angular );
|
||||
DrawTextLine( "potential = %.0f J", energy.potential );
|
||||
DrawTextLine( "total = %.0f J (%.2f%% of start, peak %.2f%%)", total, 100.0f * total / m_startEnergy,
|
||||
100.0f * m_maxEnergy / m_startEnergy );
|
||||
|
||||
if ( m_bounced == false )
|
||||
{
|
||||
|
|
@ -1237,6 +1453,15 @@ public:
|
|||
{
|
||||
DrawTextLine( "PASS: bounce stays at or below drop height" );
|
||||
}
|
||||
|
||||
if ( m_energyFailed )
|
||||
{
|
||||
DrawTextLine( "FAIL: total energy increased" );
|
||||
}
|
||||
else if ( m_bounced )
|
||||
{
|
||||
DrawTextLine( "PASS: total energy did not increase" );
|
||||
}
|
||||
}
|
||||
|
||||
static Sample* Create( SampleContext* context )
|
||||
|
|
@ -1244,11 +1469,16 @@ public:
|
|||
return new RestitutionOvershoot( context );
|
||||
}
|
||||
|
||||
static constexpr float m_energyTolerance = 0.001f;
|
||||
|
||||
b3BodyId m_boxBody = {};
|
||||
float m_currentY = 0.0f;
|
||||
float m_maxBounceY = 0.0f;
|
||||
float m_startEnergy = 0.0f;
|
||||
float m_maxEnergy = 0.0f;
|
||||
bool m_bounced = false;
|
||||
bool m_failed = false;
|
||||
bool m_energyFailed = false;
|
||||
};
|
||||
|
||||
static int sampleRestitutionOvershoot = RegisterSample( "Issues", "Restitution Overshoot", RestitutionOvershoot::Create );
|
||||
|
|
|
|||
Loading…
Reference in a new issue