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
70
include/Nazara/Core/EnttSystemGraph.hpp
Normal file
70
include/Nazara/Core/EnttSystemGraph.hpp
Normal file
@@ -0,0 +1,70 @@
|
||||
// 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
|
||||
|
||||
#pragma once
|
||||
|
||||
#ifndef NAZARA_CORE_ENTTSYSTEMGRAPH_HPP
|
||||
#define NAZARA_CORE_ENTTSYSTEMGRAPH_HPP
|
||||
|
||||
#include <Nazara/Prerequisites.hpp>
|
||||
#include <Nazara/Core/Clock.hpp>
|
||||
#include <Nazara/Core/Config.hpp>
|
||||
#include <Nazara/Utils/MovablePtr.hpp>
|
||||
#include <entt/entt.hpp>
|
||||
#include <functional>
|
||||
#include <unordered_map>
|
||||
#include <vector>
|
||||
|
||||
namespace Nz
|
||||
{
|
||||
class NAZARA_CORE_API EnttSystemGraph
|
||||
{
|
||||
public:
|
||||
inline EnttSystemGraph(entt::registry& registry);
|
||||
EnttSystemGraph(const EnttSystemGraph&) = delete;
|
||||
EnttSystemGraph(EnttSystemGraph&&) = delete;
|
||||
~EnttSystemGraph() = default;
|
||||
|
||||
template<typename T, typename... Args> T& AddSystem(Args&&... args);
|
||||
|
||||
template<typename T> T& GetSystem() const;
|
||||
|
||||
void Update();
|
||||
void Update(Time elapsedTime);
|
||||
|
||||
EnttSystemGraph& operator=(const EnttSystemGraph&) = delete;
|
||||
EnttSystemGraph& operator=(EnttSystemGraph&&) = delete;
|
||||
|
||||
private:
|
||||
struct NAZARA_CORE_API NodeBase
|
||||
{
|
||||
virtual ~NodeBase();
|
||||
|
||||
virtual void Update(Time elapsedTime) = 0;
|
||||
|
||||
Int64 executionOrder;
|
||||
};
|
||||
|
||||
template<typename T>
|
||||
struct Node : NodeBase
|
||||
{
|
||||
template<typename... Args> Node(Args&&... args);
|
||||
|
||||
void Update(Time elapsedTime) override;
|
||||
|
||||
T system;
|
||||
};
|
||||
|
||||
std::unordered_map<entt::id_type, std::size_t /*nodeIndex*/> m_systemToNodes;
|
||||
std::vector<NodeBase*> m_orderedNodes;
|
||||
std::vector<std::unique_ptr<NodeBase>> m_nodes;
|
||||
entt::registry& m_registry;
|
||||
Nz::HighPrecisionClock m_clock;
|
||||
bool m_systemOrderUpdated;
|
||||
};
|
||||
}
|
||||
|
||||
#include <Nazara/Core/EnttSystemGraph.inl>
|
||||
|
||||
#endif // NAZARA_CORE_ENTTSYSTEMGRAPH_HPP
|
||||
Reference in New Issue
Block a user