1177 allow identifying assets in code from their path

engine/include/cubos/engine/assets/asset.hpp

@@ -30,7 +30,7 @@
 
         /// @brief Avoid using this field, use @ref getId() instead.
         /// @todo This was added as a dirty fix for #692, should be removed once the issue is fixed.
-        uuids::uuid reflectedId;
+        std::string idOrPath;
 
         ~AnyAsset();
 
@@ -73,7 +73,11 @@
 
         /// @brief Gets the UUID of the asset.
         /// @return Asset UUID.
-        uuids::uuid getId() const;
+        std::string getId() const;
+
+        /// @brief Gets the path of the asset.
+        /// @return Asset path.
+        std::string getPath() const;
 
         /// @brief Checks if the handle is null.
         /// @return Whether the handle is null.
@@ -111,9 +115,10 @@
         /// @brief Decrements the reference count of the asset.
         void decRef() const;
 
-        uuids::uuid mId; ///< UUID of the asset.
-        void* mRefCount; ///< Void pointer to avoid including `<atomic>` in the header.
-        int mVersion;    ///< Last known version of the asset.
+        uuids::uuid mId;  ///< UUID of the asset.
+        void* mRefCount;  ///< Void pointer to avoid including `<atomic>` in the header.
+        int mVersion;     ///< Last known version of the asset.
+        std::string path; ///< Path of the asset.
     };
 
     /// @brief Handle to an asset of a specific type.
@@ -160,10 +165,11 @@
     inline AnyAsset::operator Asset<T>() const
     {
         Asset<T> asset;
-        asset.reflectedId = reflectedId;
+        asset.idOrPath = idOrPath;
         asset.mId = mId;
         asset.mRefCount = mRefCount;
         asset.mVersion = mVersion;
+        asset.path = path;
         asset.incRef();
         return asset;
     }

engine/include/cubos/engine/assets/assets.hpp

@@ -247,7 +247,6 @@ namespace cubos::engine
         struct Entry
         {
             Entry();
-
             Status status{Status::Unloaded}; ///< The status of the asset.
             AssetMeta meta;                  ///< The metadata associated with the asset.
 
@@ -308,6 +307,11 @@ namespace cubos::engine
         /// @return Lock guard.
         std::unique_lock<std::shared_mutex> lockWrite(const AnyAsset& handle) const;
 
+        /// @brief Checks if the given ID is of the correct type.
+        /// @param id ID to check.
+        /// @return The ID as a string.
+        std::string checkIdType(const std::string& id) const;
+
         /// @brief Gets a pointer to the entry associated with the given handle.
         /// @param handle Handle to get the entry for.
         /// @return Entry for the given handle, or nullptr if there is no such entry.

engine/samples/games/cubosurfers/main.cpp

@@ -14,6 +14,7 @@
 
 using namespace cubos::engine;
 
+// static const Asset<Scene> SceneAsset = AnyAsset("/assets/scenes/main.cubos");
 static const Asset<Scene> SceneAsset = AnyAsset("ee5bb451-05b7-430f-a641-a746f7009eef");
 static const Asset<VoxelPalette> PaletteAsset = AnyAsset("101da567-3d23-46ae-a391-c10ec00e8718");
 static const Asset<InputBindings> InputBindingsAsset = AnyAsset("b20900a4-20ee-4caa-8830-14585050bead");

engine/src/assets/asset.cpp

@@ -27,7 +27,7 @@
 }
 
 AnyAsset::AnyAsset(uuids::uuid id)
-    : reflectedId(id)
+    : idOrPath(uuids::to_string(id))
     , mId(id)
     , mRefCount(nullptr)
     , mVersion(-1)
@@ -38,54 +38,67 @@
     : mRefCount(nullptr)
     , mVersion(-1)
 {
+
     if (auto id = uuids::uuid::from_string(str))
     {
-        reflectedId = id.value();
+        idOrPath = str;
         mId = id.value();
     }
     else
     {
-        CUBOS_ERROR("Could not create asset handle, invalid UUID: \"{}\"", str);
+        if (str.find('/') != std::string::npos || str.find('\\') != std::string::npos)
+        {
+            idOrPath = str;
+            path = str;
+        }
+        else
+        {
+            CUBOS_ERROR("Could not create asset handle, invalid UUID or Path: \"{}\"", str);
+        }
     }
 }
 
 AnyAsset::AnyAsset(const AnyAsset& other)
-    : reflectedId(other.reflectedId)
+    : idOrPath(other.idOrPath)
     , mId(other.mId)
     , mRefCount(other.mRefCount)
     , mVersion(other.mVersion)
+    , path(other.path)
 {
     this->incRef();
 }
 
 AnyAsset::AnyAsset(AnyAsset&& other) noexcept
-    : reflectedId(other.reflectedId)
+    : idOrPath(other.idOrPath)
     , mId(other.mId)
     , mRefCount(other.mRefCount)
     , mVersion(other.mVersion)
+    , path(other.path)
 {
     other.mRefCount = nullptr;
 }
 
 AnyAsset& AnyAsset::operator=(const AnyAsset& other)
 {
     this->decRef();
-    reflectedId = other.reflectedId;
+    idOrPath = other.idOrPath;
     mId = other.mId;
     mRefCount = other.mRefCount;
     mVersion = other.mVersion;
+    path = other.path;
     this->incRef();
     return *this;
 }
 
 AnyAsset& AnyAsset::operator=(AnyAsset&& other) noexcept
 {
     this->decRef();
-    reflectedId = other.reflectedId;
+    idOrPath = other.idOrPath;
     mId = other.mId;
     mRefCount = other.mRefCount;
     mVersion = other.mVersion;
     other.mRefCount = nullptr;
+    path = other.path;
     return *this;
 }
 
@@ -96,22 +109,27 @@
 
 int AnyAsset::getVersion() const
 {
-    return reflectedId == mId ? mVersion : 0;
+    return uuids::uuid::from_string(idOrPath) == mId ? mVersion : 0;
+}
+
+std::string AnyAsset::getId() const
+{
+    return idOrPath;
 }
 
-uuids::uuid AnyAsset::getId() const
+std::string AnyAsset::getPath() const
 {
-    return reflectedId;
+    return path;
 }
 
 bool AnyAsset::isNull() const
 {
-    return reflectedId.is_nil();
+    return idOrPath.empty();
 }
 
 bool AnyAsset::isStrong() const
 {
-    return reflectedId == mId && mRefCount != nullptr;
+    return uuids::uuid::from_string(idOrPath) == mId && mRefCount != nullptr;
 }
 
 void AnyAsset::makeWeak()
@@ -126,20 +144,20 @@
 
     return Type::create(std::move(name))
         .with(ConstructibleTrait::typed<AnyAsset>().withBasicConstructors().build())
-        .with(FieldsTrait().withField("id", &AnyAsset::reflectedId));
+        .with(FieldsTrait().withField("id", &AnyAsset::idOrPath));
 }
 
 void AnyAsset::incRef() const
 {
-    if (reflectedId == mId && mRefCount != nullptr)
+    if (uuids::uuid::from_string(idOrPath) == mId && mRefCount != nullptr)
     {
         static_cast<std::atomic<int>*>(mRefCount)->fetch_add(1);
     }
 }
 
 void AnyAsset::decRef() const
 {
-    if (reflectedId == mId && mRefCount != nullptr)
+    if (uuids::uuid::from_string(idOrPath) == mId && mRefCount != nullptr)
     {
         static_cast<std::atomic<int>*>(mRefCount)->fetch_sub(1);
     }