xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity

Implemented Animation Clip asset and animation controller #410

Merged
XiaoQiDigipen merged 66 commits from SP3-22-AnimationController into main 2023-03-09 16:19:40 +08:00
Conversation 0 Commits 66 Files Changed 61 +12 -7
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3cc949bb7e - Show all commits

2
SHADE_Engine/src/Assets/Asset Types/Models/SHAnimationAsset.h
View File

@ -82,7 +82,5 @@ namespace SHADE
double ticksPerSecond; double ticksPerSecond;
std::vector<SHAnimData> nodeChannels; std::vector<SHAnimData> nodeChannels;
//std::vector<aiMeshAnim*> meshChannels;
//std::vector<aiMeshMorphAnim*> morphMeshChannels;
}; };
} }

13
SHADE_Engine/src/Assets/Asset Types/SHAnimClipAsset.h → SHADE_Engine/src/Assets/Asset Types/SHAnimClipContainerAsset.h
View File

@ -12,17 +12,24 @@ of DigiPen Institute of Technology is prohibited.
#pragma once #pragma once
#include "SH_API.h" #include "SH_API.h"
#include "SHAssetData.h"
#include <string> #include <string>
#include "Assets/SHAssetMacros.h"
#include "SHAssetData.h"
namespace SHADE namespace SHADE
{ {
struct SH_API SHAnimClipAsset : SHAssetData struct SHAnimClipAsset : SHAssetData
{ {
std::string name; std::string name;
AssetID animRawDataAssetId;
uint32_t firstIndex; uint32_t firstIndex;
uint32_t lastIndex; uint32_t lastIndex;
}; };
struct SH_API SHAnimClipContainerAsset final : SHAssetData
{
AssetID animRawDataAssetId;
std::vector<SHAnimClipAsset> clips;
};
} }

2
SHADE_Engine/src/Resource/SHResourceManager.h
View File

@ -21,7 +21,7 @@ of DigiPen Institute of Technology is prohibited.
#include "Assets/Asset Types/Models/SHModelAsset.h" #include "Assets/Asset Types/Models/SHModelAsset.h"
#include "Assets/Asset Types/SHTextureAsset.h" #include "Assets/Asset Types/SHTextureAsset.h"
#include "Assets/Asset Types/SHShaderAsset.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 "Assets/Asset Types/SHAnimControllerAsset.h"
#include "Graphics/Shaders/SHVkShaderModule.h" #include "Graphics/Shaders/SHVkShaderModule.h"
#include "Graphics/MiddleEnd/Textures/SHTextureLibrary.h" #include "Graphics/MiddleEnd/Textures/SHTextureLibrary.h"