From 154deccbc65c8c802a3276229c561e2b14c664e9 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Wed, 29 Jan 2014 11:14:10 -0800 Subject: [PATCH] Pass in the starting minimum/size. --- libraries/metavoxels/src/MetavoxelData.cpp | 5 ++--- libraries/metavoxels/src/MetavoxelData.h | 4 +++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libraries/metavoxels/src/MetavoxelData.cpp b/libraries/metavoxels/src/MetavoxelData.cpp index df59206b6b..66bba15de2 100644 --- a/libraries/metavoxels/src/MetavoxelData.cpp +++ b/libraries/metavoxels/src/MetavoxelData.cpp @@ -29,13 +29,12 @@ MetavoxelData& MetavoxelData::operator=(const MetavoxelData& other) { return *this; } -void MetavoxelData::guide(MetavoxelVisitor& visitor) { +void MetavoxelData::guide(MetavoxelVisitor& visitor, const glm::vec3& minimum, float size) { // start with the root values/defaults (plus the guide attribute) - const float TOP_LEVEL_SIZE = 1.0f; const QVector& inputs = visitor.getInputs(); const QVector& outputs = visitor.getOutputs(); MetavoxelVisitation firstVisitation = { NULL, visitor, QVector(inputs.size() + 1), - QVector(outputs.size()), { glm::vec3(), TOP_LEVEL_SIZE, + QVector(outputs.size()), { minimum, size, QVector(inputs.size() + 1), QVector(outputs.size()) } }; for (int i = 0; i < inputs.size(); i++) { MetavoxelNode* node = _roots.value(inputs.at(i)); diff --git a/libraries/metavoxels/src/MetavoxelData.h b/libraries/metavoxels/src/MetavoxelData.h index 83821e47ad..60ee4e7634 100644 --- a/libraries/metavoxels/src/MetavoxelData.h +++ b/libraries/metavoxels/src/MetavoxelData.h @@ -37,7 +37,9 @@ public: MetavoxelData& operator=(const MetavoxelData& other); /// Applies the specified visitor to the contained voxels. - void guide(MetavoxelVisitor& visitor); + /// \param minimum the top-level minimum + /// \param size the top-level size + void guide(MetavoxelVisitor& visitor, const glm::vec3& minimum = glm::vec3(), float size = 1.0f); void read(Bitstream& in); void write(Bitstream& out) const;