From 65f379930f533890b4e2ec5e3446b9343304ed29 Mon Sep 17 00:00:00 2001 From: Maddie Busig Date: Sun, 11 May 2025 08:54:26 -0700 Subject: [PATCH] Modify generate_axiom to use generate_group helper --- src/fractal.cpp | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/src/fractal.cpp b/src/fractal.cpp index 6626bec..4e31ac1 100644 --- a/src/fractal.cpp +++ b/src/fractal.cpp @@ -226,26 +226,10 @@ void generator_t::clear_all_buffers() { } bool generator_t::generate_axiom(etl::ivector& out_markers) { - const group_output_t& axiom_output = m_group_outputs[m_axiom]; + vec2 init_pos(0, 0); + mat<2, 2> init_orient = create_rotation(1, 0); - if (m_leafs_cur->capacity() < axiom_output.m_child_leafs.size() || - m_wleafs_cur->capacity() < axiom_output.m_child_wleafs.size() || - out_markers.capacity() < axiom_output.m_child_markers.size()) { - mlog::debug << "Reached limit" << endl; - return false; - } - - for (const leaf_t& leaf : axiom_output.m_child_leafs) { - m_leafs_cur->push_back(leaf); - } - for (const weighted_leaf_t& wleaf : axiom_output.m_child_wleafs) { - m_wleafs_cur->push_back(wleaf); - } - for (const marker_t& mark : axiom_output.m_child_markers) { - out_markers.push_back(mark); - } - - return true; + return generate_group(m_axiom, init_pos, init_orient, out_markers); } bool generator_t::generate_group(group_id_t gid, vec2 pos, mat<2, 2> orient, etl::ivector& out_markers) {