sweep(until=, max=)

Author: aothms

collapse.h

@@ -6,6 +6,7 @@
 class collapse {
 public:
 	abstract_voxel_storage* until = nullptr;
+	boost::optional<int> max_depth;
 
 	regular_voxel_storage* operator()(abstract_voxel_storage* storage, int dx, int dy, int dz) {
 		int d[3] = { dx, dy, dz };
@@ -56,6 +57,7 @@ class collapse {
 class collapse_count {
 public:
 	abstract_voxel_storage* until = nullptr;
+	boost::optional<int> max_depth;
 
 	regular_voxel_storage* operator()(abstract_voxel_storage* storage, int dx, int dy, int dz) {
 		int d[3] = { dx, dy, dz };

shift.h

@@ -6,6 +6,7 @@
 class shift {
 public:
 	abstract_voxel_storage* until = nullptr;
+	boost::optional<int> max_depth;
 
 	regular_voxel_storage* operator()(abstract_voxel_storage* storage, int dx, int dy, int dz) {
 		regular_voxel_storage* shifted = (regular_voxel_storage*)storage->empty_copy();

sweep.h

@@ -6,6 +6,7 @@
 class sweep {
 public:
 	abstract_voxel_storage* until = nullptr;
+	boost::optional<int> max_depth;
 
 	regular_voxel_storage* operator()(abstract_voxel_storage* storage, int dx, int dy, int dz) {
 		int d[3] = { dx, dy, dz };
@@ -49,15 +50,19 @@ class sweep {
 						ijk2.get(D)--;
 					}
 
+					if (!((ijk2 >= zero).all() && (ijk2 < extents).all())) {
+						break;
+					}
+
 					if (until) {
 						if (until->Get(ijk2.as<size_t>())) {
 							break;
 						}
 					}
+					
+					swepts->Set(ijk2.as<size_t>());
 
-					if ((ijk2 >= zero).all() && (ijk2 < extents).all()) {
-						swepts->Set(ijk2.as<size_t>());
-					} else {
+					if (max_depth && i >= *max_depth) {
 						break;
 					}
 

voxec.h

@@ -1418,7 +1418,7 @@ template <typename T>
 class op_geom : public voxel_operation {
 public:
 	const std::vector<argument_spec>& arg_names() const {
-		static std::vector<argument_spec> nm_ = { { true, "input", "voxels" }, { true, "dx", "integer|real" },{ true, "dy", "integer|real" },{ true, "dz", "integer|real" }, { false, "until", "voxels" } };
+		static std::vector<argument_spec> nm_ = { { true, "input", "voxels" }, { true, "dx", "integer|real" },{ true, "dy", "integer|real" },{ true, "dz", "integer|real" }, { false, "until", "voxels" }, { false, "max", "integer" } };
 		return nm_;
 	}
 	symbol_value invoke(const scope_map& scope) const {
@@ -1433,8 +1433,14 @@ class op_geom : public voxel_operation {
 			until = scope.get_value<abstract_voxel_storage*>("until");
 		} catch (scope_map::not_in_scope&) { }
 
+		boost::optional<int> max_depth;
+		try {
+			max_depth = scope.get_value<int>("max");
+		} catch (scope_map::not_in_scope&) {}
+
 		T s;
 		s.until = until;
+		s.max_depth = max_depth;
 		return s(voxels, dx, dy, dz);
 	}
 };