From 348f17479d0b5e4884d0a7524d6c803472be8694 Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Fri, 3 Jan 2025 01:07:33 +0100 Subject: [PATCH] Fix name of `BlendWeight` to `BlendWeights` for vertex input to match `BlendIndices` --- Source/Engine/Graphics/Models/SkinnedMesh.cpp | 2 +- Source/Engine/Graphics/Shaders/VertexElement.h | 2 +- Source/Engine/GraphicsDevice/DirectX/RenderToolsDX.cpp | 2 +- Source/Engine/ShadersCompilation/ShaderCompiler.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Engine/Graphics/Models/SkinnedMesh.cpp b/Source/Engine/Graphics/Models/SkinnedMesh.cpp index 5473b549a..56bfad9ba 100644 --- a/Source/Engine/Graphics/Models/SkinnedMesh.cpp +++ b/Source/Engine/Graphics/Models/SkinnedMesh.cpp @@ -27,7 +27,7 @@ GPUVertexLayout* VB0SkinnedElementType2::GetLayout() { VertexElement::Types::Normal, 0, 0, 0, PixelFormat::R10G10B10A2_UNorm }, { VertexElement::Types::Tangent, 0, 0, 0, PixelFormat::R10G10B10A2_UNorm }, { VertexElement::Types::BlendIndices, 0, 0, 0, PixelFormat::R8G8B8A8_UInt }, - { VertexElement::Types::BlendWeight, 0, 0, 0, PixelFormat::R16G16B16A16_Float }, + { VertexElement::Types::BlendWeights, 0, 0, 0, PixelFormat::R16G16B16A16_Float }, }); } diff --git a/Source/Engine/Graphics/Shaders/VertexElement.h b/Source/Engine/Graphics/Shaders/VertexElement.h index 06bf0dbb5..f15bb86c7 100644 --- a/Source/Engine/Graphics/Shaders/VertexElement.h +++ b/Source/Engine/Graphics/Shaders/VertexElement.h @@ -30,7 +30,7 @@ PACK_BEGIN() struct FLAXENGINE_API VertexElement // Skinned bone blend indices. BlendIndices = 5, // Skinned bone blend weights. - BlendWeight = 6, + BlendWeights = 6, // Primary texture coordinate (UV). TexCoord0 = 7, // Additional texture coordinate (UV1). diff --git a/Source/Engine/GraphicsDevice/DirectX/RenderToolsDX.cpp b/Source/Engine/GraphicsDevice/DirectX/RenderToolsDX.cpp index f9d36a748..550ac5b87 100644 --- a/Source/Engine/GraphicsDevice/DirectX/RenderToolsDX.cpp +++ b/Source/Engine/GraphicsDevice/DirectX/RenderToolsDX.cpp @@ -289,7 +289,7 @@ LPCSTR RenderToolsDX::GetVertexInputSemantic(VertexElement::Types type, UINT& se return "TANGENT"; case VertexElement::Types::BlendIndices: return "BLENDINDICES"; - case VertexElement::Types::BlendWeight: + case VertexElement::Types::BlendWeights: return "BLENDWEIGHT"; case VertexElement::Types::TexCoord0: return "TEXCOORD"; diff --git a/Source/Engine/ShadersCompilation/ShaderCompiler.cpp b/Source/Engine/ShadersCompilation/ShaderCompiler.cpp index e8ea14971..21b619b86 100644 --- a/Source/Engine/ShadersCompilation/ShaderCompiler.cpp +++ b/Source/Engine/ShadersCompilation/ShaderCompiler.cpp @@ -427,7 +427,7 @@ bool ShaderCompiler::WriteCustomDataVS(ShaderCompilationContext* context, Shader data.Type = VertexElement::Types::BlendIndices; break; case VertexShaderMeta::InputType::BLENDWEIGHT: - data.Type = VertexElement::Types::BlendWeight; + data.Type = VertexElement::Types::BlendWeights; break; default: data.Type = VertexElement::Types::Unknown;