From 2486810deda0c18d967cc3e87db147d048bd171d Mon Sep 17 00:00:00 2001 From: pandamicro Date: Thu, 24 Nov 2022 21:47:19 +0800 Subject: [PATCH] Fix issue that FLOAT4 uniform validator doesn't accept quaternion (#13551) --- cocos/render-scene/core/pass-utils.ts | 2 +- native/cocos/renderer/core/PassUtils.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cocos/render-scene/core/pass-utils.ts b/cocos/render-scene/core/pass-utils.ts index e08d1c388e..8202b1246d 100644 --- a/cocos/render-scene/core/pass-utils.ts +++ b/cocos/render-scene/core/pass-utils.ts @@ -81,7 +81,7 @@ export const type2validator = { [Type.INT3]: (v: Vec3): boolean => !!(v instanceof Vec3), [Type.FLOAT3]: (v: Vec3): boolean => !!(v instanceof Vec3), [Type.INT4]: (v: Vec4): boolean => !!(v instanceof Vec4), - [Type.FLOAT4]: (v: Vec4 | Color): boolean => !!((v instanceof Vec4) || (v instanceof Color)), + [Type.FLOAT4]: (v: Vec4 | Color | Quat): boolean => !!((v instanceof Vec4) || (v instanceof Color) || (v instanceof Quat)), [Type.MAT3]: (v: Mat3): boolean => !!(v instanceof Mat3), [Type.MAT4]: (v: Mat4): boolean => !!(v instanceof Mat4), }; diff --git a/native/cocos/renderer/core/PassUtils.cpp b/native/cocos/renderer/core/PassUtils.cpp index 45a0ebe765..234af643e1 100644 --- a/native/cocos/renderer/core/PassUtils.cpp +++ b/native/cocos/renderer/core/PassUtils.cpp @@ -232,7 +232,8 @@ const ccstd::unordered_map type2validator = {gfx::Type::FLOAT4, [](const MaterialProperty &v) -> bool { const auto *p = ccstd::get_if(&v); const auto *pColor = ccstd::get_if(&v); - return p != nullptr || pColor != nullptr; + const auto *pQuat = ccstd::get_if(&v); + return p != nullptr || pColor != nullptr || pQuat != nullptr; }}, {gfx::Type::MAT3, [](const MaterialProperty &v) -> bool { const auto *p = ccstd::get_if(&v);