Browse Source

entity module: minor changes

Michele Caini 6 years ago
parent
commit
15c9688a5a

+ 33 - 0
src/entt/entity/fwd.hpp

@@ -8,6 +8,39 @@
 
 namespace entt {
 
+
+/**
+ * @brief Alias for exclusion lists.
+ * @tparam Type List of types.
+ */
+template<typename... Type>
+struct exclude_t: type_list<Type...> {};
+
+
+/**
+ * @brief Variable template for exclusion lists.
+ * @tparam Type List of types.
+ */
+template<typename... Type>
+constexpr exclude_t<Type...> exclude{};
+
+
+/**
+ * @brief Alias for lists of observed components.
+ * @tparam Type List of types.
+ */
+template<typename... Type>
+struct get_t: type_list<Type...>{};
+
+
+/**
+ * @brief Variable template for lists of observed components.
+ * @tparam Type List of types.
+ */
+template<typename... Type>
+constexpr get_t<Type...> get{};
+
+
 /*! @class basic_registry */
 template <typename>
 class basic_registry;

+ 0 - 1
src/entt/entity/group.hpp

@@ -9,7 +9,6 @@
 #include "../core/type_traits.hpp"
 #include "sparse_set.hpp"
 #include "storage.hpp"
-#include "helper.hpp"
 #include "fwd.hpp"
 
 

+ 1 - 32
src/entt/entity/helper.hpp

@@ -5,44 +5,13 @@
 #include <type_traits>
 #include "../core/type_traits.hpp"
 #include "../config/config.h"
+#include "registry.hpp"
 #include "fwd.hpp"
 
 
 namespace entt {
 
 
-/**
- * @brief Alias for exclusion lists.
- * @tparam Type List of types.
- */
-template<typename... Type>
-struct exclude_t: type_list<Type...> {};
-
-
-/**
- * @brief Variable template for exclusion lists.
- * @tparam Type List of types.
- */
-template<typename... Type>
-constexpr exclude_t<Type...> exclude{};
-
-
-/**
- * @brief Alias for lists of observed components.
- * @tparam Type List of types.
- */
-template<typename... Type>
-struct get_t: type_list<Type...>{};
-
-
-/**
- * @brief Variable template for lists of observed components.
- * @tparam Type List of types.
- */
-template<typename... Type>
-constexpr get_t<Type...> get{};
-
-
 /**
  * @brief Converts a registry to a view.
  * @tparam Const Constness of the accepted registry.

+ 0 - 1
src/entt/entity/registry.hpp

@@ -19,7 +19,6 @@
 #include "sparse_set.hpp"
 #include "snapshot.hpp"
 #include "storage.hpp"
-#include "helper.hpp"
 #include "entity.hpp"
 #include "group.hpp"
 #include "view.hpp"

+ 0 - 1
src/entt/entity/view.hpp

@@ -12,7 +12,6 @@
 #include "../core/type_traits.hpp"
 #include "sparse_set.hpp"
 #include "storage.hpp"
-#include "helper.hpp"
 #include "entity.hpp"
 #include "fwd.hpp"