diff --git a/inc/canvas/Tree.hpp b/inc/canvas/Tree.hpp index bc4942c..f59fe96 100644 --- a/inc/canvas/Tree.hpp +++ b/inc/canvas/Tree.hpp @@ -40,4 +40,5 @@ private: inline int get_start_size(DrawArgs &arg); inline int get_end_size(DrawArgs &arg, int start); inline float get_lenght(DrawArgs &arg); + inline float get_angle_var(DrawArgs &arg); }; \ No newline at end of file diff --git a/inc/values/Dna.hpp b/inc/values/Dna.hpp index 6e7154b..23185b1 100644 --- a/inc/values/Dna.hpp +++ b/inc/values/Dna.hpp @@ -7,6 +7,8 @@ #include #define MAX_DEPTH 8 +#define MAX_POSIBLE_DEPTH 11 +static_assert(MAX_DEPTH <= MAX_POSIBLE_DEPTH); struct uint128 { diff --git a/src/canvas/Tree.cpp b/src/canvas/Tree.cpp index 0bd2f8a..db291d6 100644 --- a/src/canvas/Tree.cpp +++ b/src/canvas/Tree.cpp @@ -22,9 +22,13 @@ constexpr int min_size_var = -5; constexpr int max_size_chnage = 5; constexpr int min_size_change = -5; constexpr int sizes[] = {2, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20}; +static_assert(sizeof(sizes) / sizeof(int) == MAX_POSIBLE_DEPTH); float lengths[MAX_DEPTH]; +constexpr float max_angles[] = {5.0f, 5.0f, 5.0f, 10.0f, 10.0f, 10.0f, 15.0f, 15.0f, 20.0f, 20.0f, 20.0f}; +static_assert(sizeof(max_angles) / sizeof(float) == MAX_POSIBLE_DEPTH); + void calculateLevels(int canvasSize) { lengths[0] = canvasSize / 4.0f; @@ -75,7 +79,8 @@ void Tree::drawBranch() DrawArgs arg = draw_calls.front(); if (arg.dep == MAX_DEPTH) return; - float angle = ((arg.angleDeg) * PI) / 180.0f; + float angle_var = get_angle_var(arg); + float angle = ((arg.angleDeg + angle_var) * PI) / 180.0f; float length = get_lenght(arg); float nx = length * std::sin(angle); float ny = length * std::cos(angle); @@ -194,3 +199,12 @@ inline float Tree::get_lenght(DrawArgs &arg) lenght = 1; return lenght; } + +inline float Tree::get_angle_var(DrawArgs &arg) +{ + float angle_var = Remap(m_dna->branches[arg.dep].branch_angle_var, 0, 255, 0.0f, max_angles[arg.dep]); + + angle_var = Lerp(angle_var, -angle_var, mrand::getFloat(&branchSeed)); + + return angle_var; +}