diff --git a/Assets/Materials/AnimatedBag.shmat b/Assets/Materials/AnimatedBag.shmat new file mode 100644 index 00000000..3f0d9707 --- /dev/null +++ b/Assets/Materials/AnimatedBag.shmat @@ -0,0 +1,8 @@ +- VertexShader: 47911992 + FragmentShader: 46377769 + SubPass: G-Buffer Write + Properties: + data.color: {x: 1, y: 1, z: 1, w: 1} + data.textureIndex: 58303057 + data.alpha: 0 + data.beta: {x: 1, y: 1, z: 1} \ No newline at end of file diff --git a/Assets/Materials/AnimatedBag.shmat.shmeta b/Assets/Materials/AnimatedBag.shmat.shmeta new file mode 100644 index 00000000..6457c1c3 --- /dev/null +++ b/Assets/Materials/AnimatedBag.shmat.shmeta @@ -0,0 +1,3 @@ +Name: AnimatedBag +ID: 117923942 +Type: 7 diff --git a/Assets/Models/racoon.shmodel b/Assets/Models/racoon.shmodel index c3fa9a62..e15051b6 100644 Binary files a/Assets/Models/racoon.shmodel and b/Assets/Models/racoon.shmodel differ diff --git a/SHADE_Engine/src/Assets/Libraries/Loaders/SHModelLoader.cpp b/SHADE_Engine/src/Assets/Libraries/Loaders/SHModelLoader.cpp index 8fe55dd0..aea46add 100644 --- a/SHADE_Engine/src/Assets/Libraries/Loaders/SHModelLoader.cpp +++ b/SHADE_Engine/src/Assets/Libraries/Loaders/SHModelLoader.cpp @@ -176,8 +176,8 @@ namespace SHADE std::queue> nodeQueue; nodeQueue.emplace(std::make_pair(nodePool, dst)); - auto depthPtr = nodePool + 1; - auto depthTempPtr = dst + 1; + SHRigNode* depthPtr = nodePool + 1; + NodeTemp* depthTempPtr = dst + 1; while(!nodeQueue.empty()) { @@ -247,6 +247,11 @@ namespace SHADE data.VertexBoneIndices.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) { auto const& bone = bones[boneIndex]; @@ -261,6 +266,7 @@ namespace SHADE { boneIndices[j] = boneIndex; boneWeight[j] = weight.weight; + break; } } }