Skip to content

[WIP] Move BVH_Verbose internally to BVH #232

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
DavidPeicho wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

[WIP] Move BVH_Verbose internally to BVH #232

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
31 changes: 27 additions & 4 deletions tiny_bvh.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,6 +767,13 @@ struct BVHContext
void* userdata = nullptr;
};

struct OptimizerOptions {
uint32_t iterations = 25;
bool extreme = false;
bool mergeLeaves = false;
bool stochastic = false;
};

class BVHBase
{
public:
Expand Down Expand Up @@ -906,6 +913,7 @@ class BVH : public BVHBase
void BuildNEON();
#endif
void Refit( const uint32_t nodeIdx = 0 );
void Optimize( const OptimizerOptions& options );
void Optimize( const uint32_t iterations = 25, bool extreme = false, bool stochastic = false );
uint32_t CombineLeafs( const uint32_t primCount, uint32_t& firstIdx, uint32_t nodeIdx = 0 );
void CombineLeafs( const uint32_t nodeIdx = 0 );
Expand Down Expand Up @@ -964,6 +972,8 @@ class BVH : public BVHBase
// Custom geometry intersection callback
bool (*customIntersect)(Ray&, const unsigned) = 0;
bool (*customIsOccluded)(const Ray&, const unsigned) = 0;

BVH_Verbose* optimizer = 0;
private:
// Atomic counters for threaded builds
std::atomic<uint32_t>* atomicNewNodePtr = 0;
Expand Down Expand Up @@ -1741,6 +1751,7 @@ BVH::~BVH()
AlignedFree( bvhNode );
AlignedFree( primIdx );
AlignedFree( fragment );
if (optimizer) AlignedFree( optimizer );
}

void BVH::Save( const char* fileName )
Expand Down Expand Up @@ -2999,13 +3010,25 @@ void BVH::BuildHQ()
Compact();
}

void BVH::Optimize( const OptimizerOptions& options ) {
if (!optimizer) {
optimizer = new BVH_Verbose();
}
optimizer->ConvertFrom( *this );
optimizer->Optimize( options.iterations, options.extreme, options.stochastic );
if (options.mergeLeaves) optimizer->MergeLeafs();

ConvertFrom( *optimizer );
}

// Optimize: Will happen via BVH_Verbose.
void BVH::Optimize( const uint32_t iterations, bool extreme, bool stochastic )
{
BVH_Verbose* verbose = new BVH_Verbose();
verbose->ConvertFrom( *this );
verbose->Optimize( iterations, extreme, stochastic );
ConvertFrom( *verbose );
OptimizerOptions options;
options.iterations = iterations;
options.extreme = extreme;
options.stochastic = stochastic;
Optimize(options);
}

// Refitting: For animated meshes, where the topology remains intact. This
Expand Down