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 +4 -2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7df9897598 - Show all commits

4
SHADE_Engine/src/Assets/Libraries/Loaders/SHBinaryLoader.cpp
View File

@ -84,7 +84,7 @@ namespace SHADE
}
}
void SHBinaryLoader::LoadAnimClipContainer(std::ifstream& file, SHAssetData* result, AssetPath path)
void SHBinaryLoader::LoadAnimClipContainer(std::ifstream& file, SHAssetData*& result, AssetPath path)
{
auto const data = new SHAnimClipContainerAsset();
@ -120,5 +120,7 @@ namespace SHADE
sizeof(uint32_t) * 2
);
}
result = data;
}
}

2
SHADE_Engine/src/Assets/Libraries/Loaders/SHBinaryLoader.h
View File

@ -12,6 +12,6 @@ namespace SHADE
private:
//Individual functions to write files
void WriteAnimClipContainer(std::ofstream& file,SHAssetData const* data, AssetPath path);
void LoadAnimClipContainer(std::ifstream& file,SHAssetData* result, AssetPath path);
void LoadAnimClipContainer(std::ifstream& file,SHAssetData*& result, AssetPath path);
};
}