diff options
| author | Léo Lam <leo@leolam.fr> | 2021-03-12 19:30:37 +0100 |
|---|---|---|
| committer | Léo Lam <leo@leolam.fr> | 2021-03-12 20:00:07 +0100 |
| commit | c23f86e6d5aaba7bd85790fc0f206f0db5e739cd (patch) | |
| tree | 5586e9bed229d2b64b6ee934b3e9d9ab2b98eee9 /src/KingSystem | |
| parent | d072fcf7da93fcd03a10a169ac3e10476191916e (diff) | |
ksys/act: Add BaseProcCreateTaskSelector
Diffstat (limited to 'src/KingSystem')
5 files changed, 76 insertions, 0 deletions
diff --git a/src/KingSystem/ActorSystem/CMakeLists.txt b/src/KingSystem/ActorSystem/CMakeLists.txt index f0448d05..3d9ec011 100644 --- a/src/KingSystem/ActorSystem/CMakeLists.txt +++ b/src/KingSystem/ActorSystem/CMakeLists.txt @@ -54,6 +54,8 @@ target_sources(uking PRIVATE actBaseProc.h actBaseProcCreateTask.cpp actBaseProcCreateTask.h + actBaseProcCreateTaskSelector.cpp + actBaseProcCreateTaskSelector.h actBaseProcDeleter.cpp actBaseProcDeleter.h actBaseProcHandle.cpp diff --git a/src/KingSystem/ActorSystem/actBaseProcCreateTask.h b/src/KingSystem/ActorSystem/actBaseProcCreateTask.h index 0d1c28cb..c78cf091 100644 --- a/src/KingSystem/ActorSystem/actBaseProcCreateTask.h +++ b/src/KingSystem/ActorSystem/actBaseProcCreateTask.h @@ -74,6 +74,8 @@ protected: void prepareImpl_(util::TaskRequest* req) override; private: + friend class BaseProcCreateTaskSelector; + bool onTaskDelegateInvoked(void* arg); void doPrepare(const BaseProcCreateTaskData* data); diff --git a/src/KingSystem/ActorSystem/actBaseProcCreateTaskSelector.cpp b/src/KingSystem/ActorSystem/actBaseProcCreateTaskSelector.cpp new file mode 100644 index 00000000..5b98aac6 --- /dev/null +++ b/src/KingSystem/ActorSystem/actBaseProcCreateTaskSelector.cpp @@ -0,0 +1,45 @@ +#include "KingSystem/ActorSystem/actBaseProcCreateTaskSelector.h" +#include <limits> +#include "KingSystem/ActorSystem/actBaseProcCreateTask.h" +#include "KingSystem/Map/mapObject.h" + +namespace ksys::act { + +SEAD_SINGLETON_DISPOSER_IMPL(BaseProcCreateTaskSelector) + +util::Task* BaseProcCreateTaskSelector::selectTask(const util::TaskSelectionContext& context) { + util::Task* min_task = nullptr; + util::Task* lane1_task = nullptr; + auto min = std::numeric_limits<float>::max(); + + for (auto& it : context) { + auto* task = sead::DynamicCast<BaseProcCreateTask>(&it); + if (!task) + return ⁢ + + if (task->getLaneId() == 2) + return ⁢ + + if (task->mMapObject && task->mMapObject->getFlags0().isOff(map::Object::Flag0::_4)) + return ⁢ + + if (task->mDistanceToLoadSphere >= 0.0 && min > task->mDistanceToLoadSphere) + min_task = ⁢ + + if (task->mDistanceToLoadSphere >= 0.0 && min > task->mDistanceToLoadSphere) + min = task->mDistanceToLoadSphere; + + if (task->getLaneId() == 1) + lane1_task = ⁢ + } + + if (min_task) + return min_task; + + if (lane1_task) + return lane1_task; + + return std::addressof(*context.begin()); +} + +} // namespace ksys::act diff --git a/src/KingSystem/ActorSystem/actBaseProcCreateTaskSelector.h b/src/KingSystem/ActorSystem/actBaseProcCreateTaskSelector.h new file mode 100644 index 00000000..40e5da31 --- /dev/null +++ b/src/KingSystem/ActorSystem/actBaseProcCreateTaskSelector.h @@ -0,0 +1,25 @@ +#pragma once + +#include <heap/seadDisposer.h> +#include <prim/seadDelegate.h> +#include "KingSystem/Utils/Thread/TaskQueueBase.h" +#include "KingSystem/Utils/Types.h" + +namespace ksys::act { + +class BaseProcCreateTaskSelector { + SEAD_SINGLETON_DISPOSER(BaseProcCreateTaskSelector) + BaseProcCreateTaskSelector() = default; + +public: + auto& getDelegate() { return mDelegate; } + +private: + util::Task* selectTask(const util::TaskSelectionContext& context); + + util::TaskSelectionDelegateT<BaseProcCreateTaskSelector> mDelegate{ + this, &BaseProcCreateTaskSelector::selectTask}; +}; +KSYS_CHECK_SIZE_NX150(BaseProcCreateTaskSelector, 0x40); + +} // namespace ksys::act diff --git a/src/KingSystem/Utils/Thread/TaskQueueBase.h b/src/KingSystem/Utils/Thread/TaskQueueBase.h index bdc7503f..e90d4a24 100644 --- a/src/KingSystem/Utils/Thread/TaskQueueBase.h +++ b/src/KingSystem/Utils/Thread/TaskQueueBase.h @@ -26,6 +26,8 @@ struct TaskSelectionContext { }; using TaskSelectionDelegate = sead::IDelegate1R<const TaskSelectionContext&, Task*>; +template <typename T> +using TaskSelectionDelegateT = sead::Delegate1R<T, const TaskSelectionContext&, Task*>; class TaskQueueBase { SEAD_RTTI_BASE(TaskQueueBase) |
