Added recognition for animation clip container as a file

Added functions to create new sub asset for animation clips

Added recognition for animation clip containers when creating new assets

SHADE_Engine/src/Assets/SHAssetMacros.h

@@ -57,6 +57,7 @@ enum class AssetType : AssetTypeMeta
   MESH,
   SCRIPT,
   FONT,
+  ANIM_CONTAINER,
   ANIM_CLIP,
   MAX_COUNT
 };
@@ -79,7 +80,7 @@ constexpr std::string_view FONT_COMPILER_EXE{ "FontCompiler.exe" };
 constexpr std::string_view SCENE_FOLDER{ "/Scenes/" };
 constexpr std::string_view PREFAB_FOLDER{ "/Prefabs/" };
 constexpr std::string_view MATERIAL_FOLDER{ "/Materials/" };
-constexpr std::string_view ANIM_CLIP_FOLDER{ "/Animation Clips/" };
+constexpr std::string_view ANIM_CLIP_FOLDER{ "/Animations/" };
 
 
 // ASSET EXTENSIONS
@@ -95,7 +96,8 @@ constexpr std::string_view PREFAB_EXTENSION {".shprefab"};
 constexpr std::string_view MATERIAL_EXTENSION {".shmat"};
 constexpr std::string_view TEXTURE_EXTENSION {".shtex"};
 constexpr std::string_view MODEL_EXTENSION{ ".shmodel" };
-constexpr std::string_view ANIM_CLIP_EXTENSION{ ".shanimclip" };
+constexpr std::string_view ANIM_CONTAINER_EXTENSION{ ".shanimcontainer" };
+constexpr std::string_view FILLER_EXTENSION{"dummy"};
 
 constexpr std::string_view EXTENSIONS[] = {
   AUDIO_EXTENSION,
@@ -106,14 +108,15 @@ constexpr std::string_view EXTENSIONS[] = {
   SCENE_EXTENSION,
   PREFAB_EXTENSION,
   MATERIAL_EXTENSION,
-  "dummy",
+  FILLER_EXTENSION,
   SCRIPT_EXTENSION,
   FONT_EXTENSION,
   AUDIO_WAV_EXTENSION,
-  ANIM_CLIP_EXTENSION
+  ANIM_CONTAINER_EXTENSION,
+  FILLER_EXTENSION
 };
 
-constexpr size_t EXTENSIONS_COUNT{ 11 };
+constexpr size_t EXTENSIONS_COUNT{ static_cast<size_t>(AssetType::MAX_COUNT) };
 
 // EXTERNAL EXTENSIONS
 constexpr std::string_view GLSL_EXTENSION{ ".glsl" };

SHADE_Engine/src/Assets/SHAssetManager.cpp

@@ -26,7 +26,7 @@
 #include "Asset Types/SHPrefabAsset.h"
 #include "Asset Types/SHMaterialAsset.h"
 #include "Asset Types/SHSceneAsset.h"
-#include "Asset Types/SHAnimClipAsset.h"
+#include "Asset Types/SHAnimClipContainerAsset.h"
 
 #include "Libraries/Compilers/SHTextureCompiler.h"
 #include "Libraries/Compilers/SHShaderSourceCompiler.h"
@@ -238,10 +238,10 @@ namespace SHADE
       }
       break;
 
-    case AssetType::ANIM_CLIP:
+    case AssetType::ANIM_CONTAINER:
       newPath += ANIM_CLIP_FOLDER;
       newPath += name;
-      newPath += ANIM_CLIP_EXTENSION;
+      newPath += ANIM_CONTAINER_EXTENSION;
 
       {
         auto animClip = new SHAnimClipAsset();
@@ -252,7 +252,7 @@ namespace SHADE
 
 
     default:
-      SHLOG_ERROR("[Asset Manager] Asset type of {} not an internal asset type, cannot be created", name);
+      SHLOG_ERROR("[Asset Manager] Asset type of {} not an internal parent asset type, cannot be created", name);
       return 0;
     }
 
@@ -267,13 +267,13 @@ namespace SHADE
 
     auto result = assetCollection.emplace(
       id,
-        SHAsset(
+      SHAsset(
-          name,
+        name,
-          id,
+        id,
-          type,
+        type,
-          newPath,
+        newPath,
-          false
+        false
-          )
+      )
     );
 
     assetData.emplace(id, data);
@@ -284,6 +284,40 @@ namespace SHADE
 		return id;
 	}
 
+  AssetID SHAssetManager::CreateNewSubAsset(AssetType type, AssetName name, AssetID parent)
+  {
+    if (!assetData.contains(parent))
+    {
+      SHLOG_ERROR("[Asset Manager] Failed to create new sub asset, parent does not exist: {}", name);
+      return 0;
+    }
+
+    switch(type)
+    {
+    case AssetType::ANIM_CLIP:
+      {
+        auto const animContainer {dynamic_cast<SHAnimClipContainerAsset*>(assetData[parent])};
+        auto id = GenerateAssetID(type);
+        SHAsset asset{
+          .name = name,
+          .id = id,
+          .type = type,
+          .isSubAsset = true,
+          .parent = parent
+        };
+        auto& newClip {animContainer->clips.emplace_back()};
+        newClip.name = name;
+        assetCollection.emplace(id, asset);
+        assetData.emplace(id, &newClip);
+        return id;
+      }
+
+    default:
+      SHLOG_ERROR("[Asset Manager] Asset type of {} not an internal sub asset type, cannot be created", name);
+      return 0;
+    }
+  }
+
   bool SHAssetManager::SaveAsset(AssetID id) noexcept
   {
     if (assetCollection.contains(id))
@@ -547,7 +581,8 @@ namespace SHADE
     loaders[static_cast<size_t>(AssetType::MESH)] = nullptr;
     loaders[static_cast<size_t>(AssetType::SCRIPT)] = nullptr;
     loaders[static_cast<size_t>(AssetType::FONT)] = dynamic_cast<SHAssetLoader*>(new SHFontLoader());
-    loaders[static_cast<size_t>(AssetType::ANIM_CLIP)] = dynamic_cast<SHAssetLoader*>(new SHBinaryLoader());
+    loaders[static_cast<size_t>(AssetType::ANIM_CONTAINER)] = dynamic_cast<SHAssetLoader*>(new SHBinaryLoader());
+    loaders[static_cast<size_t>(AssetType::ANIM_CLIP)] = nullptr;
 	}
 
 	/****************************************************************************
@@ -758,6 +793,38 @@ namespace SHADE
 
       return newAsset.id;
     }
+    else if(ext==ANIM_CONTAINER_EXTENSION)
+    {
+      SHAsset newAsset{
+        path.stem().string(),
+        GenerateAssetID(AssetType::ANIM_CONTAINER),
+        AssetType::ANIM_CONTAINER,
+        path,
+        false
+      };
+
+      assetCollection.emplace(newAsset.id, newAsset);
+
+      SHAnimClipContainerAsset* const data = reinterpret_cast<SHAnimClipContainerAsset*>(LoadData(newAsset));
+      assetData.emplace(newAsset.id, data);
+      for(auto& clip : data->clips)
+      {
+        SHAsset subAsset{
+          .name = clip.name,
+          .id = GenerateAssetID(AssetType::ANIM_CLIP),
+          .type = AssetType::ANIM_CLIP,
+          .isSubAsset = true,
+          .parent = newAsset.id
+        };
+
+        assetCollection.emplace(subAsset.id, subAsset);
+        assetCollection[newAsset.id].subAssets.push_back(&assetCollection[subAsset.id]);
+
+        assetData.emplace(subAsset.id, &clip);
+      }
+
+      SHAssetMetaHandler::WriteMetaData(assetCollection[newAsset.id]);
+    }
   }
 
   void SHAssetManager::BuildAssetCollection() noexcept
@@ -814,7 +881,9 @@ namespace rttr
       value("Material", AssetType::MATERIAL),
       value("Mesh", AssetType::MESH),
       value("Script", AssetType::SCRIPT),
-      value("Font", AssetType::FONT)
+      value("Font", AssetType::FONT),
+      value("Animation Container", AssetType::ANIM_CONTAINER),
+      value("Animation Clip", AssetType::ANIM_CLIP)
     );
   }
 }

SHADE_Engine/src/Assets/SHAssetManager.h

@@ -63,6 +63,7 @@ namespace SHADE
 		 * \return resource id generated for new asset
 		****************************************************************************/
 		static AssetID CreateNewAsset(AssetType type, AssetName name) noexcept;
+    static AssetID CreateNewSubAsset(AssetType type, AssetName name, AssetID parent);
     static bool SaveAsset(AssetID id) noexcept;
     static bool DeleteAsset(AssetID id) noexcept;