From 6872bae1513ea530107880bd78be05a47571a2b6 Mon Sep 17 00:00:00 2001 From: Xiao Qi Date: Wed, 18 Jan 2023 04:00:48 +0800 Subject: [PATCH] Updated compiled shmodel file for racoon with fixed rig node order and build format Fixed bug when building histogram for vertex weights --- Assets/Materials/AnimatedBag.shmat | 8 ++++++++ Assets/Materials/AnimatedBag.shmat.shmeta | 3 +++ Assets/Models/racoon.shmodel | Bin 677824 -> 679720 bytes .../Libraries/Loaders/SHModelLoader.cpp | 10 ++++++++-- 4 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 Assets/Materials/AnimatedBag.shmat create mode 100644 Assets/Materials/AnimatedBag.shmat.shmeta 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 c3fa9a62440bd26f6a2b2dd9729dbbc37c1c36a7..e15051b6e9f11b309e006fb989fc1cc91b5b026d 100644 GIT binary patch delta 5266 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 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; } } }