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

Animation WIP merge #321

Merged
XiaoQiDigipen merged 76 commits from SP3-17-animation-system into main 2023-01-30 17:35:57 +08:00
Conversation 0 Commits 76 Files Changed 78 +3 -5
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 83a33b3851 - Show all commits

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

@ -58,5 +58,7 @@ namespace SHADE
std::vector<uint32_t> Indices; std::vector<uint32_t> Indices;
std::vector<SHVec4U> VertexBoneIndices; std::vector<SHVec4U> VertexBoneIndices;
std::vector<SHVec4> VertexBoneWeights; std::vector<SHVec4> VertexBoneWeights;
uint32_t boneCount;
}; };
} }

6
SHADE_Engine/src/Assets/Libraries/Loaders/SHModelLoader.cpp
View File

@ -221,6 +221,7 @@ namespace SHADE
data.VertexNormals.resize(header.vertexCount); data.VertexNormals.resize(header.vertexCount);
data.VertexTexCoords.resize(header.vertexCount); data.VertexTexCoords.resize(header.vertexCount);
data.Indices.resize(header.indexCount); data.Indices.resize(header.indexCount);
data.boneCount = header.boneCount;
file.read(data.name.data(), header.charCount); file.read(data.name.data(), header.charCount);
file.read(reinterpret_cast<char*>(data.VertexPositions.data()), vertexVec3Byte); file.read(reinterpret_cast<char*>(data.VertexPositions.data()), vertexVec3Byte);
@ -252,11 +253,6 @@ namespace SHADE
data.VertexBoneIndices.resize(header.vertexCount); data.VertexBoneIndices.resize(header.vertexCount);
data.VertexBoneWeights.resize(header.vertexCount); data.VertexBoneWeights.resize(header.vertexCount);
//for (auto& weight : data.VertexBoneWeights)
//{
// weight = { -0.1f };
//}
for (uint32_t boneIndex{0}; boneIndex < bones.size(); ++boneIndex) for (uint32_t boneIndex{0}; boneIndex < bones.size(); ++boneIndex)
{ {
auto const& bone = bones[boneIndex]; auto const& bone = bones[boneIndex];