Rework EnTT integration
- Update EnTT to 3.11.1 - Moved EnTT wrapper to EnTTWorld, inheriting EntityWorld - AppEntitySystemComponent can now handles multiple EntityWorld - Headers relying on EnTT are now automatically included if NAZARA_ENTT is defined - Renamed SystemGraph to EnttSystemGraph (as it depends on it for now)
This commit is contained in:
committed by
Jérôme Leclercq
parent
d5f281a768
commit
97fa4d98be
77
include/Nazara/Core/EnttSystemGraph.inl
Normal file
77
include/Nazara/Core/EnttSystemGraph.inl
Normal file
@@ -0,0 +1,77 @@
|
||||
// Copyright (C) 2023 Jérôme "Lynix" Leclercq (lynix680@gmail.com)
|
||||
// This file is part of the "Nazara Engine - Core module"
|
||||
// For conditions of distribution and use, see copyright notice in Config.hpp
|
||||
|
||||
#include <Nazara/Core/EnttSystemGraph.hpp>
|
||||
#include <Nazara/Core/Error.hpp>
|
||||
#include <stdexcept>
|
||||
#include <Nazara/Core/Debug.hpp>
|
||||
|
||||
namespace Nz
|
||||
{
|
||||
namespace Detail
|
||||
{
|
||||
template<typename, typename = void>
|
||||
struct EnttSystemGraphAllowConcurrent : std::bool_constant<true> {};
|
||||
|
||||
template<typename T>
|
||||
struct EnttSystemGraphAllowConcurrent<T, std::void_t<decltype(T::AllowConcurrent)>> : std::bool_constant<T::AllowConcurrent> {};
|
||||
|
||||
template<typename, typename = void>
|
||||
struct EnttSystemGraphExecutionOrder : std::integral_constant<Int64, 0> {};
|
||||
|
||||
template<typename T>
|
||||
struct EnttSystemGraphExecutionOrder<T, std::void_t<decltype(T::ExecutionOrder)>> : std::integral_constant<Int64, T::ExecutionOrder> {};
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
template<typename... Args>
|
||||
EnttSystemGraph::Node<T>::Node(Args&&... args) :
|
||||
system(std::forward<Args>(args)...)
|
||||
{
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
void EnttSystemGraph::Node<T>::Update(Time elapsedTime)
|
||||
{
|
||||
system.Update(elapsedTime);
|
||||
}
|
||||
|
||||
inline EnttSystemGraph::EnttSystemGraph(entt::registry& registry) :
|
||||
m_registry(registry),
|
||||
m_systemOrderUpdated(true)
|
||||
{
|
||||
}
|
||||
|
||||
template<typename T, typename... Args>
|
||||
T& EnttSystemGraph::AddSystem(Args&&... args)
|
||||
{
|
||||
NazaraAssert(m_systemToNodes.find(entt::type_hash<T>()) == m_systemToNodes.end(), "this system already exists");
|
||||
|
||||
auto nodePtr = std::make_unique<Node<T>>(m_registry, std::forward<Args>(args)...);
|
||||
nodePtr->executionOrder = Detail::EnttSystemGraphExecutionOrder<T>();
|
||||
|
||||
T& system = nodePtr->system;
|
||||
|
||||
std::size_t nodeIndex = m_nodes.size();
|
||||
|
||||
m_nodes.emplace_back(std::move(nodePtr));
|
||||
m_systemToNodes.emplace(entt::type_hash<T>(), nodeIndex);
|
||||
m_systemOrderUpdated = false;
|
||||
|
||||
return system;
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
T& EnttSystemGraph::GetSystem() const
|
||||
{
|
||||
auto it = m_systemToNodes.find(entt::type_hash<T>());
|
||||
if (it == m_systemToNodes.end())
|
||||
throw std::runtime_error("this system is not part of the graph");
|
||||
|
||||
auto& node = static_cast<Node<T>&>(*m_nodes[it->second]);
|
||||
return node.system;
|
||||
}
|
||||
}
|
||||
|
||||
#include <Nazara/Core/DebugOff.hpp>
|
||||
Reference in New Issue
Block a user