Merge branch 'master' into sfinae_operators

Author: skypjack

.github/workflows/tools.yml renamed to .github/workflows/analyzer.yml

@@ -1,9 +1,9 @@
-name: tools
+name: analyzer
 
 on:
   push:
     branches:
-      - tools
+      - analyzer
 
 jobs:
 
@@ -55,7 +55,7 @@ jobs:
               -DENTT_BUILD_EXAMPLE=ON \
               -DENTT_BUILD_LIB=ON \
               -DENTT_BUILD_SNAPSHOT=ON \
-              -DENTT_BUILD_TOOLS=ON \
+              -ENTT_BUILD_TESTBED=ON \
               -DCMAKE_CXX_INCLUDE_WHAT_YOU_USE="include-what-you-use;-Xiwyu;--mapping_file=${GITHUB_WORKSPACE}/entt.imp;-Xiwyu;--no_fwd_decls;-Xiwyu;--verbose=1" \
               ..
         make -j4
@@ -78,7 +78,7 @@ jobs:
               -DENTT_BUILD_EXAMPLE=ON \
               -DENTT_BUILD_LIB=ON \
               -DENTT_BUILD_SNAPSHOT=ON \
-              -DENTT_BUILD_TOOLS=ON \
+              -ENTT_BUILD_TESTBED=ON \
               -DENTT_USE_CLANG_TIDY=ON \
               ..
         make -j4

.github/workflows/deploy.yml

@@ -2,7 +2,7 @@ name: deploy
 
 on:
   release:
-    types: published
+    types: [published]
 
 jobs:
 

.github/workflows/testbed.yml

@@ -0,0 +1,78 @@
+name: testbed
+
+on: [push]
+
+jobs:
+
+  linux:
+    timeout-minutes: 15
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install required packages
+      run: |
+        sudo apt update
+        sudo apt install -y \
+            build-essential \
+            git \
+            make \
+            pkg-config \
+            cmake \
+            ninja-build \
+            gnome-desktop-testing \
+            libasound2-dev \
+            libpulse-dev \
+            libaudio-dev \
+            libjack-dev \
+            libsndio-dev \
+            libx11-dev \
+            libxext-dev \
+            libxrandr-dev \
+            libxcursor-dev \
+            libxfixes-dev \
+            libxi-dev \
+            libxss-dev \
+            libxtst-dev \
+            libxkbcommon-dev \
+            libdrm-dev \
+            libgbm-dev \
+            libgl1-mesa-dev \
+            libgles2-mesa-dev \
+            libegl1-mesa-dev \
+            libdbus-1-dev \
+            libibus-1.0-dev \
+            libudev-dev \
+            libpipewire-0.3-dev \
+            libwayland-dev \
+            libdecor-0-dev \
+            liburing-dev
+    - name: Compile testbed
+      working-directory: build
+      run: |
+        cmake -DENTT_BUILD_TESTBED=ON ..
+        make -j4
+
+  windows:
+    timeout-minutes: 15
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Compile testbed
+      working-directory: build
+      run: |
+        cmake -DENTT_BUILD_TESTBED=ON .. -G Ninja
+        cmake --build . -j 4
+
+  macos:
+    timeout-minutes: 15
+    runs-on: macOS-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Compile testbed
+      working-directory: build
+      run: |
+        cmake -DENTT_BUILD_TESTBED=ON ..
+        make -j4

CMakeLists.txt

@@ -22,7 +22,7 @@ project(
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE Debug)
 endif()
-
+    
 message(VERBOSE "*")
 message(VERBOSE "* ${PROJECT_NAME} v${PROJECT_VERSION} (${CMAKE_BUILD_TYPE})")
 message(VERBOSE "* Copyright (c) 2017-2025 Michele Caini <[email protected]>")
@@ -90,6 +90,7 @@ target_include_directories(
     EnTT
     INTERFACE
         $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/src>
+        $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/tools>
         $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
 )
 
@@ -111,19 +112,9 @@ endif()
 # Add EnTT goodies
 
 option(ENTT_INCLUDE_HEADERS "Add all EnTT headers to the EnTT target." OFF)
+option(ENTT_INCLUDE_TOOLS "Add EnTT tools files to the EnTT target." OFF)
 option(ENTT_INCLUDE_NATVIS "Add EnTT natvis files to the EnTT target." OFF)
 
-if(ENTT_INCLUDE_NATVIS)
-    if(MSVC)
-        set(ENTT_HAS_NATVIS TRUE CACHE BOOL "" FORCE)
-        mark_as_advanced(ENTT_HAS_NATVIS)
-    endif()
-
-    if(NOT ENTT_HAS_NATVIS)
-        message(VERBOSE "The option ENTT_INCLUDE_NATVIS is set but natvis files are not supported. They will not be added to the target.")
-    endif()
-endif()
-
 if(ENTT_INCLUDE_HEADERS)
     target_sources(
         EnTT
@@ -206,6 +197,25 @@ if(ENTT_INCLUDE_HEADERS)
     )
 endif()
 
+if(ENTT_INCLUDE_TOOLS)
+    target_sources(
+        EnTT
+        INTERFACE
+            $<BUILD_INTERFACE:${EnTT_SOURCE_DIR}/tools/entt/davey/davey.hpp>
+    )
+endif()
+
+if(ENTT_INCLUDE_NATVIS)
+    if(MSVC)
+        set(ENTT_HAS_NATVIS TRUE CACHE BOOL "" FORCE)
+        mark_as_advanced(ENTT_HAS_NATVIS)
+    endif()
+
+    if(NOT ENTT_HAS_NATVIS)
+        message(VERBOSE "The option ENTT_INCLUDE_NATVIS is set but natvis files are not supported. They will not be added to the target.")
+    endif()
+endif()
+
 if(ENTT_HAS_NATVIS)
     target_sources(
         EnTT
@@ -301,24 +311,32 @@ if(ENTT_INSTALL)
     export(PACKAGE EnTT)
 endif()
 
-# Tests
+# Tests and testbed
 
+option(ENTT_BUILD_TESTBED "Enable building testbed." OFF)
 option(ENTT_BUILD_TESTING "Enable building tests." OFF)
 
-if(ENTT_BUILD_TESTING)
-    option(ENTT_FIND_GTEST_PACKAGE "Enable finding gtest package." OFF)
+if(ENTT_BUILD_TESTBED OR ENTT_BUILD_TESTING)
+    set(ENTT_ID_TYPE std::uint32_t CACHE STRING "Type of identifiers to use for tests and testbed")
+    set(ENTT_CXX_STD cxx_std_17 CACHE STRING "C++ standard revision to use for tests and testbed")
+
+    # Testbed goes first because otherwise SDL gets confused with EnTT tests
+    if(ENTT_BUILD_TESTBED)
+        add_subdirectory(testbed)
+    endif()
 
-    option(ENTT_BUILD_BENCHMARK "Build benchmark." OFF)
-    option(ENTT_BUILD_EXAMPLE "Build examples." OFF)
-    option(ENTT_BUILD_LIB "Build lib tests." OFF)
-    option(ENTT_BUILD_SNAPSHOT "Build snapshot test with Cereal." OFF)
+    if(ENTT_BUILD_TESTING)
+        option(ENTT_FIND_GTEST_PACKAGE "Enable finding gtest package." OFF)
 
-    set(ENTT_ID_TYPE std::uint32_t CACHE STRING "Type of identifiers to use for the tests")
-    set(ENTT_CXX_STD cxx_std_17 CACHE STRING "C++ standard revision to use for the tests")
+        option(ENTT_BUILD_BENCHMARK "Build benchmark." OFF)
+        option(ENTT_BUILD_EXAMPLE "Build examples." OFF)
+        option(ENTT_BUILD_LIB "Build lib tests." OFF)
+        option(ENTT_BUILD_SNAPSHOT "Build snapshot test with Cereal." OFF)
 
-    include(CTest)
-    enable_testing()
-    add_subdirectory(test)
+        include(CTest)
+        enable_testing()
+        add_subdirectory(test)
+    endif()
 endif()
 
 # Documentation

TODO

@@ -34,4 +34,4 @@ TODO:
 * doc: IMPLICIT_DIR_DOCS for dir docs or \dir
 * meta non-const allow_cast overloads: (const int &) to (int &) is not allowed, but (const int &) to (double &) is allowed (support only for convertibles)
 * improve non-const allow cast with in-place switch
-* meta fixed_size could return the size directly if present
+* review build process for testbed (i.e. tests first due to SDL)

docs/md/entity.md

@@ -1548,7 +1548,7 @@ is not known), there is always the possibility of receiving a `type_info` object
 for the type of elements associated with the entities (if any):
 
 ```cpp
-if(entt::type_id<velocity>() == base.type()) {
+if(entt::type_id<velocity>() == base.info()) {
     // ...
 }
 ```

src/entt/config/version.h

@@ -6,7 +6,7 @@
 // NOLINTBEGIN(cppcoreguidelines-macro-*,modernize-macro-*)
 
 #define ENTT_VERSION_MAJOR 3
-#define ENTT_VERSION_MINOR 15
+#define ENTT_VERSION_MINOR 16
 #define ENTT_VERSION_PATCH 0
 
 #define ENTT_VERSION \

src/entt/core/any.hpp

@@ -117,8 +117,8 @@ class basic_any {
         if constexpr(!std::is_void_v<Type>) {
             using plain_type = std::remove_cv_t<std::remove_reference_t<Type>>;
 
-            info = &type_id<plain_type>();
             vtable = basic_vtable<plain_type>;
+            descriptor = &type_id<plain_type>();
 
             if constexpr(std::is_lvalue_reference_v<Type>) {
                 static_assert((std::is_lvalue_reference_v<Args> && ...) && (sizeof...(Args) == 1u), "Invalid arguments");
@@ -151,8 +151,8 @@ class basic_any {
 
     basic_any(const basic_any &other, const any_policy pol) noexcept
         : instance{other.data()},
-          info{other.info},
           vtable{other.vtable},
+          descriptor{other.descriptor},
           mode{pol} {}
 
 public:
@@ -219,8 +219,8 @@ class basic_any {
      */
     basic_any(basic_any &&other) noexcept
         : instance{},
-          info{other.info},
           vtable{other.vtable},
+          descriptor{other.descriptor},
           mode{other.mode} {
         if(other.mode == any_policy::embedded) {
             other.vtable(request::move, other, this);
@@ -271,8 +271,8 @@ class basic_any {
             instance = std::exchange(other.instance, nullptr);
         }
 
-        info = other.info;
         vtable = other.vtable;
+        descriptor = other.descriptor;
         mode = other.mode;
 
         return *this;
@@ -291,11 +291,16 @@ class basic_any {
     }
 
     /**
-     * @brief Returns the object type if any, `type_id<void>()` otherwise.
-     * @return The object type if any, `type_id<void>()` otherwise.
+     * @brief Returns the object type info if any, `type_id<void>()` otherwise.
+     * @return The object type info if any, `type_id<void>()` otherwise.
      */
-    [[nodiscard]] const type_info &type() const noexcept {
-        return (info == nullptr) ? type_id<void>() : *info;
+    [[nodiscard]] const type_info &info() const noexcept {
+        return (descriptor == nullptr) ? type_id<void>() : *descriptor;
+    }
+
+    /*! @copydoc info */
+    [[deprecated("use ::info instead")]] [[nodiscard]] const type_info &type() const noexcept {
+        return info();
     }
 
     /**
@@ -312,7 +317,7 @@ class basic_any {
      * @return An opaque pointer the contained instance, if any.
      */
     [[nodiscard]] const void *data(const type_info &req) const noexcept {
-        return (type() == req) ? data() : nullptr;
+        return (info() == req) ? data() : nullptr;
     }
 
     /**
@@ -350,7 +355,7 @@ class basic_any {
      * @return True in case of success, false otherwise.
      */
     bool assign(const basic_any &other) {
-        if(vtable && mode != any_policy::cref && *info == other.type()) {
+        if(vtable && mode != any_policy::cref && *descriptor == other.info()) {
             return (vtable(request::assign, *this, other.data()) != nullptr);
         }
 
@@ -360,7 +365,7 @@ class basic_any {
     /*! @copydoc assign */
     // NOLINTNEXTLINE(cppcoreguidelines-rvalue-reference-param-not-moved)
     bool assign(basic_any &&other) {
-        if(vtable && mode != any_policy::cref && *info == other.type()) {
+        if(vtable && mode != any_policy::cref && *descriptor == other.info()) {
             if(auto *val = other.data(); val) {
                 return (vtable(request::transfer, *this, val) != nullptr);
             }
@@ -378,8 +383,8 @@ class basic_any {
         }
 
         instance = nullptr;
-        info = nullptr;
         vtable = nullptr;
+        descriptor = nullptr;
         mode = any_policy::empty;
     }
 
@@ -397,7 +402,7 @@ class basic_any {
      * @return False if the two objects differ in their content, true otherwise.
      */
     [[nodiscard]] bool operator==(const basic_any &other) const noexcept {
-        if(vtable && *info == other.type()) {
+        if(vtable && *descriptor == other.info()) {
             return (vtable(request::compare, *this, other.data()) != nullptr);
         }
 
@@ -447,8 +452,8 @@ class basic_any {
         const void *instance;
         storage_type storage;
     };
-    const type_info *info{};
     vtable_type *vtable{};
+    const type_info *descriptor{};
     any_policy mode{any_policy::empty};
 };
 

src/entt/entity/group.hpp

@@ -151,7 +151,7 @@ class group_handler final: public group_descriptor {
 
     [[nodiscard]] bool owned(const id_type hash) const noexcept override {
         for(size_type pos{}; pos < Owned; ++pos) {
-            if(pools[pos]->type().hash() == hash) {
+            if(pools[pos]->info().hash() == hash) {
                 return true;
             }
         }