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

update MetavoxelSystem.cpp to new tbb node iteration

Browse source
This commit is contained in:
Stephen Birarda 2014-11-06 15:18:56 -08:00
parent 455cbac8a5
commit aa7e995672
1 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
interface/src/MetavoxelSystem.cpp
View file

@ -163,12 +163,7 @@ void MetavoxelSystem::render() {
} }
void MetavoxelSystem::refreshVoxelData() { void MetavoxelSystem::refreshVoxelData() {
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());
MetavoxelSystemClient* client = static_cast<MetavoxelSystemClient*>(node->getLinkedData()); MetavoxelSystemClient* client = static_cast<MetavoxelSystemClient*>(node->getLinkedData());
@ -176,7 +171,7 @@ void MetavoxelSystem::refreshVoxelData() {
QMetaObject::invokeMethod(client, "refreshVoxelData"); QMetaObject::invokeMethod(client, "refreshVoxelData");
} }
} }
} });
} }
class RayHeightfieldIntersectionVisitor : public RayIntersectionVisitor { class RayHeightfieldIntersectionVisitor : public RayIntersectionVisitor {
@ -690,11 +685,7 @@ MetavoxelClient* MetavoxelSystem::createClient(const SharedNodePointer& node) {
} }
void MetavoxelSystem::guideToAugmented(MetavoxelVisitor& visitor, bool render) { void MetavoxelSystem::guideToAugmented(MetavoxelVisitor& visitor, bool render) {
NodeHashSnapshot snapshotHash = NodeList::getInstance()->getNodeHash().snapshot_table(); NodeList::getInstance()->eachNode([&visitor, &render](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());
MetavoxelSystemClient* client = static_cast<MetavoxelSystemClient*>(node->getLinkedData()); MetavoxelSystemClient* client = static_cast<MetavoxelSystemClient*>(node->getLinkedData());
@ -708,7 +699,7 @@ void MetavoxelSystem::guideToAugmented(MetavoxelVisitor& visitor, bool render) {
} }
} }
} }
} });
} }
Throttle::Throttle() : Throttle::Throttle() :