Move world::get_info out of pipeline mixin

SanderMertens · Aug 2, 2023 · 41a3226 · 41a3226
1 parent f913e08
commit 41a3226
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 18 deletions.
diff --git a/flecs.h b/flecs.h
@@ -19827,6 +19827,13 @@ struct world {
         ecs_run_post_frame(m_world, action, ctx);
     }
 
+    /** Get the world info.
+     * @see ecs_get_world_info
+     */
+    const flecs::world_info_t* get_info() const{
+        return ecs_get_world_info(m_world);
+    }
+
 /**
  * @file addons/cpp/mixins/id/mixin.inl
  * @brief Id world mixin.
@@ -20217,11 +20224,6 @@ void run_pipeline(const flecs::entity_t pip, ecs_ftime_t delta_time = 0.0) const
 template <typename Pipeline, if_not_t< is_enum<Pipeline>::value > = 0>
 void run_pipeline(ecs_ftime_t delta_time = 0.0) const;
 
-/** Get the world info.
- * @see ecs_get_world_info
- */
-const flecs::world_info_t* get_info() const;
-
 /** Set timescale.
  * @see ecs_set_time_scale
  */
@@ -28452,10 +28454,6 @@ inline void world::run_pipeline(ecs_ftime_t delta_time) const {
     return ecs_run_pipeline(m_world, _::cpp_type<Pipeline>::id(m_world), delta_time);
 }
 
-const flecs::world_info_t* world::get_info() const {
-    return ecs_get_world_info(m_world);
-}
-
 inline void world::set_time_scale(ecs_ftime_t mul) const {
     ecs_set_time_scale(m_world, mul);
 }

diff --git a/include/flecs/addons/cpp/mixins/pipeline/impl.hpp b/include/flecs/addons/cpp/mixins/pipeline/impl.hpp
@@ -61,10 +61,6 @@ inline void world::run_pipeline(ecs_ftime_t delta_time) const {
     return ecs_run_pipeline(m_world, _::cpp_type<Pipeline>::id(m_world), delta_time);
 }
 
-const flecs::world_info_t* world::get_info() const {
-    return ecs_get_world_info(m_world);
-}
-
 inline void world::set_time_scale(ecs_ftime_t mul) const {
     ecs_set_time_scale(m_world, mul);
 }

diff --git a/include/flecs/addons/cpp/mixins/pipeline/mixin.inl b/include/flecs/addons/cpp/mixins/pipeline/mixin.inl
@@ -55,11 +55,6 @@ void run_pipeline(const flecs::entity_t pip, ecs_ftime_t delta_time = 0.0) const
 template <typename Pipeline, if_not_t< is_enum<Pipeline>::value > = 0>
 void run_pipeline(ecs_ftime_t delta_time = 0.0) const;
 
-/** Get the world info.
- * @see ecs_get_world_info
- */
-const flecs::world_info_t* get_info() const;
-
 /** Set timescale.
  * @see ecs_set_time_scale
  */

diff --git a/include/flecs/addons/cpp/world.hpp b/include/flecs/addons/cpp/world.hpp
@@ -987,6 +987,13 @@ struct world {
         ecs_run_post_frame(m_world, action, ctx);
     }
 
+    /** Get the world info.
+     * @see ecs_get_world_info
+     */
+    const flecs::world_info_t* get_info() const{
+        return ecs_get_world_info(m_world);
+    }
+
 #   include "mixins/id/mixin.inl"
 #   include "mixins/component/mixin.inl"
 #   include "mixins/entity/mixin.inl"