diff --git a/modules/wfc/direction.h b/modules/wfc/direction.h deleted file mode 100644 index cf2366926..000000000 --- a/modules/wfc/direction.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef FAST_WFC_DIRECTION_HPP_ -#define FAST_WFC_DIRECTION_HPP_ - -constexpr int directions_x[4] = { 0, -1, 1, 0 }; -constexpr int directions_y[4] = { -1, 0, 0, 1 }; - -constexpr uint32_t get_opposite_direction(uint32_t direction) { - return 3 - direction; -} - -#endif diff --git a/modules/wfc/wave_form_collapse.h b/modules/wfc/wave_form_collapse.h index 74ec55d49..d47a045cd 100644 --- a/modules/wfc/wave_form_collapse.h +++ b/modules/wfc/wave_form_collapse.h @@ -10,8 +10,6 @@ #include "core/reference.h" -#include "direction.h" - class WaveFormCollapse : public Reference { GDCLASS(WaveFormCollapse, Reference); @@ -52,6 +50,9 @@ public: } }; + static constexpr int directions_x[4] = { 0, -1, 1, 0 }; + static constexpr int directions_y[4] = { -1, 0, 0, 1 }; + public: bool get_eriodic_output() const; void set_periodic_output(const bool val); @@ -107,6 +108,10 @@ public: propagating.push_back(PropagatingEntry(y, x, pattern)); } + constexpr uint32_t get_opposite_direction(uint32_t direction) { + return 3 - direction; + } + void normalize(Vector &v); Vector get_plogp(const Vector &distribution); double get_min_abs_half(const Vector &v);