Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 05:52:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

move metavoxels library to tbb concurrent map

Browse source
This commit is contained in:
Stephen Birarda 2014-11-06 13:44:03 -08:00
parent e92376cf64
commit 948615afe5
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libraries/metavoxels/src/MetavoxelClientManager.cpp
View file

@ -43,24 +43,22 @@ SharedObjectPointer MetavoxelClientManager::findFirstRaySpannerIntersection(cons
SharedObjectPointer closestSpanner; SharedObjectPointer closestSpanner;
float closestDistance = FLT_MAX; float closestDistance = FLT_MAX;
NodeHashSnapshot snapshotHash = NodeList::getInstance()->getNodeHash().snapshot_table(); NodeList::getInstance()->eachNode([&](const SharedNodePointer& node){
for (auto it = snapshotHash.begin(); it != snapshotHash.end(); it++) {
SharedNodePointer node = it->second;
if (node->getType() == NodeType::MetavoxelServer) { if (node->getType() == NodeType::MetavoxelServer) {
QMutexLocker locker(&node->getMutex()); QMutexLocker locker(&node->getMutex());
MetavoxelClient* client = static_cast<MetavoxelClient*>(node->getLinkedData()); MetavoxelClient* client = static_cast<MetavoxelClient*>(node->getLinkedData());
if (client) { if (client) {
float clientDistance; float clientDistance;
SharedObjectPointer clientSpanner = client->getDataCopy().findFirstRaySpannerIntersection( SharedObjectPointer clientSpanner = client->getDataCopy().findFirstRaySpannerIntersection(
origin, direction, attribute, clientDistance); origin, direction, attribute, clientDistance);
if (clientSpanner && clientDistance < closestDistance) { if (clientSpanner && clientDistance < closestDistance) {
closestSpanner = clientSpanner; closestSpanner = clientSpanner;
closestDistance = clientDistance; closestDistance = clientDistance;
} }
} }
} }
} });
if (closestSpanner) { if (closestSpanner) {
distance = closestDistance; distance = closestDistance;
} }
@ -119,11 +117,7 @@ MetavoxelClient* MetavoxelClientManager::createClient(const SharedNodePointer& n
} }
void MetavoxelClientManager::guide(MetavoxelVisitor& visitor) { void MetavoxelClientManager::guide(MetavoxelVisitor& visitor) {
NodeHashSnapshot snapshotHash = NodeList::getInstance()->getNodeHash().snapshot_table(); NodeList::getInstance()->eachNode([&visitor](const SharedNodePointer& node){
for (auto it = snapshotHash.begin(); it != snapshotHash.end(); it++) {
SharedNodePointer node = it->second;
if (node->getType() == NodeType::MetavoxelServer) { if (node->getType() == NodeType::MetavoxelServer) {
QMutexLocker locker(&node->getMutex()); QMutexLocker locker(&node->getMutex());
MetavoxelClient* client = static_cast<MetavoxelClient*>(node->getLinkedData()); MetavoxelClient* client = static_cast<MetavoxelClient*>(node->getLinkedData());
@ -131,7 +125,7 @@ void MetavoxelClientManager::guide(MetavoxelVisitor& visitor) {
client->getDataCopy().guide(visitor); client->getDataCopy().guide(visitor);
} }
} }
} });
} }
MetavoxelUpdater::MetavoxelUpdater(MetavoxelClientManager* clientManager) : MetavoxelUpdater::MetavoxelUpdater(MetavoxelClientManager* clientManager) :