From 3cc949bb7eafc67ab474ac6be1ee8b15df0cbbb4 Mon Sep 17 00:00:00 2001
From: Xiao Qi <xiaoqi.loh@digipen.edu>
Date: Tue, 7 Mar 2023 22:07:38 +0800
Subject: [PATCH] Animation container redefinition

---
 .../Assets/Asset Types/Models/SHAnimationAsset.h  |  2 --
 ...AnimClipAsset.h => SHAnimClipContainerAsset.h} | 15 +++++++++++----
 SHADE_Engine/src/Resource/SHResourceManager.h     |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)
 rename SHADE_Engine/src/Assets/Asset Types/{SHAnimClipAsset.h => SHAnimClipContainerAsset.h} (81%)

diff --git a/SHADE_Engine/src/Assets/Asset Types/Models/SHAnimationAsset.h b/SHADE_Engine/src/Assets/Asset Types/Models/SHAnimationAsset.h
index d7128977..6e98c661 100644
--- a/SHADE_Engine/src/Assets/Asset Types/Models/SHAnimationAsset.h	
+++ b/SHADE_Engine/src/Assets/Asset Types/Models/SHAnimationAsset.h	
@@ -82,7 +82,5 @@ namespace SHADE
 		double ticksPerSecond;
 
 		std::vector<SHAnimData> nodeChannels;
-		//std::vector<aiMeshAnim*> meshChannels;
-		//std::vector<aiMeshMorphAnim*> morphMeshChannels;
 	};
 }
\ No newline at end of file
diff --git a/SHADE_Engine/src/Assets/Asset Types/SHAnimClipAsset.h b/SHADE_Engine/src/Assets/Asset Types/SHAnimClipContainerAsset.h
similarity index 81%
rename from SHADE_Engine/src/Assets/Asset Types/SHAnimClipAsset.h
rename to SHADE_Engine/src/Assets/Asset Types/SHAnimClipContainerAsset.h
index c6887316..bac68579 100644
--- a/SHADE_Engine/src/Assets/Asset Types/SHAnimClipAsset.h	
+++ b/SHADE_Engine/src/Assets/Asset Types/SHAnimClipContainerAsset.h	
@@ -12,17 +12,24 @@ of DigiPen Institute of Technology is prohibited.
 #pragma once
 
 #include "SH_API.h"
-#include "SHAssetData.h"
 
 #include <string>
 
+#include "Assets/SHAssetMacros.h"
+#include "SHAssetData.h"
+
 namespace SHADE
 {
-  struct SH_API SHAnimClipAsset : SHAssetData
+  struct SHAnimClipAsset : SHAssetData
   {
     std::string name;
-    AssetID animRawDataAssetId;
     uint32_t firstIndex;
     uint32_t lastIndex;
   };
-}
\ No newline at end of file
+
+  struct SH_API SHAnimClipContainerAsset final : SHAssetData
+  {
+    AssetID animRawDataAssetId;
+    std::vector<SHAnimClipAsset> clips;
+  };
+}
diff --git a/SHADE_Engine/src/Resource/SHResourceManager.h b/SHADE_Engine/src/Resource/SHResourceManager.h
index 21303982..2dfc7dac 100644
--- a/SHADE_Engine/src/Resource/SHResourceManager.h
+++ b/SHADE_Engine/src/Resource/SHResourceManager.h
@@ -21,7 +21,7 @@ of DigiPen Institute of Technology is prohibited.
 #include "Assets/Asset Types/Models/SHModelAsset.h"
 #include "Assets/Asset Types/SHTextureAsset.h"
 #include "Assets/Asset Types/SHShaderAsset.h"
-#include "Assets/Asset Types/SHAnimClipAsset.h"
+#include "Assets/Asset Types/SHAnimClipContainerAsset.h"
 #include "Assets/Asset Types/SHAnimControllerAsset.h"
 #include "Graphics/Shaders/SHVkShaderModule.h"
 #include "Graphics/MiddleEnd/Textures/SHTextureLibrary.h"