diff --git a/Assets/Materials/AnimatedRaccoon.shmat b/Assets/Materials/AnimatedRaccoon.shmat index ae7c7163..a255aa11 100644 --- a/Assets/Materials/AnimatedRaccoon.shmat +++ b/Assets/Materials/AnimatedRaccoon.shmat @@ -3,6 +3,6 @@ SubPass: G-Buffer Write Properties: data.color: {x: 1, y: 1, z: 1, w: 1} - data.textureIndex: 0 + data.textureIndex: 64651793 data.alpha: 0 data.beta: {x: 1, y: 1, z: 1} \ No newline at end of file diff --git a/Assets/Shaders/Anim_VS.glsl b/Assets/Shaders/Anim_VS.glsl index c9aa64aa..d12cb34b 100644 --- a/Assets/Shaders/Anim_VS.glsl +++ b/Assets/Shaders/Anim_VS.glsl @@ -71,5 +71,5 @@ void main() boneMatrix += BoneMatrices.data[aBoneIndices[3]] * aBoneWeights[3]; // clip space for rendering - gl_Position = cameraData.vpMat * worldTransform * boneMatrix * vec4 (aVertexPos, 1.0f); + gl_Position = cameraData.vpMat * worldTransform * vec4 (aVertexPos, 1.0f); } \ No newline at end of file diff --git a/Assets/Shaders/Anim_VS.shshaderb b/Assets/Shaders/Anim_VS.shshaderb index b1940e98..1560e232 100644 Binary files a/Assets/Shaders/Anim_VS.shshaderb and b/Assets/Shaders/Anim_VS.shshaderb differ diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.cpp index 824be2b7..48859040 100644 --- a/SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.cpp +++ b/SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.cpp @@ -602,10 +602,6 @@ namespace SHADE dynamicOffset ); } - if (boneMatrixBuffer[frameIndex] && boneFirstIndexBuffer[frameIndex]) - { - cmdBuffer->BindVertexBuffer(SHGraphicsConstants::VertexBufferBindings::BONE_INDICES, boneFirstIndexBuffer[frameIndex], 0); - } cmdBuffer->DrawMultiIndirect(drawDataBuffer[frameIndex], static_cast(drawData.size())); cmdBuffer->EndLabeledSegment(); } @@ -716,13 +712,6 @@ namespace SHADE if (!boneMatrixData.empty()) { // Update GPU Buffers - const uint32_t BONE_IDX_DATA_BYTES = static_cast(boneMatrixIndices.size() * sizeof(uint32_t)); - SHVkUtil::EnsureBufferAndCopyHostVisibleData - ( - device, boneFirstIndexBuffer[frameIndex], boneMatrixIndices.data(), BONE_IDX_DATA_BYTES, - BuffUsage::eVertexBuffer, - "Batch Bone Indices Buffer" - ); const uint32_t BONE_MTX_DATA_BYTES = static_cast(boneMatrixData.size() * sizeof(SHMatrix)); SHVkUtil::EnsureBufferAndCopyHostVisibleData ( diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.h b/SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.h index 318e97d8..1bdd9a59 100644 --- a/SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.h +++ b/SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.h @@ -134,7 +134,6 @@ namespace SHADE TripleBuffer instancedIntegerBuffer; TripleBuffer matPropsBuffer; TripleBuffer boneMatrixBuffer; - TripleBuffer boneFirstIndexBuffer; TripleDescSet instanceDataDescSet; /*-----------------------------------------------------------------------------*/ diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHMeshLibrary.h b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHMeshLibrary.h index f61e4a20..5e42c526 100644 --- a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHMeshLibrary.h +++ b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHMeshLibrary.h @@ -154,13 +154,13 @@ namespace SHADE /*-----------------------------------------------------------------------------*/ /* Getter Functions */ /*-----------------------------------------------------------------------------*/ - Handle GetVertexPositionsBuffer() const noexcept { return vertPosBuffer; } - Handle GetVertexTexCoordsBuffer() const noexcept { return vertTexCoordBuffer; } - Handle GetVertexTangentsBuffer() const noexcept { return vertTangentBuffer; } - Handle GetVertexNormalsBuffer() const noexcept { return vertNormalBuffer; } - Handle GetVertexBoneIndicesBuffer() const noexcept { return vertBoneIdxBuffer; } - Handle GetVertexBoneWeightsBuffer() const noexcept { return vertBoneWeightBuffer; } - Handle GetIndexBuffer() const noexcept { return indexBuffer; } + Handle GetVertexPositionsBuffer() const noexcept { return vertPosBuffer; } + Handle GetVertexTexCoordsBuffer() const noexcept { return vertTexCoordBuffer; } + Handle GetVertexTangentsBuffer() const noexcept { return vertTangentBuffer; } + Handle GetVertexNormalsBuffer() const noexcept { return vertNormalBuffer; } + Handle GetVertexBoneIndicesBuffer() const noexcept { return vertBoneIdxBuffer; } + Handle GetVertexBoneWeightsBuffer() const noexcept { return vertBoneWeightBuffer; } + Handle GetIndexBuffer() const noexcept { return indexBuffer; } private: /*-----------------------------------------------------------------------------*/