Connor/nd-wfc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

initial state

Browse Source
This commit is contained in:
Connor
2026-02-09 22:22:26 +09:00
parent 414ded7e09
commit b84970eddd
2 changed files with 39 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/nd-wfc/wfc.hpp
View File

@@ -26,6 +26,9 @@
namespace WFC { namespace WFC {
struct EmptyInitialState {};
template<typename T> template<typename T>
concept WorldType = requires(T world, typename T::ValueType value) { concept WorldType = requires(T world, typename T::ValueType value) {
{ world.size() } -> std::integral; { world.size() } -> std::integral;
@@ -69,7 +72,8 @@ struct SolverState {
// Types-only config struct produced by Builder // Types-only config struct produced by Builder
template <typename WorldT, typename VarT, typename VariableIDMapT, template <typename WorldT, typename VarT, typename VariableIDMapT,
typename ConstrainerFunctionMapT, typename CallbacksT, typename RandomSelectorT> typename ConstrainerFunctionMapT, typename CallbacksT, typename RandomSelectorT,
typename InitialStateFunctionT = EmptyInitialState>
struct WFCConfig { struct WFCConfig {
static_assert(WorldType<WorldT>, "WorldT must satisfy World type requirements"); static_assert(WorldType<WorldT>, "WorldT must satisfy World type requirements");
@@ -79,6 +83,8 @@ struct WFCConfig {
using WaveType = Wave<VariableIDMapT, WorldSize>; using WaveType = Wave<VariableIDMapT, WorldSize>;
using CallbacksType = CallbacksT; using CallbacksType = CallbacksT;
using ConstrainerFunctionMapType = ConstrainerFunctionMapT; using ConstrainerFunctionMapType = ConstrainerFunctionMapT;
using InitialStateFunctionType = InitialStateFunctionT;
static consteval bool HasInitialState() { return !std::is_same_v<InitialStateFunctionT, EmptyInitialState>; }
}; };
// Forward declarations for mutually recursive functions // Forward declarations for mutually recursive functions
@@ -289,6 +295,13 @@ bool Run(typename ConfigT::SolverStateType& state)
detail::PropogateInitialValues<CallbacksT>(state, wave); detail::PropogateInitialValues<CallbacksT>(state, wave);
if constexpr (ConfigT::HasInitialState())
{
using ConstrainerType = Constrainer<WaveType, typename ConfigT::SolverStateType::PropagationQueueType>;
ConstrainerType constrainer(wave, state.m_propagationQueue);
typename ConfigT::InitialStateFunctionType{}(state.m_world, constrainer, state.m_randomSelector);
}
if (RunLoop<CallbacksT, ConstrainerFunctionMapT>(state, wave)) { if (RunLoop<CallbacksT, ConstrainerFunctionMapT>(state, wave)) {
detail::PopulateWorld(state, wave); detail::PopulateWorld(state, wave);
return true; return true;

46
include/nd-wfc/wfc_builder.hpp
View File

@@ -13,13 +13,14 @@ namespace WFC {
* @brief Builder class for creating WFC instances * @brief Builder class for creating WFC instances
*/ */
template< template<
typename WorldT, typename WorldT,
typename VarT = typename WorldT::ValueType, typename VarT = typename WorldT::ValueType,
typename VariableIDMapT = VariableIDMap<VarT>, typename VariableIDMapT = VariableIDMap<VarT>,
typename ConstrainerFunctionMapT = ConstrainerFunctionMap<void*>, typename ConstrainerFunctionMapT = ConstrainerFunctionMap<void*>,
typename CallbacksT = Callbacks<WorldT>, typename CallbacksT = Callbacks<WorldT>,
typename RandomSelectorT = DefaultRandomSelector<VarT>, typename RandomSelectorT = DefaultRandomSelector<VarT>,
typename SelectedValueT = void> typename SelectedValueT = void,
typename InitialStateFunctionT = EmptyInitialState>
class Builder { class Builder {
public: public:
using WorldSizeT = decltype(WorldT{}.size()); using WorldSizeT = decltype(WorldT{}.size());
@@ -31,22 +32,22 @@ public:
template <VarT ... Values> template <VarT ... Values>
using DefineIDs = Builder<WorldT, VarT, VariableIDMap<VarT, Values...>, ConstrainerFunctionMapT, CallbacksT, RandomSelectorT, VariableIDMap<VarT, Values...>>; using DefineIDs = Builder<WorldT, VarT, VariableIDMap<VarT, Values...>, ConstrainerFunctionMapT, CallbacksT, RandomSelectorT, VariableIDMap<VarT, Values...>, InitialStateFunctionT>;
template <size_t RangeStart, size_t RangeEnd> template <size_t RangeStart, size_t RangeEnd>
using DefineRange = Builder<WorldT, VarT, VariableIDRange<VarT, RangeStart, RangeEnd>, ConstrainerFunctionMapT, CallbacksT, RandomSelectorT, VariableIDRange<VarT, RangeStart, RangeEnd>>; using DefineRange = Builder<WorldT, VarT, VariableIDRange<VarT, RangeStart, RangeEnd>, ConstrainerFunctionMapT, CallbacksT, RandomSelectorT, VariableIDRange<VarT, RangeStart, RangeEnd>, InitialStateFunctionT>;
template <size_t RangeEnd> template <size_t RangeEnd>
using DefineRange0 = Builder<WorldT, VarT, VariableIDRange<VarT, 0, RangeEnd>, ConstrainerFunctionMapT, CallbacksT, RandomSelectorT, VariableIDRange<VarT, 0, RangeEnd>>; using DefineRange0 = Builder<WorldT, VarT, VariableIDRange<VarT, 0, RangeEnd>, ConstrainerFunctionMapT, CallbacksT, RandomSelectorT, VariableIDRange<VarT, 0, RangeEnd>, InitialStateFunctionT>;
template <VarT ... Values> template <VarT ... Values>
using Variable = Builder<WorldT, VarT, VariableIDMapT, ConstrainerFunctionMapT, CallbacksT, RandomSelectorT, VariableIDMap<VarT, Values...>>; using Variable = Builder<WorldT, VarT, VariableIDMapT, ConstrainerFunctionMapT, CallbacksT, RandomSelectorT, VariableIDMap<VarT, Values...>, InitialStateFunctionT>;
template <size_t RangeStart, size_t RangeEnd> template <size_t RangeStart, size_t RangeEnd>
using VariableRange = Builder<WorldT, VarT, VariableIDMapT, ConstrainerFunctionMapT, CallbacksT, RandomSelectorT, VariableIDRange<VarT, RangeStart, RangeEnd>>; using VariableRange = Builder<WorldT, VarT, VariableIDMapT, ConstrainerFunctionMapT, CallbacksT, RandomSelectorT, VariableIDRange<VarT, RangeStart, RangeEnd>, InitialStateFunctionT>;
using EmptyConstrainerFunctionT = EmptyConstrainerFunction<WorldT, WorldSizeT, VarT, ConstrainerType>; using EmptyConstrainerFunctionT = EmptyConstrainerFunction<WorldT, WorldSizeT, VarT, ConstrainerType>;
template <typename ConstrainerFunctionT> template <typename ConstrainerFunctionT>
@@ -58,7 +59,7 @@ public:
ConstrainerFunctionT, ConstrainerFunctionT,
SelectedValueT, SelectedValueT,
EmptyConstrainerFunctionT EmptyConstrainerFunctionT
>, CallbacksT, RandomSelectorT, SelectedValueT >, CallbacksT, RandomSelectorT, SelectedValueT, InitialStateFunctionT
>; >;
template <typename ConstrainerFunctionT> template <typename ConstrainerFunctionT>
@@ -70,22 +71,25 @@ public:
ConstrainerFunctionT, ConstrainerFunctionT,
VariableIDMapT, VariableIDMapT,
EmptyConstrainerFunctionT EmptyConstrainerFunctionT
>, CallbacksT, RandomSelectorT >, CallbacksT, RandomSelectorT, SelectedValueT, InitialStateFunctionT
>; >;
template <typename NewCellCollapsedCallbackT> template <typename NewCellCollapsedCallbackT>
using SetCellCollapsedCallback = Builder<WorldT, VarT, VariableIDMapT, ConstrainerFunctionMapT, typename CallbacksT::template SetCellCollapsedCallbackT<NewCellCollapsedCallbackT>, RandomSelectorT>; using SetCellCollapsedCallback = Builder<WorldT, VarT, VariableIDMapT, ConstrainerFunctionMapT, typename CallbacksT::template SetCellCollapsedCallbackT<NewCellCollapsedCallbackT>, RandomSelectorT, SelectedValueT, InitialStateFunctionT>;
template <typename NewContradictionCallbackT> template <typename NewContradictionCallbackT>
using SetContradictionCallback = Builder<WorldT, VarT, VariableIDMapT, ConstrainerFunctionMapT, typename CallbacksT::template SetContradictionCallbackT<NewContradictionCallbackT>, RandomSelectorT>; using SetContradictionCallback = Builder<WorldT, VarT, VariableIDMapT, ConstrainerFunctionMapT, typename CallbacksT::template SetContradictionCallbackT<NewContradictionCallbackT>, RandomSelectorT, SelectedValueT, InitialStateFunctionT>;
template <typename NewBranchCallbackT> template <typename NewBranchCallbackT>
using SetBranchCallback = Builder<WorldT, VarT, VariableIDMapT, ConstrainerFunctionMapT, typename CallbacksT::template SetBranchCallbackT<NewBranchCallbackT>, RandomSelectorT>; using SetBranchCallback = Builder<WorldT, VarT, VariableIDMapT, ConstrainerFunctionMapT, typename CallbacksT::template SetBranchCallbackT<NewBranchCallbackT>, RandomSelectorT, SelectedValueT, InitialStateFunctionT>;
template <typename NewRandomSelectorT> template <typename NewRandomSelectorT>
using SetRandomSelector = Builder<WorldT, VarT, VariableIDMapT, ConstrainerFunctionMapT, CallbacksT, NewRandomSelectorT>; using SetRandomSelector = Builder<WorldT, VarT, VariableIDMapT, ConstrainerFunctionMapT, CallbacksT, NewRandomSelectorT, SelectedValueT, InitialStateFunctionT>;
using Build = WFCConfig<WorldT, VarT, VariableIDMapT, ConstrainerFunctionMapT, CallbacksT, RandomSelectorT>; template <typename NewInitialStateFunctionT>
using SetInitialState = Builder<WorldT, VarT, VariableIDMapT, ConstrainerFunctionMapT, CallbacksT, RandomSelectorT, SelectedValueT, NewInitialStateFunctionT>;
using Build = WFCConfig<WorldT, VarT, VariableIDMapT, ConstrainerFunctionMapT, CallbacksT, RandomSelectorT, InitialStateFunctionT>;
}; };
} }