mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-04 10:40:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Enable iteration over ChunkNodes, not just Chunks

Browse Source
This commit is contained in:
Erik Broberg
2016-06-14 22:05:03 -04:00
parent 454e19dd83
commit ad73cb0627
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/globebrowsing/chunk/chunknode.cpp
View File

@@ -98,8 +98,8 @@ bool ChunkNode::updateChunkTree(const RenderData& data) {
}
}
void ChunkNode::depthFirst(const std::function<void(const Chunk&)>& f) const {
f(_chunk);
void ChunkNode::depthFirst(const std::function<void(const ChunkNode&)>& f) const {
f(*this);
if (!isLeaf()) {
for (int i = 0; i < 4; ++i) {
_children[i]->depthFirst(f);
@@ -182,6 +182,10 @@ const ChunkNode& ChunkNode::getChild(Quad quad) const {
return *_children[quad];
}
const Chunk& ChunkNode::getChunk() const {
return _chunk;
}
} // namespace openspace

5
modules/globebrowsing/chunk/chunknode.h
View File

@@ -62,13 +62,12 @@ public:
bool isRoot() const;
bool isLeaf() const;
void depthFirst(const std::function<void(const Chunk&)>& f) const;
void depthFirst(const std::function<void(const ChunkNode&)>& f) const;
const ChunkNode& getChild(Quad quad) const;
const Chunk& getChunk() const;
void renderDepthFirst(const RenderData& data);
void renderReversedBreadthFirst(const RenderData& data);
void renderThisChunk(const RenderData& data);
bool updateChunkTree(const RenderData& data);