Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 16:55:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added merged flag to Spanner.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-11-10 11:44:42 -08:00
parent 9a14e46c78
commit 536d6287bd
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/metavoxels/src/MetavoxelData.cpp
View file

@ -1806,7 +1806,8 @@ const float DEFAULT_VOXELIZATION_GRANULARITY = powf(2.0f, -3.0f);
Spanner::Spanner() :
_renderer(NULL),
_placementGranularity(DEFAULT_PLACEMENT_GRANULARITY),
_voxelizationGranularity(DEFAULT_VOXELIZATION_GRANULARITY) {
_voxelizationGranularity(DEFAULT_VOXELIZATION_GRANULARITY),
_merged(false) {
}
void Spanner::setBounds(const Box& bounds) {

4
libraries/metavoxels/src/MetavoxelData.h
View file

@ -549,6 +549,9 @@ public:
void setVoxelizationGranularity(float granularity) { _voxelizationGranularity = granularity; }
float getVoxelizationGranularity() const { return _voxelizationGranularity; }
void setMerged(bool merged) { _merged = merged; }
bool isMerged() const { return _merged; }
/// Checks whether we've visited this object on the current traversal. If we have, returns false.
/// If we haven't, sets the last visit identifier and returns true.
bool testAndSetVisited(int visit);
@ -597,6 +600,7 @@ private:
Box _bounds;
float _placementGranularity;
float _voxelizationGranularity;
bool _merged;
QHash<QThread*, int> _lastVisits; ///< last visit identifiers for each thread
QMutex _lastVisitsMutex;